From ecc2cd9e426541c5306247fd8ae9c355fbb79d4f Mon Sep 17 00:00:00 2001 From: brett Date: Sat, 11 Jun 2005 06:34:48 +0000 Subject: [PATCH] PR: MPUBERJAR-6 git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@190084 13f79535-47bb-0310-9956-ffa450edef68 --- uberjar/project.xml | 2 +- uberjar/src/plugin-resources/conf/classworlds.conf | 7 +++---- uberjar/xdocs/changes.xml | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/uberjar/project.xml b/uberjar/project.xml index 3aeb7d5a..f2088b3e 100644 --- a/uberjar/project.xml +++ b/uberjar/project.xml @@ -111,7 +111,7 @@ classworlds classworlds - 1.0-rc2 + 1.0 http://classworlds.codehaus.org diff --git a/uberjar/src/plugin-resources/conf/classworlds.conf b/uberjar/src/plugin-resources/conf/classworlds.conf index 17331c86..eed8f2ed 100644 --- a/uberjar/src/plugin-resources/conf/classworlds.conf +++ b/uberjar/src/plugin-resources/conf/classworlds.conf @@ -1,8 +1,7 @@ main is $ubermain from app [app] - #foreach ( $dep in $pom.dependencies ) - load ${classworlds.lib}/$dep.artifact - #end + #foreach ( $dep in $pom.dependencies )#if (!$dep.getProperty('uberjar.bundle') || $dep.getProperty('uberjar.bundle') == 'true') + load ${classworlds.lib}/$dep.artifact +#end#end load ${classworlds.lib}/${self}.jar - diff --git a/uberjar/xdocs/changes.xml b/uberjar/xdocs/changes.xml index e9515771..f30d2824 100644 --- a/uberjar/xdocs/changes.xml +++ b/uberjar/xdocs/changes.xml @@ -25,6 +25,7 @@ + Excluded dependencies not bundled from the classworlds configuration Fix path if <jar> is specified for a dependency