Author: ropalka Date: 2012-05-11 07:48:39 -0400 (Fri, 11 May 2012) New Revision: 16271 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-src-dist.xml stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: Merged revisions 16204-16205,16227 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r16204 | alessio.soldano(a)jboss.com | 2012-04-20 17:03:28 +0200 (Fri, 20 Apr 2012) | 2 lines Removing duplicated plugin definition (probably a leftover from when the dist module has been added to the project) ....... r16205 | alessio.soldano(a)jboss.com | 2012-04-20 17:05:19 +0200 (Fri, 20 Apr 2012) | 2 lines Properly set schema for assembly plugin descriptors ....... r16227 | alessio.soldano(a)jboss.com | 2012-04-30 12:29:18 +0200 (Mon, 30 Apr 2012) | 2 lines Use final version of servlet api ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16230,16244-16245 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-05-11 11:43:53 UTC (rev 16270) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-05-11 11:48:39 UTC (rev 16271) @@ -1,5 +1,5 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.1.xsd"> <id>binary-distribution</id> <formats> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-05-11 11:43:53 UTC (rev 16270) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-05-11 11:48:39 UTC (rev 16271) @@ -1,5 +1,6 @@ -<assembly> - <id></id> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.1.xsd"> + <id>deploy-artifacts</id> <includeBaseDirectory>false</includeBaseDirectory> <formats> <format>dir</format> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-src-dist.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-src-dist.xml 2012-05-11 11:43:53 UTC (rev 16270) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-src-dist.xml 2012-05-11 11:48:39 UTC (rev 16271) @@ -1,5 +1,5 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.1.xsd"> <id>source-distribution</id> <formats> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-05-11 11:43:53 UTC (rev 16270) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-05-11 11:48:39 UTC (rev 16271) @@ -93,6 +93,7 @@ <mail.version>1.4.4</mail.version> <neethi.version>3.0.1</neethi.version> <saaj.api.version>1.0.1.Final</saaj.api.version> + <servlet.api.version>1.0.1.Final</servlet.api.version> <stax.api.version>1.0-2</stax.api.version> <jms.api.version>1.0.0.Final</jms.api.version> <velocity.version>1.6.3</velocity.version> @@ -997,7 +998,7 @@ <dependency> <groupId>org.jboss.spec.javax.servlet</groupId> <artifactId>jboss-servlet-api_3.0_spec</artifactId> - <version>1.0.0.Beta2</version> + <version>${servlet.api.version}</version> </dependency> <!-- jboss provided --> @@ -1188,29 +1189,6 @@ </executions> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>assembly</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <!-- - Cannot bind to lifecycle with multiple modules - http://jira.codehaus.org/browse/MASSEMBLY-319 - <executions> - <execution> - <id>build-deploy-artifacts</id> - <phase>package</phase> - <goals> - <goal>directory-inline</goal> - </goals> - </execution> - </executions--> - <descriptors> - <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor> - </descriptors> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> <configuration>