Author: alessio.soldano(a)jboss.com Date: 2009-03-09 17:37:27 -0400 (Mon, 09 Mar 2009) New Revision: 9558 Modified: stack/metro/branches/asoldano/modules/client/pom.xml stack/metro/branches/asoldano/modules/management/pom.xml stack/metro/branches/asoldano/modules/resources/pom.xml stack/metro/branches/asoldano/modules/server/pom.xml stack/metro/branches/asoldano/modules/wsit/pom.xml stack/metro/branches/asoldano/pom.xml Log: svn merge -r 9557:9554 . Modified: stack/metro/branches/asoldano/modules/client/pom.xml =================================================================== --- stack/metro/branches/asoldano/modules/client/pom.xml 2009-03-09 21:32:45 UTC (rev 9557) +++ stack/metro/branches/asoldano/modules/client/pom.xml 2009-03-09 21:37:27 UTC (rev 9558) @@ -1,4 +1,5 @@ -<project 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/maven-v4_0_0.xsd"> +<project 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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack Metro Runtime Client</name> @@ -8,7 +9,7 @@ <parent> <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/metro/branches/asoldano/modules/management/pom.xml =================================================================== --- stack/metro/branches/asoldano/modules/management/pom.xml 2009-03-09 21:32:45 UTC (rev 9557) +++ stack/metro/branches/asoldano/modules/management/pom.xml 2009-03-09 21:37:27 UTC (rev 9558) @@ -1,4 +1,5 @@ -<project 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/maven-v4_0_0.xsd"> +<project 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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack Metro Management</name> @@ -8,7 +9,7 @@ <parent> <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/metro/branches/asoldano/modules/resources/pom.xml =================================================================== --- stack/metro/branches/asoldano/modules/resources/pom.xml 2009-03-09 21:32:45 UTC (rev 9557) +++ stack/metro/branches/asoldano/modules/resources/pom.xml 2009-03-09 21:37:27 UTC (rev 9558) @@ -1,4 +1,5 @@ -<project 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/maven-v4_0_0.xsd"> +<project 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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack Metro Resources</name> @@ -9,7 +10,7 @@ <parent> <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -27,7 +28,7 @@ <configuration> <tasks> <ant antfile="src/main/scripts/zip-other-configs.xml"> - <property name="project.build.finalName" value="${project.build.finalName}" /> + <property name="project.build.finalName" value="${project.build.finalName}"/> </ant> </tasks> </configuration> Modified: stack/metro/branches/asoldano/modules/server/pom.xml =================================================================== --- stack/metro/branches/asoldano/modules/server/pom.xml 2009-03-09 21:32:45 UTC (rev 9557) +++ stack/metro/branches/asoldano/modules/server/pom.xml 2009-03-09 21:37:27 UTC (rev 9558) @@ -1,4 +1,5 @@ -<project 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/maven-v4_0_0.xsd"> +<project 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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack Metro Runtime Server</name> @@ -9,7 +10,7 @@ <parent> <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -204,9 +205,9 @@ </goals> <configuration> <tasks> - <property name="jbossws.jboss423.version" value="${jbossws.jboss423.version}" /> - <property name="jbossws.jboss424.version" value="${jbossws.jboss424.version}" /> - <ant antfile="src/main/scripts/antrun-beans-config.xml" /> + <property name="jbossws.jboss423.version" value="${jbossws.jboss423.version}"/> + <property name="jbossws.jboss424.version" value="${jbossws.jboss424.version}"/> + <ant antfile="src/main/scripts/antrun-beans-config.xml"/> </tasks> </configuration> </execution> Modified: stack/metro/branches/asoldano/modules/wsit/pom.xml =================================================================== --- stack/metro/branches/asoldano/modules/wsit/pom.xml 2009-03-09 21:32:45 UTC (rev 9557) +++ stack/metro/branches/asoldano/modules/wsit/pom.xml 2009-03-09 21:37:27 UTC (rev 9558) @@ -1,4 +1,5 @@ -<project 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/maven-v4_0_0.xsd"> +<project 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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack Metro Interoperability</name> @@ -9,7 +10,7 @@ <parent> <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/metro/branches/asoldano/pom.xml =================================================================== --- stack/metro/branches/asoldano/pom.xml 2009-03-09 21:32:45 UTC (rev 9557) +++ stack/metro/branches/asoldano/pom.xml 2009-03-09 21:37:27 UTC (rev 9558) @@ -9,7 +9,8 @@ <!-- --> <!-- ====================================================================== --> -<project 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/maven-v4_0_0.xsd"> +<project 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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack Metro</name> @@ -17,7 +18,7 @@ <artifactId>jbossws-metro</artifactId> <packaging>pom</packaging> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> <!-- Parent --> <parent> @@ -28,9 +29,9 @@ <!-- Source Control Management --> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/metro/... - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/... - <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/metro/branches/test... + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/metro/... + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/... + <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/metro/trunk</url... </scm> <!-- Modules --> @@ -332,10 +333,10 @@ </goals> <configuration> <tasks> - <echo /> - <echo message="profile=${jbossws.integration.target}" /> - <echo message="jboss.home=${jboss.home}" /> - <echo /> + <echo/> + <echo message="profile=${jbossws.integration.target}"/> + <echo message="jboss.home=${jboss.home}"/> + <echo/> </tasks> </configuration> </execution>