Author: asoldano Date: 2015-03-06 09:01:24 -0500 (Fri, 06 Mar 2015) New Revision: 19531 Modified: stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/test-utils/pom.xml stack/cxf/trunk/modules/testsuite/pom.xml Log: Make all 'dist' module dependencies have provided scope, so that they do not leak into other modules depending on it. Move 'dist' module dependency from 'test-utils' to 'testsuite' module to allow for simple 'mvn clean install' command to run while keeping proper modules ordering when using -T option. Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2015-03-06 10:27:08 UTC (rev 19530) +++ stack/cxf/trunk/modules/dist/pom.xml 2015-03-06 14:01:24 UTC (rev 19531) @@ -20,30 +20,35 @@ <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-jaspi</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-transports-undertow</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-transports-udp</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-server</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> @@ -56,30 +61,37 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> + <scope>provided</scope> </dependency> <!-- OpenSAML --> <dependency> @@ -90,17 +102,19 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jandex</artifactId> + <scope>provided</scope> </dependency> <!--junit--> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.shrinkwrap</groupId> <artifactId>shrinkwrap-depchain</artifactId> <type>pom</type> - <scope>test</scope> + <scope>provided</scope> </dependency> </dependencies> @@ -229,6 +243,7 @@ <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> <classifier>wildfly800</classifier> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> @@ -250,6 +265,7 @@ <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> <classifier>wildfly810</classifier> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> @@ -271,6 +287,7 @@ <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> <classifier>wildfly820</classifier> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> @@ -292,6 +309,7 @@ <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> <classifier>wildfly900</classifier> + <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-03-06 10:27:08 UTC (rev 19530) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2015-03-06 14:01:24 UTC (rev 19531) @@ -80,6 +80,7 @@ <include>org.apache.httpcomponents:httpclient:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> @@ -122,6 +123,7 @@ <include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> + <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> @@ -132,6 +134,7 @@ <includes> <include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include> </includes> + <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> <dependencySet> @@ -141,6 +144,7 @@ <includes> <include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include> </includes> + <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> Modified: stack/cxf/trunk/modules/test-utils/pom.xml =================================================================== --- stack/cxf/trunk/modules/test-utils/pom.xml 2015-03-06 10:27:08 UTC (rev 19530) +++ stack/cxf/trunk/modules/test-utils/pom.xml 2015-03-06 14:01:24 UTC (rev 19531) @@ -37,13 +37,6 @@ <artifactId>jboss-logging</artifactId> <scope>provided</scope> </dependency> - <dependency> <!-- dependency to dist module to ensure proper testsuite ordering when running with -T option --> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-dist</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>provided</scope> - </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2015-03-06 10:27:08 UTC (rev 19530) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2015-03-06 14:01:24 UTC (rev 19531) @@ -56,6 +56,13 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> <!-- dependency to dist module to ensure proper testsuite ordering when running with -T option --> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-dist</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common</artifactId>