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/11/26 22:09:47 UTC
svn commit: r1545841 - in /uima/sandbox/uima-ducc/trunk:
src/main/assembly/bin.xml uima-ducc-parent/pom.xml
Author: cwiklik
Date: Tue Nov 26 21:09:47 2013
New Revision: 1545841
URL: http://svn.apache.org/r1545841
Log:
UIMA-3463 removed aop dependencies from springframework
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=1545841&r1=1545840&r2=1545841&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Tue Nov 26 21:09:47 2013
@@ -286,7 +286,7 @@ under the License.
<include>org.springframework:spring-core</include>
<include>org.springframework:spring-expression</include>
<include>org.springframework:spring-beans</include>
- <include>org.springframework:spring-aop</include>
+ <!-- include>org.springframework:spring-aop</include -->
<include>org.springframework:spring-tx</include>
<include>org.springframework:spring-asm</include>
<include>org.springframework:spring-jms</include>
@@ -298,10 +298,11 @@ under the License.
<include>log4j:log4j</include>
- <include>aopalliance:aopalliance</include>
+ <!-- include>aopalliance:aopalliance</include -->
<include>xpp3:xpp3</include>
+
</includes>
<outputDirectory>activemq/lib</outputDirectory>
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=1545841&r1=1545840&r2=1545841&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml Tue Nov 26 21:09:47 2013
@@ -150,7 +150,7 @@
<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>
+ <!-- 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>
@@ -442,11 +442,11 @@
<version>${org.springframework.version}</version>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${org.springframework.version}</version>
- </dependency>
+ </dependency -->
<dependency>
<groupId>org.springframework</groupId>
@@ -515,11 +515,11 @@
<version>${mina.core.version}</version>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
<version>${aopalliance.version}</version>
- </dependency>
+ </dependency -->
<dependency>
<groupId>commons-httpclient</groupId>
@@ -742,10 +742,10 @@
<artifactId>spring-beans</artifactId>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- </dependency>
+ </dependency -->
<dependency>
<groupId>org.springframework</groupId>
@@ -773,11 +773,11 @@
<artifactId>spring-context-support</artifactId>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
- </dependency>
+ </dependency-->
<dependency>
<groupId>commons-pool</groupId>