Attachment 945096 Details for Bug 1150687 – Productization patch for JBossWS sources

[patch] Productization patch for JBossWS sources

jbossws-cxf-4.3.1.Final-EAP-6.4.0.DR4.diff (text/plain), 19.85 KB, created by Jan Blizňák on 2014-10-08 16:47:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Blizňák

Created: 2014-10-08 16:47:22 UTC

Size: 19.85 KB

patch

obsolete

>Index: modules/endorsed/pom.xml
>--- modules/endorsed/pom.xml	(revision 17303)
>+++ modules/endorsed/pom.xml	(working copy)
>===================================================================
>@@ -9,7 +9,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../../pom.xml</relativePath>
>   </parent>
> 
>Index: modules/addons/transports/udp/pom.xml
>===================================================================
>--- modules/addons/transports/udp/pom.xml	(revision 17303)
>+++ modules/addons/transports/udp/pom.xml	(working copy)
>@@ -8,7 +8,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf-addons</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../../pom.xml</relativePath>
>   </parent>
>   
>Index: modules/addons/transports/http/httpserver/pom.xml
>===================================================================
>--- modules/addons/transports/http/httpserver/pom.xml	(revision 17303)
>+++ modules/addons/transports/http/httpserver/pom.xml	(working copy)
>@@ -8,7 +8,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf-addons</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../../../pom.xml</relativePath>
>   </parent>
>   
>Index: modules/addons/pom.xml
>===================================================================
>--- modules/addons/pom.xml	(revision 17303)
>+++ modules/addons/pom.xml	(working copy)
>@@ -10,7 +10,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../../pom.xml</relativePath>
>   </parent>
> 
>Index: modules/dist/pom.xml
>===================================================================
>--- modules/dist/pom.xml	(revision 17303)
>+++ modules/dist/pom.xml	(working copy)
>@@ -8,7 +8,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../../pom.xml</relativePath>
>   </parent>
> 
>Index: modules/resources/pom.xml
>===================================================================
>--- modules/resources/pom.xml	(revision 17303)
>+++ modules/resources/pom.xml	(working copy)
>@@ -9,7 +9,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../../pom.xml</relativePath>
>   </parent>
> 
>Index: modules/client/pom.xml
>===================================================================
>--- modules/client/pom.xml	(revision 17303)
>+++ modules/client/pom.xml	(working copy)
>@@ -8,7 +8,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../../pom.xml</relativePath>
>   </parent>
>   
>Index: modules/server/pom.xml
>===================================================================
>--- modules/server/pom.xml	(revision 17303)
>+++ modules/server/pom.xml	(working copy)
>@@ -9,7 +10,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../../pom.xml</relativePath>
>   </parent>
>   
>Index: modules/testsuite/cxf-spring-tests/pom.xml
>===================================================================
>--- modules/testsuite/cxf-spring-tests/pom.xml	(revision 17303)
>+++ modules/testsuite/cxf-spring-tests/pom.xml	(working copy)
>@@ -10,7 +10,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf-testsuite</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../pom.xml</relativePath>
>   </parent>
>   
>Index: modules/testsuite/cxf-tests/pom.xml
>===================================================================
>--- modules/testsuite/cxf-tests/pom.xml	(revision 17303)
>+++ modules/testsuite/cxf-tests/pom.xml	(working copy)
>@@ -10,7 +10,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf-testsuite</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../pom.xml</relativePath>
>   </parent>
>   
>@@ -220,6 +220,27 @@
>       </build>
>     </profile>
>     
>+    <profile>
>+		<id>nojaspi</id>
>+		<activation>
>+			<property>
>+				<name>!jaspi</name>
>+			</property>
>+		</activation>
>+		<build>
>+			<plugins>
>+				<plugin>
>+					<groupId>org.apache.maven.plugins</groupId>
>+					<artifactId>maven-compiler-plugin</artifactId>
>+					<configuration>
>+						<testExcludes>
>+							<testExclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/*.java</testExclude>
>+						</testExcludes>
>+					</configuration>
>+				</plugin>
>+			</plugins>
>+		</build>
>+    </profile>
>   </profiles>
>   
> </project>
>Index: modules/testsuite/pom.xml
>===================================================================
>--- modules/testsuite/pom.xml	(revision 17303)
>+++ modules/testsuite/pom.xml	(working copy)
>@@ -10,7 +10,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../../pom.xml</relativePath>
>   </parent>
> 
>@@ -27,8 +27,8 @@
>     <log4j.output.dir>${project.build.directory}</log4j.output.dir>
>     <appclient.output.dir>${project.build.directory}/appclient-logs</appclient.output.dir>
>     <org.littleshoot.littleproxy.version>1.0.0-beta2</org.littleshoot.littleproxy.version>
>-    <org.slf4j.version>1.6.1</org.slf4j.version>
>-    <gnu.getopt.version>1.0.13</gnu.getopt.version>
>+    <org.slf4j.version>1.7.2.redhat-3</org.slf4j.version>
>+    <gnu.getopt.version>1.0.13.redhat-4</gnu.getopt.version>
>     <bc.version>1.46</bc.version>
>     <log4j.version>1.2.14</log4j.version>
>     <remote.port>4447</remote.port>
>@@ -70,12 +70,20 @@
>       <groupId>org.jboss.ws.cxf</groupId>
>       <artifactId>jbossws-cxf-client</artifactId>
>       <version>${project.version}</version>
>+      <exclusions>
>+        <exclusion>
>+          <groupId>org.slf4j</groupId>
>+          <artifactId>log4j-over-slf4j</artifactId>
>+        </exclusion>
>+      </exclusions>
>     </dependency>
>+    
>     <dependency>
>       <groupId>org.jboss.ws.cxf</groupId>
>       <artifactId>jbossws-cxf-factories</artifactId>
>@@ -116,12 +124,23 @@
>       <version>${bc.version}</version>
>       <scope>test</scope>
>     </dependency>
>+    
>+    <dependency>
>+      <groupId>org.slf4j</groupId>
>+      <artifactId>slf4j-api</artifactId>
>+      <version>1.7.2.redhat-3</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>org.slf4j</groupId>
>+      <artifactId>slf4j-log4j12</artifactId>
>+      <version>1.7.2</version>
>+    </dependency>
>   </dependencies>
> 
>   
>@@ -683,9 +702,6 @@
>                  
>                  <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude>
> 
>-                 
>-                 <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>
>-
>                  
>                  <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude>
> 
>@@ -703,6 +722,9 @@
>                  
>                  
>                  <exclude>org/jboss/test/ws/jaxws/cxf/jbws3679/**</exclude>
>+ 
>+                 
>+                 <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase*</exclude>
>               </excludes>
>             </configuration>
>           </plugin>
>@@ -785,6 +807,9 @@
> 
>                  
>                  <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
>+ 
>+                 
>+                 <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase*</exclude>
>               </excludes>
>             </configuration>
>           </plugin>
>@@ -867,6 +892,9 @@
> 
>                  
>                  <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
>+ 
>+                 
>+                 <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase*</exclude>
>               </excludes>
>             </configuration>
>           </plugin>
>Index: modules/testsuite/shared-tests/pom.xml
>===================================================================
>--- modules/testsuite/shared-tests/pom.xml	(revision 17303)
>+++ modules/testsuite/shared-tests/pom.xml	(working copy)
>@@ -10,7 +10,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf-testsuite</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../pom.xml</relativePath>
>   </parent>
> 
>@@ -27,6 +27,12 @@
>       <artifactId>jbossws-cxf-client</artifactId>
>       <version>${project.version}</version>
>       <scope>runtime</scope> 
>+      <exclusions>
>+		<exclusion>
>+		  <groupId>org.slf4j</groupId>
>+		  <artifactId>log4j-over-slf4j</artifactId>
>+		</exclusion>
>+      </exclusions>
>     </dependency>
>     <dependency>
>       <groupId>junit</groupId>
>Index: modules/addons/transports/http/undertow/pom.xml
>===================================================================
>--- modules/addons/transports/http/undertow/pom.xml	(revision 17303)
>+++ modules/addons/transports/http/undertow/pom.xml	(working copy)
>@@ -8,7 +8,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf-addons</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../../../pom.xml</relativePath>
>   </parent>
>   
>Index: modules/jaspi/pom.xml
>===================================================================
>--- modules/jaspi/pom.xml	(revision 17303)
>+++ modules/jaspi/pom.xml	(working copy)
>@@ -9,7 +9,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../../pom.xml</relativePath>
>   </parent>
>   
>Index: modules/testsuite/test-utils/pom.xml
>===================================================================
>--- modules/testsuite/test-utils/pom.xml	(revision 17303)
>+++ modules/testsuite/test-utils/pom.xml	(working copy)
>@@ -10,7 +10,7 @@
>   <parent>
>     <groupId>org.jboss.ws.cxf</groupId>
>     <artifactId>jbossws-cxf-testsuite</artifactId>
>-    <version>4.3.1.Final</version>
>+    <version>4.3.1.Final</version>
>     <relativePath>../pom.xml</relativePath>
>   </parent>
>   
>Index: pom.xml
>===================================================================
>--- pom.xml	(revision 17303)
>+++ pom.xml	(working copy)
>@@ -32,7 +32,7 @@
>   <description>JBossWS CXF stack</description>
> 
>   
>-  <version>4.3.1.Final</version>
>+  <version>4.3.1.Final</version>
>   
>   
>   <parent>
>@@ -60,57 +60,57 @@
>   
>   
>   <properties>
>-    <jbossws.api.version>1.0.2.Final</jbossws.api.version>
>+    <jbossws.api.version>1.0.2.Final-redhat-1</jbossws.api.version>
>-    <jbossws.spi.version>2.3.0.Final</jbossws.spi.version>
>+    <jbossws.spi.version>2.3.0.Final-redhat-1</jbossws.spi.version>
>-    <jbossws.common.version>2.3.1.Final</jbossws.common.version>
>+    <jbossws.common.version>2.3.1.Final</jbossws.common.version>
>-    <jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version>
>+    <jbossws.common.tools.version>1.2.0.Final-redhat-2</jbossws.common.tools.version>
>     <jbossws.jboss720.version>4.3.0.Final</jbossws.jboss720.version>
>     <jbossws.wildfly800.version>4.3.0.Final</jbossws.wildfly800.version>
>     <jbossws.wildfly810.version>4.3.1.Final</jbossws.wildfly810.version>
>-    <jbossws.native.version>4.2.0.Final</jbossws.native.version>
>+    <jbossws.native.version>4.2.0.Final-redhat-1</jbossws.native.version>
>-    <jboss720.version>7.2.0.Final</jboss720.version>
>+    <jboss720.version>7.5.0.Final-redhat-6</jboss720.version>
>     <wildfly800.version>8.0.0.Final</wildfly800.version>
>     <wildfly810.version>8.1.0.Final</wildfly810.version>
>-    <ejb.api.version>1.0.2.Final</ejb.api.version>
>+    <ejb.api.version>1.0.2.Final-redhat-2</ejb.api.version>
>-    <cxf.version>2.7.12</cxf.version>
>+    <cxf.version>2.7.12.redhat-2</cxf.version>
>-    <cxf.asm.version>3.3.1</cxf.asm.version>
>+    <cxf.asm.version>3.3.1-redhat-5</cxf.asm.version>
>-    <cxf.xjcplugins.version>2.6.1</cxf.xjcplugins.version>
>+    <cxf.xjcplugins.version>2.6.2.redhat-1</cxf.xjcplugins.version>
>-    <jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
>+    <jboss.common.core.version>2.2.17.GA-redhat-2</jboss.common.core.version>
>-    <jboss-logging.version>3.1.2.GA</jboss-logging.version>
>+    <jboss-logging.version>3.1.4.GA-redhat-1</jboss-logging.version>
>-    <jboss-logging-processor.version>1.0.3.Final</jboss-logging-processor.version>
>+    <jboss-logging-processor.version>1.1.0.Final</jboss-logging-processor.version>
>-    <jboss.jandex.version>1.0.3.Final</jboss.jandex.version>
>+    <jboss.jandex.version>1.2.2.Final-redhat-1</jboss.jandex.version>
>-    <jboss.xb.version>2.0.3.GA</jboss.xb.version>
>+    <jboss.xb.version>2.0.3.GA-redhat-2</jboss.xb.version>
>-    <picketbox.version>4.0.19.Final</picketbox.version>
>+    <picketbox.version>4.1.0.Beta1-redhat-1</picketbox.version>
>-    <picketlink.version>2.5.2.Final</picketlink.version>
>+    <picketlink.version>2.5.3.SP11-redhat-1</picketlink.version>
>-    <jaxws-jboss-httpserver-httpspi.version>1.0.1.GA</jaxws-jboss-httpserver-httpspi.version>
>+    <jaxws-jboss-httpserver-httpspi.version>1.0.1.GA-redhat-2</jaxws-jboss-httpserver-httpspi.version>
>     <jaxws-undertow-httpspi.version>1.0.1.Beta1</jaxws-undertow-httpspi.version>
>-    <httpserver.version>1.0.0.Final</httpserver.version>
>+    <httpserver.version>1.0.2.Final</httpserver.version>
>     <io.undertow.version>1.0.0.Beta33</io.undertow.version>
>-    <jaxb.api.version>1.0.4.Final</jaxb.api.version>
>+    <jaxb.api.version>1.0.4.Final-redhat-2</jaxb.api.version>
>-    <jaxb.impl.version>2.2.6</jaxb.impl.version>
>+    <jaxb.impl.version>2.2.5.redhat-9</jaxb.impl.version>
>-    <jaxrpc.api.version>1.0.1.Final</jaxrpc.api.version>
>+    <jaxrpc.api.version>1.0.1.Final-redhat-3</jaxrpc.api.version>
>-    <jaxws.api.version>2.0.2.Final</jaxws.api.version>
>+    <jaxws.api.version>2.0.2.Final-redhat-1</jaxws.api.version>
>-    <jsr181.api.version>1.0-MR1</jsr181.api.version>
>+    <jsr181.api.version>1.0-MR1-redhat-6</jsr181.api.version>
>-    <commons-collections.version>3.2.1</commons-collections.version>
>+    <commons-collections.version>3.2.1.redhat-3</commons-collections.version>
>-    <commons-lang.version>2.6</commons-lang.version>
>+    <commons-lang.version>2.6.redhat-3</commons-lang.version>
>     <commons.logging.version>1.1.1</commons.logging.version>
>     <log4j.version>1.2.16</log4j.version>
>-    <activation.version>1.1</activation.version>
>+    <activation.version>1.1.1-redhat-2</activation.version>
>     <fastinfoset.version>1.2.12</fastinfoset.version>
>-    <neethi.version>3.0.2</neethi.version>
>+    <neethi.version>3.0.2.redhat-3</neethi.version>
>-    <opensaml.version>2.5.3</opensaml.version>
>+    <opensaml.version>2.5.3.redhat-2</opensaml.version>
>-    <saaj.api.version>1.0.3.Final</saaj.api.version>
>+    <saaj.api.version>1.0.3.Final-redhat-1</saaj.api.version>
>-    <servlet.api.version>1.0.2.Final</servlet.api.version>
>+    <servlet.api.version>1.0.2.Final-redhat-1</servlet.api.version>
>     <stax.api.version>1.0-2</stax.api.version>
>-    <jms.api.version>1.0.1.Final</jms.api.version>
>+    <jms.api.version>1.0.1.Final-redhat-2</jms.api.version>
>-    <velocity.version>1.7</velocity.version>
>+    <velocity.version>1.7.redhat-3</velocity.version>
>-    <xerces.version>2.9.1</xerces.version>
>+    <xerces.version>2.9.1.redhat-6</xerces.version>
>-    <xmlsec.version>1.5.7</xmlsec.version>
>+    <xmlsec.version>1.5.7</xmlsec.version>
>-    <wss4j.version>1.6.16</wss4j.version>
>+    <wss4j.version>1.6.16</wss4j.version>
>-    <wstx.version>4.2.0</wstx.version>
>+    <wstx.version>4.2.0.redhat-4</wstx.version>
>     <spring.version>3.0.7.RELEASE</spring.version>
>     <shrinkwrap.version>1.1.3</shrinkwrap.version>
>-    <jaspi.api.version>1.0.0.Alpha1</jaspi.api.version>
>+    <jaspi.api.version>1.0.0.Alpha1</jaspi.api.version>
>     <javax.inject.version>1</javax.inject.version>
>   </properties>
> 
>@@ -1234,6 +1234,11 @@
>         <artifactId>jaxb-xjc</artifactId>
>         <version>${jaxb.impl.version}</version>
>       </dependency>
>+      <dependency>
>+        <groupId>com.github.relaxng</groupId>
>+        <artifactId>relaxngDatatype</artifactId>
>+        <version>2011.1-redhat-6</version>
>+      </dependency>
>       <dependency>
>         <groupId>commons-logging</groupId>
>         <artifactId>commons-logging</artifactId>

Actions: View | Diff

Attachments on bug 1150687: 945096