On 4/26/2010 8:09 AM, Rick McGuire wrote:
The 5.3.2 snapshot release still seems to be looking for the
annotation 1.0 classes, which is breaking the trunk build.
This patch fixes up the activemq build so it will work with either the
1.0 or 1.1 versions of the annotations.
Rick
Rick
On 4/26/2010 2:58 AM, [email protected] wrote:
Author: djencks
Date: Mon Apr 26 06:58:38 2010
New Revision: 937940
URL: http://svn.apache.org/viewvc?rev=937940&view=rev
Log:
expect a 5.3.2 release from amq
Modified:
geronimo/server/trunk/plugins/activemq/pom.xml
Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=937940&r1=937939&r2=937940&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Mon Apr 26
06:58:38 2010
@@ -66,7 +66,7 @@
</profiles>
<properties>
-<activemqVersion>5.4-SNAPSHOT</activemqVersion>
+<activemqVersion>5.3.2-SNAPSHOT</activemqVersion>
</properties>
<dependencyManagement>
Index: activemq-all/pom.xml
===================================================================
--- activemq-all/pom.xml (revision 938017)
+++ activemq-all/pom.xml (working copy)
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -30,6 +30,10 @@
<name>ActiveMQ :: Jar Bundle</name>
<description>Puts together an ActiveMQ jar bundle</description>
+ <properties>
+
<activemq.osgi.import.pkg>javax.annotation*;version="[1.0,1.2)",*</activemq.osgi.import.pkg>
+ </properties>
+
<dependencies>
<!-- activemq -->
@@ -56,9 +60,9 @@
</dependencies>
<build>
-
+
<plugins>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
@@ -91,15 +95,15 @@
<transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
<projectName>Apache ActiveMQ</projectName>
</transformer>
-
+
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.handlers</resource>
</transformer>
-
+
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/com.sun.tools.xjc.Plugin</resource>
</transformer>
-
+
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.schemas</resource>
</transformer>
@@ -108,7 +112,7 @@
</execution>
</executions>
</plugin>
-
+
</plugins>
</build>
Index: activemq-pool/pom.xml
===================================================================
--- activemq-pool/pom.xml (revision 938017)
+++ activemq-pool/pom.xml (working copy)
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,6 +36,7 @@
org.apache.activemq.ra*;resolution:=optional,
org.apache.geronimo.transaction.manager*;resolution:=optional,
org.springframework*;resolution:=optional,
+ javax.annotation*;version="[1.0,1.2)",
*
</activemq.osgi.import.pkg>
<activemq.osgi.export>
Index: activemq-camel/pom.xml
===================================================================
--- activemq-camel/pom.xml (revision 938017)
+++ activemq-camel/pom.xml (working copy)
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,6 +46,7 @@
org.springframework*;resolution:=optional,
org.springframework.beans.factory.xml;resolution:=optional,
org.w3c.dom.traversal*;resolution:=optional,
+ javax.annotation*;version="[1.0,1.2)",
*
</activemq.osgi.import.pkg>
<activemq.osgi.export>
@@ -106,7 +107,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Index: activemq-core/pom.xml
===================================================================
--- activemq-core/pom.xml (revision 938017)
+++ activemq-core/pom.xml (working copy)
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -47,6 +47,7 @@
org.springframework*;resolution:=optional,
org.springframework.beans.factory.xml;resolution:=optional,
org.w3c.dom.traversal*;resolution:=optional,
+ javax.annotation*;version="[1.0,1.2)",
*
</activemq.osgi.import.pkg>
<activemq.osgi.export>
@@ -95,7 +96,7 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
@@ -118,8 +119,8 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jaas</artifactId>
@@ -153,7 +154,7 @@
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<optional>true</optional>
- </dependency>
+ </dependency>
<!-- for XML parsing -->
<dependency>
@@ -165,7 +166,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
@@ -223,7 +224,7 @@
<artifactId>jettison</artifactId>
<version>1.0</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
@@ -233,12 +234,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jmdns_1.0</artifactId>
@@ -383,7 +384,7 @@
</plugin>
</plugins>
</reporting>
-
+
<build>
<plugins>
<plugin>
@@ -395,7 +396,7 @@
</instructions>
</configuration>
</plugin>
-
+
<!-- Configure which tests are included/excuded -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -415,7 +416,7 @@
Note: if you want to see log messages on the console window
remove
"redirectTestOutputToFile" from the parent pom
-->
- <!--
+ <!--
<property>
<name>log4j.configuration</name>
<value>file:target/test-classes/log4j.properties</value>
@@ -439,7 +440,7 @@
<!-- These are performance tests so take too long to run -->
<exclude>**/perf/*</exclude>
-
+
<!-- These are load tests so take too long to run -->
<exclude>**/load/*</exclude>
@@ -502,26 +503,26 @@
<!-- A test used for memory profiling only. -->
<exclude>**/NetworkConnectionsCleanedupTest.*/**</exclude>
-
+
<exclude>**/NetworkConnectionsCleanedupTest.*/**</exclude>
-
+
<!-- used just to test potential memory leaks manually -->
<exclude>**/JDBCTestMemory.*</exclude>
-
+
<exclude>**/amq1490/*</exclude>
<exclude>**/AMQ1925*</exclude>
<exclude>**/archive/*</exclude>
<exclude>**/NetworkFailoverTest.*/**</exclude>
-
+
<exclude>**/vm/VMTransportBrokerTest.*</exclude>
<exclude>**/broker/MarshallingBrokerTest.*</exclude>
-
+
<exclude>**/AMQDeadlockTest3.*</exclude>
<!-- https://issues.apache.org/activemq/browse/AMQ-2050 -->
<exclude>**/ProxyConnectorTest.*</exclude>
-
+
</excludes>
</configuration>
</plugin>
@@ -549,7 +550,7 @@
</filesets>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -570,7 +571,7 @@
<goal>run</goal>
</goals>
</execution>
-
+
<execution>
<id>site</id>
<phase>site</phase>
@@ -664,12 +665,12 @@
<totalLineRate>50</totalLineRate>
</check>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
<profiles>
-
+
<profile>
<id>openwire-generate</id>
<dependencies>
@@ -705,7 +706,7 @@
</plugins>
</build>
</profile>
-
+
<profile>
<id>jdk1.4</id>
<activation>
@@ -718,7 +719,7 @@
</dependency>
</dependencies>
</profile>
-
+
</profiles>
</project>
