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/11 20:22:27 UTC
svn commit: r1521974 - in /uima/uima-as/trunk: pom.xml
src/main/scripts/runUimaClass.bat src/main/scripts/runUimaClass.sh
src/main/scripts/startBroker.bat src/main/scripts/startBroker.sh
Author: cwiklik
Date: Wed Sep 11 18:22:27 2013
New Revision: 1521974
URL: http://svn.apache.org/r1521974
Log:
UIMA-2592 Removed binary AMQ 5.4.1 from svn. Modified to download version 5.6.0 and extract relevant parts into uima-as tarball
Modified:
uima/uima-as/trunk/pom.xml
uima/uima-as/trunk/src/main/scripts/runUimaClass.bat
uima/uima-as/trunk/src/main/scripts/runUimaClass.sh
uima/uima-as/trunk/src/main/scripts/startBroker.bat
uima/uima-as/trunk/src/main/scripts/startBroker.sh
Modified: uima/uima-as/trunk/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/pom.xml?rev=1521974&r1=1521973&r2=1521974&view=diff
==============================================================================
--- uima/uima-as/trunk/pom.xml (original)
+++ uima/uima-as/trunk/pom.xml Wed Sep 11 18:22:27 2013
@@ -28,13 +28,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uima-as-parent</artifactId>
- <version>2.4.1-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<relativePath>uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uima-as</artifactId>
<packaging>pom</packaging>
- <version>2.4.1-SNAPSHOT</version>
+ <version>2.4.2-SNAPSHOT</version>
<name>Apache UIMA-AS: ${project.artifactId}</name>
<description>The top project for UIMA-AS</description>
<url>${uimaWebsiteUrl}</url>
@@ -63,6 +63,9 @@
<jiraVersion>12316312</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>
<!-- override pom setting in the build project. JIRA 5.1 needs different URL -->
@@ -163,49 +166,49 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>3.0.3.RELEASE</version>
+ <version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
- <version>3.0.3.RELEASE</version>
+ <version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>3.0.3.RELEASE</version>
+ <version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>3.0.3.RELEASE</version>
+ <version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>3.0.3.RELEASE</version>
+ <version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>3.0.3.RELEASE</version>
+ <version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>3.0.3.RELEASE</version>
+ <version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
- <version>3.0.3.RELEASE</version>
+ <version>${org.springframework.version}</version>
</dependency>
@@ -215,43 +218,43 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
- <version>5.4.1</version>
+ <version>${org.apache.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jaas</artifactId>
- <version>5.4.1</version>
+ <version>${org.apache.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-web</artifactId>
- <version>5.4.1</version>
+ <version>${org.apache.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-spring</artifactId>
- <version>5.4.1</version>
+ <version>${org.apache.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-optional</artifactId>
- <version>5.4.1</version>
+ <version>${org.apache.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>kahadb</artifactId>
- <version>5.4.1</version>
+ <version>${org.apache.activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -272,7 +275,7 @@
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId>
- <version>7.0.1.v20091125</version>
+ <version>7.6.7.v20120910</version>
</dependency>
<dependency>
@@ -284,7 +287,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.3.1</version>
+ <version>1.4.3</version>
</dependency>
<!-- lib/optional -->
@@ -538,6 +541,7 @@
<exclude>uima-as-docbooks/.project</exclude>
<exclude>uima-as-docbooks/.settings/**</exclude>
<exclude>uima-as-docbooks/target/**</exclude>
+ <exclude>uima-as-docbooks/src/docbook/images/uima_async_scaleout/**</exclude>
<exclude>uimaj-as-activemq/.classpath</exclude>
<exclude>uimaj-as-activemq/.project</exclude>
<exclude>uimaj-as-activemq/.settings/**</exclude>
@@ -609,6 +613,57 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <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>zip</type>
+ <classifier>bin</classifier>
+ <outputDirectory>${project.build.directory}/apache-activemq-win</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+<execution>
+ <!-- use the dependency:unpack goal to unpack the AMQ binary release -->
+ <id>unpack-activemq-distro-linux</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-linux</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
</plugins>
<!-- /pluginManagement-->
</build>
Modified: uima/uima-as/trunk/src/main/scripts/runUimaClass.bat
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/main/scripts/runUimaClass.bat?rev=1521974&r1=1521973&r2=1521974&view=diff
==============================================================================
--- uima/uima-as/trunk/src/main/scripts/runUimaClass.bat (original)
+++ uima/uima-as/trunk/src/main/scripts/runUimaClass.bat Wed Sep 11 18:22:27 2013
@@ -24,7 +24,7 @@
@setlocal
@rem Set ActiveMQ home
-@if "%ACTIVEMQ_HOME%"=="" (set "ACTIVEMQ_HOME=%UIMA_HOME%\apache-activemq-5.4.1")
+@if "%ACTIVEMQ_HOME%"=="" (set "ACTIVEMQ_HOME=%UIMA_HOME%\apache-activemq")
@if "%JAVA_HOME%"=="" (set UIMA_JAVA_CALL=java) else (set "UIMA_JAVA_CALL=%JAVA_HOME%\bin\java")
Modified: uima/uima-as/trunk/src/main/scripts/runUimaClass.sh
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/main/scripts/runUimaClass.sh?rev=1521974&r1=1521973&r2=1521974&view=diff
==============================================================================
--- uima/uima-as/trunk/src/main/scripts/runUimaClass.sh (original)
+++ uima/uima-as/trunk/src/main/scripts/runUimaClass.sh Wed Sep 11 18:22:27 2013
@@ -26,7 +26,7 @@ fi
# set default ActiveMQ home
if [ "$ACTIVEMQ_HOME" = "" ]
then
- ACTIVEMQ_HOME=$UIMA_HOME/apache-activemq-5.4.1
+ ACTIVEMQ_HOME=$UIMA_HOME/apache-activemq
fi
if [ "$JAVA_HOME" = "" ]
Modified: uima/uima-as/trunk/src/main/scripts/startBroker.bat
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/main/scripts/startBroker.bat?rev=1521974&r1=1521973&r2=1521974&view=diff
==============================================================================
--- uima/uima-as/trunk/src/main/scripts/startBroker.bat (original)
+++ uima/uima-as/trunk/src/main/scripts/startBroker.bat Wed Sep 11 18:22:27 2013
@@ -31,7 +31,7 @@ REM under the License.
@REM ActiveMQ needs a HOME
@setlocal
@if "%ACTIVEMQ_HOME%" == "" (
- set "ACTIVEMQ_HOME=%UIMA_HOME%\apache-activemq-5.4.1"
+ set "ACTIVEMQ_HOME=%UIMA_HOME%\apache-activemq"
)
@REM ActiveMQ needs a writable directory for the log files and derbydb
Modified: uima/uima-as/trunk/src/main/scripts/startBroker.sh
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/src/main/scripts/startBroker.sh?rev=1521974&r1=1521973&r2=1521974&view=diff
==============================================================================
--- uima/uima-as/trunk/src/main/scripts/startBroker.sh (original)
+++ uima/uima-as/trunk/src/main/scripts/startBroker.sh Wed Sep 11 18:22:27 2013
@@ -24,7 +24,7 @@ fi
# ActiveMQ needs a HOME
if [ -z "$ACTIVEMQ_HOME" ] ; then
- export ACTIVEMQ_HOME=$UIMA_HOME/apache-activemq-5.4.1
+ export ACTIVEMQ_HOME=$UIMA_HOME/apache-activemq
fi
# ActiveMQ needs a writeable directory for the log files and derbydb.