You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2013/01/10 20:47:12 UTC
svn commit: r1431578 - in /uima/sandbox/uima-ducc/trunk:
src/main/assembly/bin.xml uima-ducc-parent/pom.xml
Author: cwiklik
Date: Thu Jan 10 19:47:12 2013
New Revision: 1431578
URL: http://svn.apache.org/viewvc?rev=1431578&view=rev
Log:
UIMA-2559 Updated dependencies and assembly script
Modified:
uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml
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=1431578&r1=1431577&r2=1431578&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Thu Jan 10 19:47:12 2013
@@ -207,13 +207,13 @@ under the License.
<dependencySet>
<includes>
- <include>org.apache.activemq:activemq-web</include>
- <include>org.apache.activemq:activemq-core</include>
- <include>org.apache.activemq:activemq-optional</include>
- <include>org.apache.activemq:activemq-spring</include>
- <include>org.apache.activemq:activemq-web</include>
- <include>org.apache.activemq:activemq-web</include>
- <include>org.apache.activemq:activemq-web</include>
+ <include>org.apache.activemq:activemq-all</include>
+ <include>org.apache.activemq:activemq-camel</include>
+ <include>org.apache.activemq:activemq-pool</include>
+ <include>org.fusesource.commonman:commons-management</include>
+ <include>commons-pool:commons-pool</include>
+ <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
+ <include>xpp3:xpp3</include>
</includes>
<outputDirectory>ducc_runtime/lib/apache-activemq</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
@@ -237,6 +237,9 @@ under the License.
<include>org.apache.camel:camel-xmlbeans</include>
<include>org.apache.camel:camel-xstream</include>
<include>org.apache.camel:camel-core</include>
+ <include>com.thoughtworks.xstream:xstream</include>
+ <include>org.apache.mina:mina-core</include>
+
</includes>
<outputDirectory>ducc_runtime/lib/apache-camel</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
@@ -258,7 +261,8 @@ under the License.
<include>org.slf4j:jcl-over-slf4j</include>
<include>org.slf4j:slf4j-log4j12</include>
<include>org.slf4j:slf4j-api</include>
-
+ <include>aopalliance:aopalliance</include>
+ <include>cglib:cglib</include>
</includes>
<outputDirectory>ducc_runtime/lib/springframework</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
@@ -446,6 +450,9 @@ under the License.
</fileSets>
<files>
+
+
+
<file>
<source>src/main/scripts/ducc_boot.py</source>
<outputDirectory>ducc_runtime/admin</outputDirectory>
@@ -453,6 +460,12 @@ under the License.
<fileMode>755</fileMode>
</file>
+ <file>
+ <source>uima-ducc-common/src/main/java/org/apache/uima/ducc/common/internationalization/Messages.properties</source>
+ <outputDirectory>ducc_runtime/resources</outputDirectory>
+ <destName>Messages.properties</destName>
+ </file>
+
<!--
<file>
<source>README.BUILD</source>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml?rev=1431578&r1=1431577&r2=1431578&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml Thu Jan 10 19:47:12 2013
@@ -42,7 +42,7 @@
<joda.time.version>2.1</joda.time.version>
<jsch.version>0.1.29</jsch.version>
<http.client.version>4.2.2</http.client.version>
- <commons.codec.version>1.5</commons.codec.version>
+ <commons.codec.version>1.2</commons.codec.version>
<commons.collections.version>3.2.1</commons.collections.version>
<commons.lang.version>2.6</commons.lang.version>
<commons.math.version>2.0</commons.math.version>
@@ -52,6 +52,14 @@
<junit.version>4.8.2</junit.version>
<jetty.version>7.4.4.v20110707</jetty.version>
<servlet.api.version>2.5</servlet.api.version>
+ <aopalliance.version>1.0</aopalliance.version>
+ <commons.management.version>1.0</commons.management.version>
+ <commons.pool.version>1.5.4</commons.pool.version>
+ <geronimo.servlet-spec.version>1.2</geronimo.servlet-spec.version>
+ <xpp3.version>1.1.4c</xpp3.version>
+ <xstream.version>1.3.1</xstream.version>
+ <mina.core.version>1.1.7</mina.core.version>
+ <aopalliance.version>1.0</aopalliance.version>
</properties>
<!-- dependencyManagement is a declaration section naming each artifact the ducc components -->
@@ -142,6 +150,14 @@
</dependency>
<dependency>
+ <groupId>org.fusesource.commonman</groupId>
+ <artifactId>commons-management</artifactId>
+ <version>${commons.management.version}</version>
+ </dependency>
+
+
+
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${com.google.guava.version}</version>
@@ -185,19 +201,19 @@
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-all</artifactId>
<version>${org.apache.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-optional</artifactId>
+ <artifactId>activemq-camel</artifactId>
<version>${org.apache.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-spring</artifactId>
+ <artifactId>activemq-pool</artifactId>
<version>${org.apache.activemq.version}</version>
</dependency>
@@ -285,7 +301,12 @@
<version>${org.apache.camel.version}</version>
</dependency>
-
+<dependency>
+ <groupId>net.sourceforge.cglib</groupId>
+ <artifactId>com.springsource.net.sf.cglib</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -340,8 +361,57 @@
<artifactId>spring-context-support</artifactId>
<version>${org.springframework.version}</version>
</dependency>
+
+ <!-- dependency>
+ <groupId>org.fusesource.commonman</groupId>
+ <artifactId>commons-management</artifactId>
+ </dependency -->
+
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons.pool.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>${geronimo.servlet-spec.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>${xpp3.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>${xstream.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>${mina.core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>${aopalliance.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -425,26 +495,20 @@
<artifactId>joda-time</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-web</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-all</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-optional</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-camel</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-spring</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-pool</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -563,7 +627,49 @@
<artifactId>spring-context-support</artifactId>
</dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+
+ </dependency>
+
+<!-- dependency>
+<groupId>net.sourceforge.cglib</groupId>
+<artifactId>com.springsource.net.sf.cglib</artifactId>
+
+<scope>test</scope>
+</dependency -->
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </dependency>
</dependencies>
<build>