Author: ffang
Date: Wed Oct 13 09:22:50 2010
New Revision: 1022042
URL: http://svn.apache.org/viewvc?rev=1022042&view=rev
Log:
[SMX4-607] downgrade geronimo-annotation version to 1.0 from 1.1
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml
servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
servicemix/smx4/features/trunk/pom.xml
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1022042&r1=1022041&r2=1022042&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
Wed Oct 13 09:22:50 2010
@@ -389,7 +389,7 @@
<outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
-
<include>org.apache.geronimo.specs:geronimo-annotation_1.1_spec</include>
+
<include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
</includes>
</dependencySet>
<dependencySet>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1022042&r1=1022041&r2=1022042&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
Wed Oct 13 09:22:50 2010
@@ -370,7 +370,7 @@
<outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
-
<include>org.apache.geronimo.specs:geronimo-annotation_1.1_spec</include>
+
<include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
</includes>
</dependencySet>
<dependencySet>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml?rev=1022042&r1=1022041&r2=1022042&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
Wed Oct 13 09:22:50 2010
@@ -79,7 +79,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}/${servicemix.specs.version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.0/${servicemix.specs.version}</bundle>
@@ -211,7 +211,7 @@
<feature name='camel-guice' version='${camel.version}'>
<bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guiceyfruit-core/2.0</bundle>
<bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guice-all/2.0</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
<feature version='${camel.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-guice/${camel.version}</bundle>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=1022042&r1=1022041&r2=1022042&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
Wed Oct 13 09:22:50 2010
@@ -34,7 +34,7 @@
<feature name="cxf" version="${cxf.version}">
<feature>transaction</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}</bundle>
@@ -233,7 +233,7 @@
</feature>
<feature name="servicemix-bean" version="${servicemix-bean.version}">
<feature
version="${servicemix-shared.version}">servicemix-shared</feature>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-bean/${servicemix-bean.version}</bundle>
</feature>
<feature name="servicemix-camel" version="${servicemix-camel.version}">
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml?rev=1022042&r1=1022041&r2=1022042&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/ode-features.xml
Wed Oct 13 09:22:50 2010
@@ -19,7 +19,7 @@
<features>
<feature name="openjpa" version="${openjpa.version}">
<feature>transaction</feature>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo-annotation.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo-jpa.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
Modified: servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml?rev=1022042&r1=1022041&r2=1022042&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml Wed Oct 13
09:22:50 2010
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
Modified: servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml?rev=1022042&r1=1022041&r2=1022042&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml Wed Oct 13
09:22:50 2010
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=1022042&r1=1022041&r2=1022042&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Wed Oct 13
09:22:50 2010
@@ -272,7 +272,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
Modified:
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=1022042&r1=1022041&r2=1022042&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
Wed Oct 13 09:22:50 2010
@@ -77,7 +77,7 @@ public class CXFNMRIntegrationTest exten
return new String[] {
getBundle("org.apache.felix", "org.apache.felix.prefs"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.activation-api-1.1"),
- getBundle("org.apache.geronimo.specs",
"geronimo-annotation_1.1_spec"),
+ getBundle("org.apache.geronimo.specs",
"geronimo-annotation_1.0_spec"),
getBundle("org.apache.geronimo.specs",
"geronimo-servlet_2.5_spec"),
getBundle("org.apache.geronimo.specs",
"geronimo-ws-metadata_2.0_spec"),
getBundle("org.apache.geronimo.specs",
"geronimo-j2ee-connector_1.5_spec"),
Modified:
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=1022042&r1=1022041&r2=1022042&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Wed Oct 13 09:22:50 2010
@@ -82,7 +82,7 @@ public class IntegrationTest extends Abs
return new String[] {
getBundle("org.apache.felix", "org.apache.felix.prefs"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.activation-api-1.1"),
- getBundle("org.apache.geronimo.specs",
"geronimo-annotation_1.1_spec"),
+ getBundle("org.apache.geronimo.specs",
"geronimo-annotation_1.0_spec"),
getBundle("org.apache.geronimo.specs",
"geronimo-servlet_2.5_spec"),
getBundle("org.apache.geronimo.specs",
"geronimo-ws-metadata_2.0_spec"),
getBundle("org.apache.geronimo.specs",
"geronimo-j2ee-connector_1.5_spec"),
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1022042&r1=1022041&r2=1022042&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Oct 13 09:22:50 2010
@@ -121,7 +121,7 @@
<cxf.version>2.2.10</cxf.version>
<!-- Geronimo -->
- <geronimo-annotation.version>1.0</geronimo-annotation.version>
+ <geronimo-annotation.version>1.1.1</geronimo-annotation.version>
<geronimo-connector.version>2.1.3</geronimo-connector.version>
<geronimo-el.version>1.0.1</geronimo-el.version>
<geronimo-j2ee-connector.version>2.0.0</geronimo-j2ee-connector.version>
@@ -758,11 +758,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <version>${geronimo-annotation.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
<version>${geronimo-j2ee-connector.version}</version>
</dependency>
