Sophie

Sophie

distrib > Mageia > 7 > i586 > media > core-release-src > by-pkgid > 129304ae12370f6669d5ef4bd06dfbf0 > files > 2

glassfish-jaxws-2.2.10-7.mga7.src.rpm

diff -Nru glassfish-jaxws-2.2.10/boms/bom/pom.xml glassfish-jaxws-2.2.10.fixdeps/boms/bom/pom.xml
--- glassfish-jaxws-2.2.10/boms/bom/pom.xml	2015-02-04 19:59:26.853471013 +0100
+++ glassfish-jaxws-2.2.10.fixdeps/boms/bom/pom.xml	2015-02-04 20:02:12.527096166 +0100
@@ -161,8 +161,8 @@
                 <classifier>sources</classifier>
             </dependency>
             <dependency>
-                <groupId>javax.xml.soap</groupId>
-                <artifactId>javax.xml.soap-api</artifactId>
+                <groupId>org.jboss.spec.javax.xml.soap</groupId>
+                <artifactId>jboss-saaj-api_1.3_spec</artifactId>
                 <version>${saaj-api.version}</version>
                 <classifier>sources</classifier>
             </dependency>
@@ -173,8 +173,8 @@
                 <classifier>sources</classifier>
             </dependency>
             <dependency>
-                <groupId>javax.xml.ws</groupId>
-                <artifactId>jaxws-api</artifactId>
+                <groupId>org.jboss.spec.javax.xml.ws</groupId>
+                <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
                 <version>${jaxws-api.version}</version>
                 <classifier>sources</classifier>
             </dependency>
@@ -261,8 +261,8 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.xml.soap</groupId>
-                <artifactId>javax.xml.soap-api</artifactId>
+                <groupId>org.jboss.spec.javax.xml.soap</groupId>
+                <artifactId>jboss-saaj-api_1.3_spec</artifactId>
                 <version>${saaj-api.version}</version>
                 <exclusions>
                     <!-- part of JDK 6+ -->
@@ -285,8 +285,8 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.xml.ws</groupId>
-                <artifactId>jaxws-api</artifactId>
+                <groupId>org.jboss.spec.javax.xml.ws</groupId>
+                <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
                 <version>${jaxws-api.version}</version>
             </dependency>
 
@@ -297,13 +297,13 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.annotation</groupId>
-                <artifactId>javax.annotation-api</artifactId>
+                <groupId>org.jboss.spec.javax.annotation</groupId>
+                <artifactId>jboss-annotations-api_1.2_spec</artifactId>
                 <version>${javax.annotation-api.version}</version>
             </dependency>
             <dependency>
-                <groupId>javax.annotation</groupId>
-                <artifactId>javax.annotation-api</artifactId>
+                <groupId>org.jboss.spec.javax.annotation</groupId>
+                <artifactId>jboss-annotations-api_1.2_spec</artifactId>
                 <version>${javax.annotation-api.version}</version>
                 <classifier>sources</classifier>
             </dependency>
@@ -328,12 +328,12 @@
             <!-- Distribution Artifacts -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>jaxws-rt</artifactId>
+                <artifactId>rt</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>jaxws-tools</artifactId>
+                <artifactId>wscompile</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
diff -Nru glassfish-jaxws-2.2.10/bundles/jaxws-ri/pom.xml glassfish-jaxws-2.2.10.fixdeps/bundles/jaxws-ri/pom.xml
--- glassfish-jaxws-2.2.10/bundles/jaxws-ri/pom.xml	2014-08-03 17:00:07.000000000 +0200
+++ glassfish-jaxws-2.2.10.fixdeps/bundles/jaxws-ri/pom.xml	2015-02-04 20:03:35.985373575 +0100
@@ -61,21 +61,21 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>org.jboss.spec.javax.annotation</groupId>
+            <artifactId>jboss-annotations-api_1.2_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.org.apache.xml.internal</groupId>
-            <artifactId>resolver</artifactId>
+            <groupId>xml-resolver</groupId>
+            <artifactId>xml-resolver</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jaxws-rt</artifactId>
+            <artifactId>rt</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jaxws-tools</artifactId>
+            <artifactId>wscompile</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff -Nru glassfish-jaxws-2.2.10/bundles/jaxws-rt/pom.xml glassfish-jaxws-2.2.10.fixdeps/bundles/jaxws-rt/pom.xml
--- glassfish-jaxws-2.2.10/bundles/jaxws-rt/pom.xml	2015-02-04 19:59:26.855470900 +0100
+++ glassfish-jaxws-2.2.10.fixdeps/bundles/jaxws-rt/pom.xml	2015-02-03 18:28:02.727957127 +0100
@@ -63,16 +63,16 @@
             <artifactId>jaxb-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
+            <groupId>org.jboss.spec.javax.xml.ws</groupId>
+            <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.xml.soap</groupId>
-            <artifactId>javax.xml.soap-api</artifactId>
+            <groupId>org.jboss.spec.javax.xml.soap</groupId>
+            <artifactId>jboss-saaj-api_1.3_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>org.jboss.spec.javax.annotation</groupId>
+            <artifactId>jboss-annotations-api_1.2_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.jws</groupId>
@@ -80,12 +80,12 @@
         </dependency>
         <!-- Provided dependencies -->
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
diff -Nru glassfish-jaxws-2.2.10/bundles/jaxws-tools/pom.xml glassfish-jaxws-2.2.10.fixdeps/bundles/jaxws-tools/pom.xml
--- glassfish-jaxws-2.2.10/bundles/jaxws-tools/pom.xml	2014-08-03 17:00:07.000000000 +0200
+++ glassfish-jaxws-2.2.10.fixdeps/bundles/jaxws-tools/pom.xml	2015-02-04 20:04:08.452536381 +0100
@@ -61,14 +61,14 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jaxws-rt</artifactId>
+            <artifactId>rt</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-xjc</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-jxc</artifactId>
         </dependency>
     </dependencies>
