Author: jbonofre
Date: Fri Feb 18 12:18:58 2011
New Revision: 1071980
URL: http://svn.apache.org/viewvc?rev=1071980&view=rev
Log:
[SM-2057] Add JAX-WS API in the distribution kit.
Modified:
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
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml?rev=1071980&r1=1071979&r2=1071980&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml Fri Feb 18
12:18:58 2011
@@ -362,7 +362,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>org.fusesource.commonman</groupId>
@@ -935,7 +935,7 @@
<jaxb.version>${jaxb.version}</jaxb.version>
<jaxb.impl.version>${jaxb.impl.version}</jaxb.impl.version>
<ws.metadata.version>1.1.2</ws.metadata.version>
- <jaxws.version>1.0</jaxws.version>
+ <jaxws.version>${jaxws.version}</jaxws.version>
</filters>
</configuration>
<executions>
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=1071980&r1=1071979&r2=1071980&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 Feb 18 12:18:58 2011
@@ -154,6 +154,7 @@
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
<include>org.apache.geronimo.specs:geronimo-ejb_2.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
+
<include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
<include>org.jencks:jencks</include>
<include>org.objectweb.howl:howl</include>
@@ -166,6 +167,7 @@
<include>javax.activation:activation</include>
<include>javax.mail:mail</include>
<include>javax.xml.bind:jaxb-api</include>
+ <include>javax.xml.ws:jaxws-api</include>
<include>com.thoughtworks.xstream:xstream</include>
<include>xerces:xercesImpl</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=1071980&r1=1071979&r2=1071980&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 Feb 18 12:18:58 2011
@@ -146,6 +146,7 @@
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
<include>org.apache.geronimo.specs:geronimo-ejb_2.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
+
<include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
<include>org.jencks:jencks</include>
<include>org.objectweb.howl:howl</include>
@@ -158,6 +159,7 @@
<include>javax.activation:activation</include>
<include>javax.mail:mail</include>
<include>javax.xml.bind:jaxb-api</include>
+ <include>javax.xml.ws:jaxws-api</include>
<include>com.thoughtworks.xstream:xstream</include>
<include>xerces:xercesImpl</include>
Modified: servicemix/smx3/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=1071980&r1=1071979&r2=1071980&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Fri Feb 18 12:18:58 2011
@@ -134,6 +134,7 @@
<jaxb.version>2.2</jaxb.version>
<jaxb.impl.version>2.2.1.1</jaxb.impl.version>
<jaxb.xjc.version>2.2.1.1</jaxb.xjc.version>
+ <jaxws.version>2.2</jaxws.version>
<derby-version>10.5.3.0_1</derby-version>
<saxon-version>8.9</saxon-version>
<previous.releases>3.1.2,3.2,3.2.1,3.2.2,3.2.3,3.3,3.3.1</previous.releases>
@@ -743,7 +744,25 @@
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
- <version>2.0</version>
+ <version>${jaxws.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>xfire</groupId>
