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 23:01:41 UTC
svn commit: r1431690 - in /uima/sandbox/uima-ducc/trunk: pom.xml
src/main/assembly/bin.xml uima-ducc-common/pom.xml uima-ducc-parent/pom.xml
Author: cwiklik
Date: Thu Jan 10 22:01:41 2013
New Revision: 1431690
URL: http://svn.apache.org/viewvc?rev=1431690&view=rev
Log:
UIMA-2491 updated build scripts
Modified:
uima/sandbox/uima-ducc/trunk/pom.xml
uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-common/pom.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml
Modified: uima/sandbox/uima-ducc/trunk/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/pom.xml?rev=1431690&r1=1431689&r2=1431690&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/pom.xml Thu Jan 10 22:01:41 2013
@@ -94,7 +94,35 @@
<plugins>
-
+<!-- plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.6</version>
+
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <remoteRepositories>http://ebr.springsource.com/repository/</remoteRepositories>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sourceforge.cglib</groupId>
+ <artifactId>com.springsource.net.sf.cglib</artifactId>
+ <version>2.2.0</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}/ducc_runtime/lib/springframework</outputDirectory>
+ <destFileName>com.springsource.net.sf.cglib-2.2.0.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
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=1431690&r1=1431689&r2=1431690&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 22:01:41 2013
@@ -147,7 +147,7 @@ under the License.
<dependencySet>
<includes>
- <include>org.apache.httpcomponents:httpclient</include>
+ <include>commons-httpclient:commons-httpclient</include>
</includes>
<outputDirectory>ducc_runtime/lib/http-client</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
@@ -262,7 +262,6 @@ under the License.
<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>
@@ -461,11 +460,16 @@ under the License.
</file>
<file>
+ <source>src/main/cglib/com.springsource.net.sf.cglib-2.2.0.jar</source>
+ <outputDirectory>ducc_runtime/lib/springframework-3.0.5</outputDirectory>
+ <destName>com.springsource.net.sf.cglib-2.2.0.jar</destName>
+ </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-common/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/pom.xml?rev=1431690&r1=1431689&r2=1431690&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/pom.xml Thu Jan 10 22:01:41 2013
@@ -26,5 +26,16 @@
<!-- Uses default packaging ie. jar -->
<artifactId>uima-ducc-common</artifactId>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/java/org/apache/uima/ducc/common/uima</directory>
+ <includes>
+ <include>DuccJobProcessFC.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
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=1431690&r1=1431689&r2=1431690&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 22:01:41 2013
@@ -33,7 +33,7 @@
<maven.build.timestamp.format>MM-dd-yyyy HH:mm</maven.build.timestamp.format>
<ducc.version>${project.version}</ducc.version>
<org.springframework.version>3.0.5.RELEASE</org.springframework.version>
- <org.apache.activemq.version>5.7.0</org.apache.activemq.version>
+ <org.apache.activemq.version>5.5.0</org.apache.activemq.version>
<org.apache.camel.version>2.10.1</org.apache.camel.version>
<org.apache.uima.version>2.4.1-SNAPSHOT</org.apache.uima.version>
<org.apache.uima.as.version>2.4.1-SNAPSHOT</org.apache.uima.as.version>
@@ -41,7 +41,8 @@
<commons.cli.version>1.2</commons.cli.version>
<joda.time.version>2.1</joda.time.version>
<jsch.version>0.1.29</jsch.version>
- <http.client.version>4.2.2</http.client.version>
+ <!-- http.client.version>4.2.2</http.client.version -->
+ <commons.httpclient.version>3.1</commons.httpclient.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>
@@ -67,6 +68,7 @@
<dependencyManagement>
<dependencies>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -130,11 +132,11 @@
<version>${jsch.version}</version>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${http.client.version}</version>
- </dependency>
+ </dependency -->
<dependency>
<groupId>commons-codec</groupId>
@@ -149,11 +151,11 @@
<version>${commons.cli.version}</version>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.fusesource.commonman</groupId>
<artifactId>commons-management</artifactId>
<version>${commons.management.version}</version>
- </dependency>
+ </dependency -->
@@ -301,12 +303,6 @@
<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>
@@ -375,12 +371,6 @@
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.2.2</version>
- </dependency>
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -412,6 +402,12 @@
<version>${aopalliance.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons.httpclient.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -633,13 +629,6 @@
</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>
@@ -667,8 +656,8 @@
</dependency>
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
</dependency>
</dependencies>