You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2010/08/20 15:09:08 UTC
svn commit: r987496 - in /servicemix/smx3/trunk: ./
distributions/apache-servicemix/
distributions/apache-servicemix/src/main/assembly/
samples/bridge/bridge-sa-itest/
Author: gertv
Date: Fri Aug 20 13:09:08 2010
New Revision: 987496
URL: http://svn.apache.org/viewvc?rev=987496&view=rev
Log:
SM-1972: Missing javax.annotation causes exception on AIX
Modified:
servicemix/smx3/trunk/.gitignore
servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml
servicemix/smx3/trunk/pom.xml
servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/pom.xml
Modified: servicemix/smx3/trunk/.gitignore
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/.gitignore?rev=987496&r1=987495&r2=987496&view=diff
==============================================================================
--- servicemix/smx3/trunk/.gitignore (original)
+++ servicemix/smx3/trunk/.gitignore Fri Aug 20 13:09:08 2010
@@ -3,4 +3,5 @@
.settings
rootDir
target
-*.i??
\ No newline at end of file
+*.i??
+*.orig
\ No newline at end of file
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml?rev=987496&r1=987495&r2=987496&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml Fri Aug 20 13:09:08 2010
@@ -235,6 +235,10 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_2.1_spec</artifactId>
</dependency>
<dependency>
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml?rev=987496&r1=987495&r2=987496&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml Fri Aug 20 13:09:08 2010
@@ -146,6 +146,7 @@
<include>org.springframework:spring-expression</include>
<include>org.springframework:spring-tx</include>
<include>aopalliance:aopalliance</include>
+ <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml?rev=987496&r1=987495&r2=987496&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml Fri Aug 20 13:09:08 2010
@@ -138,6 +138,7 @@
<include>org.springframework:spring-expression</include>
<include>org.springframework:spring-tx</include>
<include>aopalliance:aopalliance</include>
+ <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=987496&r1=987495&r2=987496&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Fri Aug 20 13:09:08 2010
@@ -105,6 +105,7 @@
<jetty-version>6.1.22</jetty-version>
<jetty-servlet-api-version>6.1.14</jetty-servlet-api-version>
<geronimo-version>2.0.2</geronimo-version>
+ <geronimo-annotation-version>1.1.1</geronimo-annotation-version>
<geronimo-connector-version>2.1.4</geronimo-connector-version>
<geronimo-transaction-version>2.1.4</geronimo-transaction-version>
<slf4j-version>1.4.3</slf4j-version>
@@ -1009,6 +1010,11 @@
<version>${geronimo-version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>${geronimo-annotation-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-common</artifactId>
<version>${geronimo-version}</version>
Modified: servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/pom.xml?rev=987496&r1=987495&r2=987496&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/pom.xml (original)
+++ servicemix/smx3/trunk/samples/bridge/bridge-sa-itest/pom.xml Fri Aug 20 13:09:08 2010
@@ -48,6 +48,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -114,7 +119,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
- <version>${camel-version}</version>
+ <version>${camel-version}</version>
<scope>test</scope>
</dependency>
<dependency>