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/02/06 16:51:16 UTC
svn commit: r1657873 - in /uima/sandbox/uima-ducc/trunk: pom.xml
src/main/assembly/bin.xml uima-ducc-container/pom.xml
Author: burn
Date: Fri Feb 6 15:51:16 2015
New Revision: 1657873
URL: http://svn.apache.org/r1657873
Log:
UIMA-4222 Drop private folder & UIMA SDK extract
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
Modified: uima/sandbox/uima-ducc/trunk/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/pom.xml?rev=1657873&r1=1657872&r2=1657873&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/pom.xml Fri Feb 6 15:51:16 2015
@@ -283,9 +283,9 @@
</executions>
</plugin>
- <!-- Ducc includes the base UIMA binary distribution
+ <!-- Ducc includes the full UIMA-AS binary distribution
We get an unzipped version of that and unpack it into
- target/uimaj -->
+ target/uima-as -->
<!-- must come before the unpack -->
@@ -294,15 +294,6 @@
<artifactId>uima-build-helper-maven-plugin</artifactId>
<executions>
<execution>
- <id>foo</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>bar</id>
<phase>prepare-package</phase>
<goals><goal>copy-from-apache-dist</goal></goals>
@@ -320,27 +311,7 @@
<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
base binary uima-as distribution -->
@@ -363,30 +334,6 @@
</execution>
-
- <execution>
- <!-- use the dependency:unpack goal to unpack the AMQ binary release -->
- <id>unpack-activemq-distro</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <overWriteIfNewer>true</overWriteIfNewer>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.activemq</groupId>
- <artifactId>apache-activemq</artifactId>
- <version>${org.apache.activemq.version}</version>
- <type>tar.gz</type>
- <classifier>bin</classifier>
- <outputDirectory>${project.build.directory}/apache-activemq</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
-
-
<execution>
<!-- use the dependency:unpack goal to unpack the Jetty release -->
<id>unpack-jetty-distro</id>
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=1657873&r1=1657872&r2=1657873&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Fri Feb 6 15:51:16 2015
@@ -254,13 +254,6 @@ under the License.
<directory>target/uima-as/apache-uima-as-${org.apache.uima.as.version}</directory>
<outputDirectory>apache-uima</outputDirectory>
<fileMode>755</fileMode>
- <excludes>
- <exclude>LICENSE</exclude>
- <exclude>NOTICE</exclude>
- <exclude>LICENSE.uimaj.txt</exclude>
- <exclude>NOTICE.uimaj.txt</exclude>
-
- </excludes>
<directoryMode>755</directoryMode>
</fileSet>
@@ -314,6 +307,7 @@ under the License.
<directoryMode>755</directoryMode>
<excludes>
<exclude>private/*</exclude>
+ <exclude>private</exclude>
</excludes>
</fileSet>
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=1657873&r1=1657872&r2=1657873&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/pom.xml Fri Feb 6 15:51:16 2015
@@ -123,15 +123,6 @@
<artifactId>uima-build-helper-maven-plugin</artifactId>
<executions>
<execution>
- <id>foo</id>
- <phase>validate</phase>
- <goals><goal>copy-from-apache-dist</goal></goals>
- <configuration>
- <version>${org.apache.uima.version}</version>
- <artifactId>uimaj</artifactId>
- </configuration>
- </execution>
- <execution>
<id>bar</id>
<phase>validate</phase>
<goals><goal>copy-from-apache-dist</goal></goals>
@@ -151,26 +142,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>validate</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
@@ -230,7 +201,7 @@
</goals>
<configuration>
<target>
- <copy file="${basedir}/target/uimaj/apache-uima/lib/uima-core.jar" tofile="${basedir}/target/test-classes/uimaj-core.jar"/>
+ <copy file="${basedir}/target/uima-as/apache-uima-as-${org.apache.uima.as.version}/lib/uima-core.jar" tofile="${basedir}/target/test-classes/uimaj-core.jar"/>
<copy file="${basedir}/target/uima-as/apache-uima-as-${org.apache.uima.as.version}/lib/uimaj-as-core.jar" tofile="${basedir}/target/test-classes/uimaj-as-core.jar"/>
<copy file="${basedir}/target/uima-as/apache-uima-as-${org.apache.uima.as.version}/lib/xmlbeans.jar" tofile="${basedir}/target/test-classes/xmlbeans.jar"/>
<copy file="${basedir}/target/uima-as/apache-uima-as-${org.apache.uima.as.version}/apache-activemq/lib/spring-core-${org.springframework.version}.jar" tofile="${basedir}/target/test-classes/spring-core.jar"/>