[jbossws-commits] JBossWS SVN: r19451 - in stack/cxf/trunk/modules/dist: src/main/scripts and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: asoldano
Date: 2015-02-12 11:54:28 -0500 (Thu, 12 Feb 2015)
New Revision: 19451

Modified:
   stack/cxf/trunk/modules/dist/pom.xml
   stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Fix to the build to properly work with recent maven-assembly-plugin


Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml	2015-02-12 16:53:42 UTC (rev 19450)
+++ stack/cxf/trunk/modules/dist/pom.xml	2015-02-12 16:54:28 UTC (rev 19451)
@@ -235,6 +235,11 @@
           <artifactId>jbossws-wildfly800-server-integration</artifactId>
           <scope>provided</scope>
         </dependency>
+        <dependency>
+           <groupId>org.jboss.ws</groupId>
+           <artifactId>jbossws-wildfly800-tests-integration</artifactId>
+           <scope>provided</scope>
+        </dependency>
       </dependencies>
     </profile>
 
@@ -256,6 +261,11 @@
           <artifactId>jbossws-wildfly810-server-integration</artifactId>
           <scope>provided</scope>
         </dependency>
+        <dependency>
+           <groupId>org.jboss.ws</groupId>
+           <artifactId>jbossws-wildfly810-tests-integration</artifactId>
+           <scope>provided</scope>
+        </dependency>
       </dependencies>
     </profile>
     
@@ -277,6 +287,11 @@
           <artifactId>jbossws-wildfly820-server-integration</artifactId>
           <scope>provided</scope>
         </dependency>
+        <dependency>
+           <groupId>org.jboss.ws</groupId>
+           <artifactId>jbossws-wildfly820-tests-integration</artifactId>
+           <scope>provided</scope>
+        </dependency>
       </dependencies>
     </profile>
     

Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2015-02-12 16:53:42 UTC (rev 19450)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2015-02-12 16:54:28 UTC (rev 19451)
@@ -107,7 +107,6 @@
             <outputDirectory>deploy-artifacts/lib</outputDirectory>
             <unpack>false</unpack>
             <includes>
-              <include>org.jboss.ws:jbossws-jboss*-tests-integration:jar</include>
               <include>org.jboss.ws:jbossws-wildfly*-tests-integration:jar</include>
             </includes>
             <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
@@ -115,23 +114,10 @@
             <useProjectArtifact>false</useProjectArtifact>
          </dependencySet>
 
-
          <dependencySet>
             <outputDirectory>deploy-artifacts/lib</outputDirectory>
             <unpack>false</unpack>
             <includes>
-              <include>org.wildfly:wildfly-webservices-tests-integration:jar</include>
-            </includes>
-            <outputFileNameMapping>jbossws-wildfly900-tests-integration.jar</outputFileNameMapping>
-            <scope>provided</scope>
-            <useProjectArtifact>false</useProjectArtifact>
-         </dependencySet>
-
-         <dependencySet>
-            <outputDirectory>deploy-artifacts/lib</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-              <include>org.jboss.ws:jbossws-jboss*-server-integration:jar</include>
               <include>org.jboss.ws:jbossws-wildfly*-server-integration:jar</include>
               <include>org.picketbox:picketbox:jar</include>
             </includes>
@@ -144,8 +130,7 @@
             <outputDirectory>deploy-artifacts/lib</outputDirectory>
             <unpack>false</unpack>
             <includes>
-              <include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*:jboss*</include>
-              <include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*:wildfly*</include>
+              <include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*</include>
             </includes>
             <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
             <useProjectArtifact>false</useProjectArtifact>