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/09/27 20:53:02 UTC
svn commit: r1527027 - in /uima/uima-as/trunk: pom.xml uima-as-parent/pom.xml
Author: cwiklik
Date: Fri Sep 27 18:53:01 2013
New Revision: 1527027
URL: http://svn.apache.org/r1527027
Log:
UIMA-3257 - removed unnecessary dependencies from the uima-as top pom and added placeholders for versions in remaining dependencies
Modified:
uima/uima-as/trunk/pom.xml
uima/uima-as/trunk/uima-as-parent/pom.xml
Modified: uima/uima-as/trunk/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/pom.xml?rev=1527027&r1=1527026&r2=1527027&view=diff
==============================================================================
--- uima/uima-as/trunk/pom.xml (original)
+++ uima/uima-as/trunk/pom.xml Fri Sep 27 18:53:01 2013
@@ -63,8 +63,6 @@
<jiraVersion>12323591</jiraVersion> <!-- for 2.4.0AS -->
<uimaScmProject>${project.artifactId}</uimaScmProject>
<assemblyFinalName>uima-as-${project.version}</assemblyFinalName>
- <!--org.springframework.version>3.0.7.RELEASE</org.springframework.version>
- <org.apache.activemq.version>5.6.0</org.apache.activemq.version -->
</properties>
@@ -76,15 +74,6 @@
<!-- dependencies used during assembly -->
<dependencies>
- <!-- uima base -->
- <!-- dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <type>zip</type>
- <classifier>bin</classifier>
- <version>${uimajDependencyVersion}</version>
- </dependency-->
-
<!-- uima-as -->
<dependency>
<groupId>org.apache.uima</groupId>
@@ -127,91 +116,14 @@
<artifactId>uimaj-test-util</artifactId>
<version>${uimajDependencyVersion}</version>
</dependency>
- <!--
- commons stuff
- -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.5.4</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.2</version>
- </dependency>
-
+
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
+ <version>${http.version}</version>
</dependency>
-
-
- <!--
- Spring Framework Dependencies
- -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${org.springframework.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- <version>${org.springframework.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${org.springframework.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${org.springframework.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${org.springframework.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>${org.springframework.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${org.springframework.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jms</artifactId>
- <version>${org.springframework.version}</version>
- </dependency>
-
-
<!--
Active MQ Stuff
-->
@@ -260,73 +172,22 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
+ <version>${org.apache.geronimo.jms.specs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- <version>1.0.1</version>
+ <version>${org.apache.geronimo.j2ee.specs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
- </dependency>
-
- <!--
- Jetty
- -->
- <dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all-server</artifactId>
- <version>7.6.7.v20120910</version>
- </dependency>
-
- <dependency>
- <groupId>xmlpull</groupId>
- <artifactId>xmlpull</artifactId>
- <version>1.1.3.4d_b4_min</version>
- </dependency>
-
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.4.3</version>
+ <version>${org.apache.geronimo.servlet.specs.version}</version>
</dependency>
- <!-- lib/optional -->
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.6.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>2.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <version>3.7</version>
- </dependency>
</dependencies>
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=1527027&r1=1527026&r2=1527027&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-parent/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-parent/pom.xml Fri Sep 27 18:53:01 2013
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
- <version>6</version>
+ <version>7-SNAPSHOT</version>
<relativePath />
</parent>
@@ -143,6 +143,8 @@
<xmlbeans.version>2.4.0</xmlbeans.version>
<slf4j.version>1.6.4</slf4j.version>
+
+ <http.version>3.1</http.version>
</properties>
<!-- dependencyManagement is a declaration section naming each artifact
the uima-as components depends on. -->
@@ -430,59 +432,4 @@
<build>
</build>
- <profiles>
- <!-- ************************************************** -->
- <!-- -->
- <!-- REMOVE when parent-pom v 7 released -->
- <!-- -->
- <!-- * apache-release * -->
- <!-- * NOTE: This profile is activated while * -->
- <!-- * running the Maven build pipeline, usually * -->
- <!-- * clean verify (for mvn release:prepare) or * -->
- <!-- * deploy (for mvn release;perform), * -->
- <!-- * but is not activated for the * -->
- <!-- * outer execution for mvn release... * -->
- <!-- * on the pom being released * -->
- <!-- ************************************************** -->
- <profile>
- <id>apache-release</id>
-
- <build>
- <plugins>
-
- <!-- to fix up any generated Javadocs to have consistent line ends in
- html files -->
- <!-- runs in phase after package -->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>maybe-fix-javadoc-line-ends</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <taskdef name="if" classname="net.sf.antcontrib.logic.IfTask" />
- <if>
- <available file="${project.build.directory}/site/apidocs/" />
- <then>
- <echo>Fixing line-endings for
- ${project.build.directory}/site/apidocs/</echo>
- <fixcrlf srcdir="${project.build.directory}/site/apidocs/">
- <include name="**/*.html" />
- </fixcrlf>
- </then>
- </if>
- </target>
- </configuration>
- </execution>
- </executions>
-
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>