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 21:39:51 UTC
svn commit: r1527045 - in /uima/uima-as/trunk: pom.xml uima-as-parent/pom.xml
Author: cwiklik
Date: Fri Sep 27 19:39:51 2013
New Revision: 1527045
URL: http://svn.apache.org/r1527045
Log:
UIMA-3257 removed deploy plugin from the uima-as top pom
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=1527045&r1=1527044&r2=1527045&view=diff
==============================================================================
--- uima/uima-as/trunk/pom.xml (original)
+++ uima/uima-as/trunk/pom.xml Fri Sep 27 19:39:51 2013
@@ -121,7 +121,6 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>${http.version}</version>
</dependency>
<!--
@@ -130,31 +129,26 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
- <version>${org.apache.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jaas</artifactId>
- <version>${org.apache.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-web</artifactId>
- <version>${org.apache.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-spring</artifactId>
- <version>${org.apache.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-optional</artifactId>
- <version>${org.apache.activemq.version}</version>
<exclusions>
<exclusion>
<groupId>axis</groupId>
@@ -166,25 +160,21 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>kahadb</artifactId>
- <version>${org.apache.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <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>${org.apache.geronimo.j2ee.specs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>${org.apache.geronimo.servlet.specs.version}</version>
</dependency>
@@ -351,7 +341,7 @@
<!-- https://issues.apache.org/jira/browse/UIMA-2008 -->
<!-- no maven deployment of this project's artifacts -->
<!-- binary build artifact deployed from apache mirror system after release -->
- <plugin>
+ <!-- plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
@@ -382,7 +372,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
@@ -443,18 +433,11 @@
<execution>
<id>default-cli</id>
<configuration>
- <useDefaultExcludes>true</useDefaultExcludes>
- <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
- <excludes>
+ <excludes combine.children="append">
<exclude>src/test/resources/deploy/expected/*.*</exclude> <!-- test data -->
<exclude>src/test/resources/deploy/expected/envVar/*.*</exclude> <!-- test data -->
<exclude>src/main/examples/run_configuration/*.launch</exclude> <!-- eclipse launch configurations -->
-
-
- <exclude>README*</exclude>
- <exclude>RELEASE_NOTES*</exclude>
- <exclude>issuesFixed/**</exclude>
<exclude>LicNoticeAnalysisActiveMQ.txt</exclude>
@@ -491,31 +474,6 @@
<id>apache-release</id>
<build>
<plugins>
- <!-- https://issues.apache.org/jira/browse/UIMA-2008 -->
- <!-- no maven deployment, do manual checksums -->
- <!-- source-release artifact deployed from apache mirrors -->
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate checksums for source-release</id>
- <goals><goal>run</goal></goals>
- <phase>verify</phase>
- <configuration>
- <target>
- <checksum algorithm="sha1" format="MD5SUM" file="${project.build.directory}/${project.artifactId}-${project.version}-source-release.zip" />
- <checksum algorithm="md5" format="MD5SUM" file="${project.build.directory}/${project.artifactId}-${project.version}-source-release.zip" />
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
<!-- Run jira report -->
<!-- depends on having -DjiraVersion set -->
<plugin>
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=1527045&r1=1527044&r2=1527045&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-parent/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-parent/pom.xml Fri Sep 27 19:39:51 2013
@@ -144,7 +144,7 @@
<slf4j.version>1.6.4</slf4j.version>
- <http.version>3.1</http.version>
+ <http.client.version>3.1</http.client.version>
</properties>
<!-- dependencyManagement is a declaration section naming each artifact
the uima-as components depends on. -->
@@ -328,6 +328,13 @@
<version>${slf4j.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${http.client.version}</version>
+ </dependency>
+
</dependencies>