Author: ffang
Date: Tue Jan 18 08:37:01 2011
New Revision: 1060237
URL: http://svn.apache.org/viewvc?rev=1060237&view=rev
Log:
[SMX4-713]upgrade to use cxf 2.3.2-SNAPSHOT and camel 2.6-SNAPSHOT
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
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/camel/servicemix-camel/pom.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml
servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/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/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1060237&r1=1060236&r2=1060237&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Tue Jan 18 08:37:01 2011
@@ -168,11 +168,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
+
<artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxws-api-2.1</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
@@ -296,7 +296,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
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=1060237&r1=1060236&r2=1060237&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
Tue Jan 18 08:37:01 2011
@@ -414,7 +414,7 @@
<useProjectArtifact>false</useProjectArtifact>
<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-servlet_3.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
</includes>
</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=1060237&r1=1060236&r2=1060237&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
Tue Jan 18 08:37:01 2011
@@ -396,7 +396,7 @@
<useProjectArtifact>false</useProjectArtifact>
<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-servlet_3.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
</includes>
</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=1060237&r1=1060236&r2=1060237&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
Tue Jan 18 08:37:01 2011
@@ -54,7 +54,7 @@
<bundle>mvn:org.springframework/spring-jms/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset.bundle.version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version}</bundle>
@@ -77,7 +77,7 @@
<bundle>mvn:javax.mail/mail/${javax.mail.version}</bundle>
<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-2.1/${servicemix.specs.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.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.saaj-impl/${saaj-impl.bundle.version}</bundle>
@@ -113,14 +113,14 @@
<feature version="${camel.version}">camel-core</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http/${camel.version}</bundle>
</feature>
<feature name="camel-http4" version="${camel.version}">
<feature version="${camel.version}">camel-core</feature>
<bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcomponents.version}</bundle>
<bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${httpcomponents.version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http4/${camel.version}</bundle>
</feature>
<feature name="camel-mina" version="${camel.version}">
@@ -129,7 +129,7 @@
<bundle>mvn:org.apache.camel/camel-mina/${camel.version}</bundle>
</feature>
<feature name="camel-jetty" version="${camel.version}">
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
<bundle>mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
<bundle>mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
<bundle>mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
@@ -205,7 +205,7 @@
<bundle>mvn:org.apache.camel/camel-bindy/${camel.version}</bundle>
</feature>
<feature name="camel-cometd" version="${camel.version}">
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
<bundle>mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
<bundle>mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
<bundle>mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
@@ -293,7 +293,7 @@
<feature name="camel-ibatis" version="${camel.version}">
<feature version="${camel.version}">camel-spring</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
<bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
@@ -363,7 +363,7 @@
<bundle>mvn:org.apache.camel/camel-jpa/${camel.version}</bundle>
</feature>
<feature name="camel-jxpath" version="${camel.version}">
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
@@ -495,7 +495,7 @@
<feature name="camel-soap" version="${camel.version}">
<feature version="${camel.version}">camel-jaxb</feature>
<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.jaxws-api-2.1/${servicemix.specs.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.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.camel/camel-soap/${camel.version}</bundle>
</feature>
@@ -540,7 +540,7 @@
<bundle>mvn:org.apache.camel/camel-tagsoup/${camel.version}</bundle>
</feature>
<feature name="camel-velocity" version="${camel.version}">
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.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=1060237&r1=1060236&r2=1060237&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
Tue Jan 18 08:37:01 2011
@@ -24,7 +24,7 @@
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version}</bundle>
<bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo-connector.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
<bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
@@ -36,8 +36,8 @@
<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>
-
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.1/${servicemix.specs.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}/${servicemix.specs.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.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
<bundle>mvn:javax.mail/mail/${javax.mail.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
@@ -68,7 +68,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom.version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${axiom.version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
<bundle>mvn:org.apache.cxf/cxf-bundle/${cxf.version}</bundle>
</feature>
<feature name="cxf-osgi" version="${version}">
@@ -190,7 +190,18 @@
<feature name="servicemix-cxf-bc" version="${servicemix-cxf-bc.version}">
<feature
version="${servicemix-shared.version}">servicemix-shared</feature>
<feature version="${cxf.version}">cxf</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty.bundle.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty.version}</bundle>
+
<bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-jmx/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-servlets/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}</bundle>
<bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared.version}</bundle>
@@ -209,7 +220,7 @@
</feature>
<feature name="servicemix-http" version="${servicemix-http.version}">
<feature
version="${servicemix-shared.version}">servicemix-shared</feature>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
<bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
@@ -312,8 +323,8 @@
<feature version="${activemq.version}">activemq</feature>
<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>
-
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.1/${servicemix.specs.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}/${servicemix.specs.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.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-impl.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-wsn2005/${servicemix-wsn2005.version}</bundle>
</feature>
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=1060237&r1=1060236&r2=1060237&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Tue Jan 18
08:37:01 2011
@@ -133,7 +133,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>xfire</groupId>
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java?rev=1060237&r1=1060236&r2=1060237&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
Tue Jan 18 08:37:01 2011
@@ -36,6 +36,7 @@ import org.apache.cxf.endpoint.ServerImp
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.jaxws.ServiceImpl;
import org.apache.cxf.jaxws.support.ServiceDelegateAccessor;
+import org.apache.cxf.message.Message;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
@@ -316,14 +317,14 @@ public class WSAddressingTest extends Ca
staticBus.shutdown(true);
}
- private void addInterceptors(List<Interceptor> chain,
+ private void addInterceptors(List<Interceptor<? extends Message>> chain,
Interceptor[] interceptors) {
for (int i = 0; i < interceptors.length; i++) {
chain.add(interceptors[i]);
}
}
- private void removeInterceptors(List<Interceptor> chain,
+ private void removeInterceptors(List<Interceptor<? extends Message>> chain,
Interceptor[] interceptors) {
for (int i = 0; i < interceptors.length; i++) {
chain.add(interceptors[i]);
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml?rev=1060237&r1=1060236&r2=1060237&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/rm/server.xml
Tue Jan 18 08:37:01 2011
@@ -23,7 +23,9 @@
xmlns:test="http://cxf.apache.org/greeter_control";
xmlns:cxf="http://camel.apache.org/schema/cxf";
xmlns:camel="http://camel.apache.org/schema/spring";
+ xmlns:http="http://cxf.apache.org/transports/http/configuration";
xsi:schemaLocation="
+ http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd
@@ -32,6 +34,7 @@
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"/>
+ <import resource="classpath:META-INF/cxf/cxf-extension-http.xml"/>
<import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
<bean
class="org.apache.camel.component.cxf.transport.CamelTransportFactory"
lazy-init="true">
@@ -43,7 +46,9 @@
</list>
</property>
</bean>
-
+ <http:conduit
name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";>
+ <http:client AllowChunking="false"
DecoupledEndpoint="http://localhost:9995/decoupled_endpoint"/>
+ </http:conduit>
<camel:camelContext id="camel_context">
</camel:camelContext>
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=1060237&r1=1060236&r2=1060237&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml Tue Jan 18
08:37:01 2011
@@ -50,11 +50,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
+
<artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -135,8 +135,8 @@
</plugin>
<plugin>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-xsd</artifactId>
- <version>${cxf.version}</version>
+ <artifactId>cxf-xjc-plugin</artifactId>
+ <version>${cxf.xjc-utils.version}</version>
<executions>
<execution>
<id>generate-sources</id>
Modified: servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml?rev=1060237&r1=1060236&r2=1060237&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml Tue Jan 18
08:37:01 2011
@@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
+
<artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml?rev=1060237&r1=1060236&r2=1060237&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml
(original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml Tue
Jan 18 08:37:01 2011
@@ -73,7 +73,8 @@
javax.security.auth.callback,
org.apache.ws.security,
org.apache.commons.logging,
- org.apache.servicemix.util
+ org.apache.servicemix.util,
+ org.apache.ws.security.processor
</Import-Package>
<Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
<Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
Modified:
servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml?rev=1060237&r1=1060236&r2=1060237&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml
(original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml
Tue Jan 18 08:37:01 2011
@@ -58,6 +58,7 @@
javax.jws,
javax.xml.bind.annotation,
javax.wsdl,
+ javax.xml.namespace,
META-INF.cxf,
META-INF.cxf.osgi,
org.apache.cxf.bus,
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=1060237&r1=1060236&r2=1060237&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Tue Jan 18
08:37:01 2011
@@ -260,11 +260,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
+
<artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxws-api-2.1</artifactId>
+
<artifactId>org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
@@ -280,7 +280,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</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=1060237&r1=1060236&r2=1060237&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
Tue Jan 18 08:37:01 2011
@@ -78,15 +78,15 @@ public class CXFNMRIntegrationTest exten
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.0_spec"),
- getBundle("org.apache.geronimo.specs",
"geronimo-servlet_2.5_spec"),
+ getBundle("org.apache.geronimo.specs",
"geronimo-servlet_3.0_spec"),
getBundle("org.apache.geronimo.specs",
"geronimo-ws-metadata_2.0_spec"),
getBundle("org.apache.geronimo.specs",
"geronimo-j2ee-connector_1.5_spec"),
getBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jbi-api-1.0"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.stax-api-1.0"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.saaj-api-1.3"),
- getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxb-api-2.1"),
- getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxws-api-2.1"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxb-api-2.2"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxws-api-2.2"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.cglib"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jaxb-impl"),
@@ -108,7 +108,7 @@ public class CXFNMRIntegrationTest exten
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.abdera"),
getBundle("org.codehaus.jettison", "jettison"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlbeans"),
- getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jsr311-api-1.0"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jsr311-api-1.1"),
getBundle("org.ops4j.pax.web", "pax-web-api"),
getBundle("org.ops4j.pax.web", "pax-web-spi"),
getBundle("org.ops4j.pax.web", "pax-web-runtime"),
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=1060237&r1=1060236&r2=1060237&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
Tue Jan 18 08:37:01 2011
@@ -83,7 +83,7 @@ public class IntegrationTest extends Abs
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.0_spec"),
- getBundle("org.apache.geronimo.specs",
"geronimo-servlet_2.5_spec"),
+ getBundle("org.apache.geronimo.specs",
"geronimo-servlet_3.0_spec"),
getBundle("org.apache.geronimo.specs",
"geronimo-ws-metadata_2.0_spec"),
getBundle("org.apache.geronimo.specs",
"geronimo-j2ee-connector_1.5_spec"),
getBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
@@ -114,8 +114,8 @@ public class IntegrationTest extends Abs
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jbi-api-1.0"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.stax-api-1.0"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.saaj-api-1.3"),
- getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxb-api-2.1"),
- getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxws-api-2.1"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxb-api-2.2"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxws-api-2.2"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.cglib"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jaxb-impl"),
@@ -137,7 +137,7 @@ public class IntegrationTest extends Abs
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.abdera"),
getBundle("org.codehaus.jettison", "jettison"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlbeans"),
- getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jsr311-api-1.0"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jsr311-api-1.1"),
getBundle("org.ops4j.pax.web", "pax-web-api"),
getBundle("org.ops4j.pax.web", "pax-web-spi"),
getBundle("org.ops4j.pax.web", "pax-web-runtime"),
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1060237&r1=1060236&r2=1060237&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Tue Jan 18 08:37:01 2011
@@ -128,10 +128,11 @@
<activemq.version>5.4.2</activemq.version>
<!-- Camel -->
- <camel.version>2.5.0</camel.version>
+ <camel.version>2.6-SNAPSHOT</camel.version>
<!-- CXF -->
- <cxf.version>2.2.11</cxf.version>
+ <cxf.xjc-utils.version>2.3.0</cxf.xjc-utils.version>
+ <cxf.version>2.3.2-SNAPSHOT</cxf.version>
<!-- Geronimo -->
<geronimo-annotation.version>1.1.1</geronimo-annotation.version>
@@ -145,7 +146,7 @@
<geronimo-jsp.version>1.0.1</geronimo-jsp.version>
<geronimo-jta.version>1.1.1</geronimo-jta.version>
<geronimo-saaj.version>1.0.0</geronimo-saaj.version>
- <geronimo-servlet.version>1.1.2</geronimo-servlet.version>
+ <geronimo-servlet.version>1.0</geronimo-servlet.version>
<geronimo-ws-metadata.version>1.1.2</geronimo-ws-metadata.version>
<geronimo-transaction.version>2.1.3</geronimo-transaction.version>
@@ -186,7 +187,8 @@
<irclib.bundle.version>1.10_3</irclib.bundle.version>
<isorelax.bundle.version>20050913_3</isorelax.bundle.version>
<jasypt.bundle.version>1.6_1</jasypt.bundle.version>
- <jaxb-impl.bundle.version>2.1.13_1</jaxb-impl.bundle.version>
+ <jaxb.api.version>2.2</jaxb.api.version>
+ <jaxb-impl.bundle.version>2.2.1.1_1</jaxb-impl.bundle.version>
<jaxen.bundle.version>1.1.1_1</jaxen.bundle.version>
<jcr-api.bundle.version>1.0_3</jcr-api.bundle.version>
<jdt-core.bundle.version>3.2.3_4</jdt-core.bundle.version>
@@ -245,41 +247,41 @@
<servicemix-utils.version>1.4.0-SNAPSHOT</servicemix-utils.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.nmr.version>1.4.0-SNAPSHOT</servicemix.nmr.version>
- <servicemix.specs.version>1.6.0</servicemix.specs.version>
+ <servicemix.specs.version>1.7.0</servicemix.specs.version>
- <servicemix-bean.version>2010.02</servicemix-bean.version>
- <servicemix-camel.version>2010.02</servicemix-camel.version>
- <servicemix-cxf-bc.version>2010.02</servicemix-cxf-bc.version>
- <servicemix-cxf-se.version>2010.02</servicemix-cxf-se.version>
- <servicemix-drools.version>2010.02</servicemix-drools.version>
- <servicemix-eip.version>2010.02</servicemix-eip.version>
- <servicemix-exec.version>2010.02</servicemix-exec.version>
- <servicemix-file.version>2010.02</servicemix-file.version>
- <servicemix-ftp.version>2010.02</servicemix-ftp.version>
- <servicemix-http.version>2010.02</servicemix-http.version>
- <servicemix-jms.version>2010.02</servicemix-jms.version>
- <servicemix-jsr181.version>2010.02</servicemix-jsr181.version>
- <servicemix-mail.version>2010.02</servicemix-mail.version>
- <servicemix-osworkflow.version>2010.02</servicemix-osworkflow.version>
- <servicemix-quartz.version>2010.02</servicemix-quartz.version>
- <servicemix-saxon.version>2010.02</servicemix-saxon.version>
- <servicemix-script.version>2010.02</servicemix-script.version>
- <servicemix-scripting.version>2010.02</servicemix-scripting.version>
- <servicemix-shared.version>2010.02</servicemix-shared.version>
- <servicemix-smpp.version>2010.02</servicemix-smpp.version>
- <servicemix-snmp.version>2010.02</servicemix-snmp.version>
- <servicemix-truezip.version>2010.02</servicemix-truezip.version>
- <servicemix-validation.version>2010.02</servicemix-validation.version>
- <servicemix-vfs.version>2010.02</servicemix-vfs.version>
- <servicemix-wsn2005.version>2010.02</servicemix-wsn2005.version>
- <servicemix-xmpp.version>2010.02</servicemix-xmpp.version>
+ <servicemix-bean.version>2011.01-SNAPSHOT</servicemix-bean.version>
+ <servicemix-camel.version>2011.01-SNAPSHOT</servicemix-camel.version>
+ <servicemix-cxf-bc.version>2011.01-SNAPSHOT</servicemix-cxf-bc.version>
+ <servicemix-cxf-se.version>2011.01-SNAPSHOT</servicemix-cxf-se.version>
+ <servicemix-drools.version>2011.01-SNAPSHOT</servicemix-drools.version>
+ <servicemix-eip.version>2011.01-SNAPSHOT</servicemix-eip.version>
+ <servicemix-exec.version>2011.01-SNAPSHOT</servicemix-exec.version>
+ <servicemix-file.version>2011.01-SNAPSHOT</servicemix-file.version>
+ <servicemix-ftp.version>2011.01-SNAPSHOT</servicemix-ftp.version>
+ <servicemix-http.version>2011.01-SNAPSHOT</servicemix-http.version>
+ <servicemix-jms.version>2011.01-SNAPSHOT</servicemix-jms.version>
+ <servicemix-jsr181.version>2011.01-SNAPSHOT</servicemix-jsr181.version>
+ <servicemix-mail.version>2011.01-SNAPSHOT</servicemix-mail.version>
+
<servicemix-osworkflow.version>2011.01-SNAPSHOT</servicemix-osworkflow.version>
+ <servicemix-quartz.version>2011.01-SNAPSHOT</servicemix-quartz.version>
+ <servicemix-saxon.version>2011.01-SNAPSHOT</servicemix-saxon.version>
+ <servicemix-script.version>2011.01-SNAPSHOT</servicemix-script.version>
+
<servicemix-scripting.version>2011.01-SNAPSHOT</servicemix-scripting.version>
+ <servicemix-shared.version>2011.01-SNAPSHOT</servicemix-shared.version>
+ <servicemix-smpp.version>2011.01-SNAPSHOT</servicemix-smpp.version>
+ <servicemix-snmp.version>2011.01-SNAPSHOT</servicemix-snmp.version>
+
<servicemix-truezip.version>2011.01-SNAPSHOT</servicemix-truezip.version>
+
<servicemix-validation.version>2011.01-SNAPSHOT</servicemix-validation.version>
+ <servicemix-vfs.version>2011.01-SNAPSHOT</servicemix-vfs.version>
+
<servicemix-wsn2005.version>2011.01-SNAPSHOT</servicemix-wsn2005.version>
+ <servicemix-xmpp.version>2011.01-SNAPSHOT</servicemix-xmpp.version>
<!-- PAX -->
<pax.url.version>1.2.1</pax.url.version>
<pax.web.version>0.7.4</pax.web.version>
<!-- Spring -->
- <spring.version>3.0.4.RELEASE</spring.version>
+ <spring.version>3.0.5.RELEASE</spring.version>
<spring.osgi.version>1.2.0</spring.osgi.version>
<!-- ODE -->
@@ -312,10 +314,11 @@
<jackrabbit.version>1.5.3</jackrabbit.version>
<jackson.version>1.6.0</jackson.version>
<jaxp-ri.version>1.4.4</jaxp-ri.version>
- <jaxws-api.version>2.1</jaxws-api.version>
+ <jaxws-api.version>2.2</jaxws-api.version>
+ <jaxrs.api.version>1.1</jaxrs.api.version>
<javassist.version>3.9.0</javassist.version>
<javax.mail.version>1.4.3</javax.mail.version>
- <jetty.version>7.1.6.v20100715</jetty.version>
+ <jetty.version>7.2.2.v20101205</jetty.version>
<jettison.version>1.2</jettison.version>
<junit.version>4.7</junit.version>
<log4j.version>1.2.16</log4j.version>
@@ -470,12 +473,12 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
-
<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
+
<artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
-
<artifactId>org.apache.servicemix.specs.jaxws-api-2.1</artifactId>
+
<artifactId>org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
@@ -817,7 +820,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
<version>${geronimo-jaxws.version}</version>
</dependency>
<dependency>
@@ -842,7 +845,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<version>${geronimo-servlet.version}</version>
</dependency>
<dependency>
