You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2015/03/11 19:56:45 UTC
svn commit: r1665966 - in /uima/sandbox/uima-ducc/trunk: pom.xml
src/main/assembly/bin.xml uima-ducc-container/pom.xml
uima-ducc-parent/pom.xml
Author: burn
Date: Wed Mar 11 18:56:45 2015
New Revision: 1665966
URL: http://svn.apache.org/r1665966
Log:
UIMA-4274 Revert to installing just a uima-as distn with it's core uima
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-container/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=1665966&r1=1665965&r2=1665966&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/pom.xml Wed Mar 11 18:56:45 2015
@@ -283,8 +283,9 @@
</executions>
</plugin>
- <!-- Ducc includes the a full UIMA-AS binary distribution
- Unpack both UIMA & UIMA-AS in case the versions differ -->
+ <!-- Ducc includes the full UIMA-AS binary distribution
+ We get an unzipped version of that and unpack it into
+ target/uima-as -->
<!-- must come before the unpack -->
@@ -293,15 +294,6 @@
<artifactId>uima-build-helper-maven-plugin</artifactId>
<executions>
<execution>
- <id>get-uima</id>
- <phase>prepare-package</phase>
- <goals><goal>copy-from-apache-dist</goal></goals>
- <configuration>
- <version>${org.apache.uima.version}</version>
- <artifactId>uimaj</artifactId>
- </configuration>
- </execution>
- <execution>
<id>get-uima-as</id>
<phase>prepare-package</phase>
<goals><goal>copy-from-apache-dist</goal></goals>
@@ -319,26 +311,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
- <execution>
- <!-- use the dependency:unpack goal to unpack the
- base binary uimaj sdk distribution -->
- <id>unpack Uimaj Bin</id>
- <phase>prepare-package</phase>
- <goals><goal>unpack</goal></goals>
- <configuration>
- <overWriteIfNewer>true</overWriteIfNewer>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <version>${org.apache.uima.version}</version>
- <type>zip</type>
- <classifier>bin</classifier>
- <outputDirectory>${project.build.directory}/uimaj</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
<execution>
<!-- use the dependency:unpack goal to unpack the
@@ -449,10 +421,9 @@
</execution>
</executions>
</plugin>
- <!-- Temporarily disabled due to JIRA bug causing only 100 JIRas to be included.
- in a report. The jira report for 1.1.0-ducc release will be created manually.
+ <!-- May need to disable this because of a JIRA bug causing only 100 JIRas to be included.
-->
- <!-- plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<executions>
@@ -463,8 +434,7 @@
</configuration>
</execution>
</executions>
- </plugin -->
-
+ </plugin>
</plugins>
<!-- /pluginManagement -->
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=1665966&r1=1665965&r2=1665966&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Wed Mar 11 18:56:45 2015
@@ -248,14 +248,6 @@ under the License.
<!-- Add other files - scripts, documentation, examples -->
<fileSets>
- <!-- UIMA (just the core jars to replace the ones in the UIMA-AS extract in case versions differ) -->
- <fileSet>
- <directory>target/uimaj/apache-uima/lib</directory>
- <outputDirectory>apache-uima/lib</outputDirectory>
- <fileMode>755</fileMode>
- <directoryMode>755</directoryMode>
- </fileSet>
-
<!-- UIMA-AS (includes UIMA SDK & ActiveMQ) -->
<fileSet>
<directory>target/uima-as/apache-uima-as-${org.apache.uima.as.version}</directory>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/pom.xml?rev=1665966&r1=1665965&r2=1665966&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/pom.xml Wed Mar 11 18:56:45 2015
@@ -152,7 +152,6 @@
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${org.springframework.version}</version>
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
</artifactItem>
<artifactItem>
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=1665966&r1=1665965&r2=1665966&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml Wed Mar 11 18:56:45 2015
@@ -132,7 +132,7 @@
<org.springframework.version>3.0.7.RELEASE</org.springframework.version>
<org.apache.activemq.version>5.7.0</org.apache.activemq.version>
<org.apache.camel.version>2.10.1</org.apache.camel.version>
- <org.apache.uima.version>2.6.0</org.apache.uima.version>
+ <!-- org.apache.uima.version>2.6.0</org.apache.uima.version Same as uima-as-->
<org.apache.uima.as.version>2.6.0</org.apache.uima.as.version>
<com.google.guava.version>r09</com.google.guava.version>
<commons.cli.version>1.2</commons.cli.version>
@@ -207,8 +207,7 @@ ${uimaDUCCNoticeText}
</properties>
<!-- dependencyManagement is a declaration section naming each artifact
- the ducc components -->
- <!-- depends on. -->
+ and version the ducc components depend on. -->
<dependencyManagement>
<dependencies>
@@ -388,7 +387,7 @@ ${uimaDUCCNoticeText}
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${org.apache.uima.version}</version>
+ <version>${org.apache.uima.as.version}</version>
</dependency>
<dependency>
@@ -561,7 +560,11 @@ ${uimaDUCCNoticeText}
<version>${commons.httpclient.version}</version>
</dependency -->
-
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>