diff -Nru glassfish-jaxws-2.2.10/pom.xml glassfish-jaxws-2.2.10.fixdeps/pom.xml
--- glassfish-jaxws-2.2.10/pom.xml	2014-08-03 17:00:07.000000000 +0200
+++ glassfish-jaxws-2.2.10.fixdeps/pom.xml	2015-02-03 18:21:57.231031670 +0100
@@ -884,8 +884,6 @@
                 <groupId>com.sun</groupId>
                 <artifactId>tools</artifactId>
                 <version>1.6</version>
-                <scope>system</scope>
-                <systemPath>${tools.jar}</systemPath>
             </dependency>
             
             <!-- Test Dependencies -->
@@ -902,8 +900,8 @@
     <dependencies>
             <!-- Make sure new apis are used across the project -->
             <dependency>
-                <groupId>javax.xml.ws</groupId>
-                <artifactId>jaxws-api</artifactId>
+                <groupId>org.jboss.spec.javax.xml.ws</groupId>
+                <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
             </dependency>
 
             <dependency>
@@ -912,8 +910,8 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.xml.soap</groupId>
-                <artifactId>javax.xml.soap-api</artifactId>
+                <groupId>org.jboss.spec.javax.xml.soap</groupId>
+                <artifactId>jboss-saaj-api_1.3_spec</artifactId>
             </dependency>
 
             <dependency>
@@ -922,8 +920,8 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.annotation</groupId>
-                <artifactId>javax.annotation-api</artifactId>
+                <groupId>org.jboss.spec.javax.annotation</groupId>
+                <artifactId>jboss-annotations-api_1.2_spec</artifactId>
                 <scope>provided</scope>
             </dependency>
     </dependencies>
diff -Nru glassfish-jaxws-2.2.10/rt/pom.xml glassfish-jaxws-2.2.10.fixdeps/rt/pom.xml
--- glassfish-jaxws-2.2.10/rt/pom.xml	2015-02-04 19:59:26.874469825 +0100
+++ glassfish-jaxws-2.2.10.fixdeps/rt/pom.xml	2015-02-03 18:17:53.754858553 +0100
@@ -68,12 +68,12 @@
             <artifactId>policy</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.pfl</groupId>
diff -Nru glassfish-jaxws-2.2.10/tools/wscompile/pom.xml glassfish-jaxws-2.2.10.fixdeps/tools/wscompile/pom.xml
--- glassfish-jaxws-2.2.10/tools/wscompile/pom.xml	2014-08-03 17:00:07.000000000 +0200
+++ glassfish-jaxws-2.2.10.fixdeps/tools/wscompile/pom.xml	2015-02-03 18:17:53.829853986 +0100
@@ -65,21 +65,21 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-xjc</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-jxc</artifactId>
         </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jaxws-rt</artifactId>
+            <artifactId>rt</artifactId>
         </dependency>
 
         <dependency>
@@ -173,18 +173,18 @@
                                     <type>jar</type>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>javax.xml.ws</groupId>
-                                    <artifactId>jaxws-api</artifactId>
+                                    <groupId>org.jboss.spec.javax.xml.ws</groupId>
+                                    <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
                                     <type>jar</type>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>javax.xml.soap</groupId>
-                                    <artifactId>javax.xml.soap-api</artifactId>
+                                    <groupId>org.jboss.spec.javax.xml.soap</groupId>
+                                    <artifactId>jboss-saaj-api_1.3_spec</artifactId>
                                     <type>jar</type>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>javax.annotation</groupId>
-                                    <artifactId>javax.annotation-api</artifactId>
+                                    <groupId>org.jboss.spec.javax.annotation</groupId>
+                                    <artifactId>jboss-annotations-api_1.2_spec</artifactId>
                                     <type>jar</type>
                                 </artifactItem>
                                 <artifactItem>
diff -Nru glassfish-jaxws-2.2.10/transports/async-client-transport/pom.xml glassfish-jaxws-2.2.10.fixdeps/transports/async-client-transport/pom.xml
--- glassfish-jaxws-2.2.10/transports/async-client-transport/pom.xml	2014-08-03 17:00:07.000000000 +0200
+++ glassfish-jaxws-2.2.10.fixdeps/transports/async-client-transport/pom.xml	2015-02-03 18:17:53.831853865 +0100
@@ -63,7 +63,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jaxws-rt</artifactId>
+            <artifactId>rt</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff -Nru glassfish-jaxws-2.2.10/transports/local/pom.xml glassfish-jaxws-2.2.10.fixdeps/transports/local/pom.xml
--- glassfish-jaxws-2.2.10/transports/local/pom.xml	2014-08-03 17:00:07.000000000 +0200
+++ glassfish-jaxws-2.2.10.fixdeps/transports/local/pom.xml	2015-02-03 20:40:59.486911167 +0100
@@ -61,7 +61,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jaxws-rt</artifactId>
+            <artifactId>rt</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>