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/10/11 22:39:08 UTC
svn commit: r1531412 - in /uima/uima-as/trunk:
aggregate-uima-as-eclipse-plugins/ aggregate-uima-as/
uima-as-eclipse-update-site/ uima-as-parent/ uimaj-as-activemq/
uimaj-as-camel/ uimaj-as-core/ uimaj-as-jms/
uimaj-eclipse-feature-deployeditor/ uimaj-...
Author: cwiklik
Date: Fri Oct 11 20:39:07 2013
New Revision: 1531412
URL: http://svn.apache.org/r1531412
Log:
UIMA-3257 revert back to 2.4.2-SNAPSHOT. Refactored dependencies
Modified:
uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml
uima/uima-as/trunk/aggregate-uima-as/pom.xml
uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml
uima/uima-as/trunk/uima-as-parent/pom.xml
uima/uima-as/trunk/uimaj-as-activemq/pom.xml
uima/uima-as/trunk/uimaj-as-camel/pom.xml
uima/uima-as/trunk/uimaj-as-core/pom.xml
uima/uima-as/trunk/uimaj-as-jms/pom.xml
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml
uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml
uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml
Modified: uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml?rev=1531412&r1=1531411&r2=1531412&view=diff
==============================================================================
--- uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml (original)
+++ uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml Fri Oct 11 20:39:07 2013
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>aggregate-uima-as-eclipse-plugins</artifactId>
<packaging>pom</packaging>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<name>Apache UIMA-AS Aggregate: ${project.artifactId}</name>
<description>The aggregate for building the Eclipse plugins
that are part of the UIMA-AS framework</description>
Modified: uima/uima-as/trunk/aggregate-uima-as/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as/pom.xml?rev=1531412&r1=1531411&r2=1531412&view=diff
==============================================================================
--- uima/uima-as/trunk/aggregate-uima-as/pom.xml (original)
+++ uima/uima-as/trunk/aggregate-uima-as/pom.xml Fri Oct 11 20:39:07 2013
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>aggregate-uima-as</artifactId>
<packaging>pom</packaging>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<name>Apache UIMA-AS Aggregate: ${project.artifactId}</name>
<description>The aggregate for building the uima-as functionality,
the eclipse plugins, and the docbooks
Modified: uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml?rev=1531412&r1=1531411&r2=1531412&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml Fri Oct 11 20:39:07 2013
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.4.2</version>
+ <version>2.4.2-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uima-as-eclipse-update-site</artifactId>
<packaging>pom</packaging>
- <version>2.4.2</version>
+ <version>2.4.2-SNAPSHOT</version>
<name>Apache UIMA Eclipse: ${project.artifactId}</name>
<description>The UIMA Eclipse update site</description>
Modified: uima/uima-as/trunk/uima-as-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-parent/pom.xml?rev=1531412&r1=1531411&r2=1531412&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-parent/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-parent/pom.xml Fri Oct 11 20:39:07 2013
@@ -28,7 +28,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
<packaging>pom</packaging>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<name>Apache UIMA-AS: ${project.artifactId}</name>
<description>The common parent pom for uima-as</description>
<url>${uimaWebsiteUrl}</url>
@@ -339,102 +339,7 @@
</dependencyManagement>
- <!-- All UIMA-AS projects depend on SpringFramework -->
- <dependencies>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
-
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-core</artifactId>
- <scope>compile</scope>
- </dependency>
-
-
- <!-- Spring Framework Dependencies -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jms</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </dependency>
-
- <!-- Jetty -->
- <dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all-server</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
-
-
- </dependencies>
+
<build>
</build>
Modified: uima/uima-as/trunk/uimaj-as-activemq/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/pom.xml?rev=1531412&r1=1531411&r2=1531412&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/pom.xml Fri Oct 11 20:39:07 2013
@@ -15,12 +15,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-activemq</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<name>Apache UIMA-AS: ${project.artifactId}</name>
<description>UIMA-AS ActiveMQ incorporation</description>
<url>${uimaWebsiteUrl}</url>
@@ -49,6 +49,12 @@
<dependencies>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+
+ </dependency>
+
<!-- Active MQ Stuff -->
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -122,6 +128,73 @@
<scope>test</scope>
</dependency>
+ <!-- Spring Framework Dependencies -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </dependency>
+
+ <!-- Jetty -->
+ <dependency>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-all-server</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
Modified: uima/uima-as/trunk/uimaj-as-camel/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-camel/pom.xml?rev=1531412&r1=1531411&r2=1531412&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-camel/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-camel/pom.xml Fri Oct 11 20:39:07 2013
@@ -15,13 +15,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-camel</artifactId>
<packaging>jar</packaging>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<name>Apache UIMA-AS: ${project.artifactId}</name>
<description>Apache UIMA-AS Camel Driver</description>
<url>${uimaWebsiteUrl}</url>
@@ -62,6 +62,53 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Spring Framework Dependencies -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-activemq</artifactId>
Modified: uima/uima-as/trunk/uimaj-as-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/pom.xml?rev=1531412&r1=1531411&r2=1531412&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-core/pom.xml Fri Oct 11 20:39:07 2013
@@ -15,13 +15,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<name>Apache UIMA-AS: ${project.artifactId}</name>
<url>${uimaWebsiteUrl}</url>
@@ -49,6 +49,13 @@
</properties>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
@@ -69,6 +76,47 @@
<scope>compile</scope>
</dependency>
+ <!-- Spring Framework Dependencies -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ </dependency>
+
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
Modified: uima/uima-as/trunk/uimaj-as-jms/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-jms/pom.xml?rev=1531412&r1=1531411&r2=1531412&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-jms/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-jms/pom.xml Fri Oct 11 20:39:07 2013
@@ -15,12 +15,12 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-jms</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<name>Apache UIMA-AS: ${project.artifactId}</name>
<url>${uimaWebsiteUrl}</url>
@@ -47,6 +47,13 @@
</properties>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
<!-- Active MQ Stuff -->
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -68,6 +75,47 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
+
+ <!-- Spring Framework Dependencies -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml?rev=1531412&r1=1531411&r2=1531412&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml Fri Oct 11 20:39:07 2013
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-eclipse-feature-deployeditor</artifactId>
<packaging>jar</packaging>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<name>Apache UIMA Eclipse: ${project.artifactId}</name>
<description>UIMA Eclipse Plugin Feature for the uima-as deploy editor</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml?rev=1531412&r1=1531411&r2=1531412&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml Fri Oct 11 20:39:07 2013
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-deployeditor</artifactId>
<packaging>jar</packaging>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<name>Apache UIMA-AS Eclipse Plugin: ${project.artifactId}</name>
<description>Extension to the Component Descriptor Editor supporting editing UIMA-AS deployment descriptors</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml?rev=1531412&r1=1531411&r2=1531412&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml Fri Oct 11 20:39:07 2013
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-runtime-deployeditor</artifactId>
<packaging>jar</packaging>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<name>Apache UIMA-AS Eclipse Plugin: ${project.artifactId}</name>
<description>Bundles the uima-as runtime parts needed for the deploy editor extension to the CDE, as a fragment on top of the main uima runtime</description>
<url>${uimaWebsiteUrl}</url>