You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2013/11/21 19:55:16 UTC
svn commit: r1544287 - in /uima/sandbox/uima-ducc/trunk:
src/main/admin/ducc_util.py src/main/assembly/bin.xml uima-ducc-cli/pom.xml
Author: burn
Date: Thu Nov 21 18:55:15 2013
New Revision: 1544287
URL: http://svn.apache.org/r1544287
Log:
UIMA-3428 Remove duplicate slf4j jars to avoid the multiple bindings msg
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1544287&r1=1544286&r2=1544287&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py Thu Nov 21 18:55:15 2013
@@ -232,7 +232,6 @@ class DuccUtil(DuccBase):
for j in extra_jars:
CLASSPATH = CLASSPATH + ':' + LIB + '/' + j
- CLASSPATH = CLASSPATH + ":" + LIB + '/slf4j/*'
CLASSPATH = CLASSPATH + ":" + LIB + '/apache-commons/*'
CLASSPATH = CLASSPATH + ":" + LIB + '/apache-commons-lang/*'
CLASSPATH = CLASSPATH + ":" + LIB + '/apache-commons-cli/*'
Modified: uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml?rev=1544287&r1=1544286&r2=1544287&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Thu Nov 21 18:55:15 2013
@@ -30,22 +30,6 @@ under the License.
<dependencySets>
-
- <dependencySet>
- <includes>
- <include>org.slf4j:slf4j-log4j12</include>
- <include>org.slf4j:jcl-over-slf4j</include>
- <include>org.slf4j:slf4j-api</include>
-
- </includes>
- <!-- includeBaseDirectory>false</includeBaseDirectory -->
- <!-- useTransitiveDependencies>false</useTransitiveDependencies -->
- <outputFileNameMapping>${artifact.artifactId}.jar</outputFileNameMapping>
- <outputDirectory>ducc_runtime/lib/slf4j</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
<dependencySet>
<includes>
@@ -251,12 +235,14 @@ under the License.
<dependencySet>
<includes>
- <include>org.apache.activemq:activemq-all</include>
+ <include>org.apache.activemq:activemq-core</include>
<include>org.apache.activemq:activemq-camel</include>
<include>org.apache.activemq:activemq-pool</include>
<include>org.apache.activemq:activemq-jaas</include>
<include>commons-pool:commons-pool</include>
<include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>xpp3:xpp3</include>
</includes>
<outputDirectory>ducc_runtime/lib/apache-activemq</outputDirectory>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml?rev=1544287&r1=1544286&r2=1544287&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml Thu Nov 21 18:55:15 2013
@@ -47,7 +47,7 @@
<properties>
<DUCC_CP>
-uima-ducc-common.jar uima-ducc-transport.jar ../resources/ slf4j/jcl-over-slf4j.jar slf4j/slf4j-api.jar slf4j/slf4j-log4j12.jar xstream/xstream.jar http-client/commons-codec-${commons.codec.version}.jar http-client/commons-httpclient-${commons.httpclient.version}.jar google-gson/gson-${google.gson.version}.jar apache-log4j/log4j-${log4j.version}.jar apache-commons-cli/commons-cli-${commons.cli.version}.jar uima/uima-core.jar uima/uimaj-as-core.jar
+uima-ducc-common.jar uima-ducc-transport.jar ../resources/ springframework/jcl-over-slf4j-1.5.11.jar springframework/slf4j-api-1.5.11.jar springframework/slf4j-log4j12-1.5.11.jar xstream/xstream.jar http-client/commons-codec-${commons.codec.version}.jar http-client/commons-httpclient-${commons.httpclient.version}.jar google-gson/gson-${google.gson.version}.jar apache-log4j/log4j-${log4j.version}.jar apache-commons-cli/commons-cli-${commons.cli.version}.jar uima/uima-core.jar uima/uimaj-as-core.jar
</DUCC_CP>
</properties>