Author: lukaszlenart Date: Fri Jun 25 10:44:29 2010 New Revision: 957885 URL: http://svn.apache.org/viewvc?rev=957885&view=rev Log: [maven-release-plugin] rollback the release of STRUTS_2_2_0
Modified: struts/struts2/trunk/apps/blank/pom.xml struts/struts2/trunk/apps/mailreader/pom.xml struts/struts2/trunk/apps/pom.xml struts/struts2/trunk/apps/portlet/pom.xml struts/struts2/trunk/apps/rest-showcase/pom.xml struts/struts2/trunk/apps/showcase/pom.xml struts/struts2/trunk/archetypes/pom.xml struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml struts/struts2/trunk/assembly/pom.xml struts/struts2/trunk/bundles/admin/pom.xml struts/struts2/trunk/bundles/demo/pom.xml struts/struts2/trunk/bundles/pom.xml struts/struts2/trunk/core/pom.xml struts/struts2/trunk/plugins/codebehind/pom.xml struts/struts2/trunk/plugins/config-browser/pom.xml struts/struts2/trunk/plugins/convention/pom.xml struts/struts2/trunk/plugins/dojo/pom.xml struts/struts2/trunk/plugins/dwr/pom.xml struts/struts2/trunk/plugins/embeddedjsp/pom.xml struts/struts2/trunk/plugins/jasperreports/pom.xml struts/struts2/trunk/plugins/javatemplates/pom.xml struts/struts2/trunk/plugins/jfreechart/pom.xml struts/struts2/trunk/plugins/jsf/pom.xml struts/struts2/trunk/plugins/json/pom.xml struts/struts2/trunk/plugins/junit/pom.xml struts/struts2/trunk/plugins/osgi/pom.xml struts/struts2/trunk/plugins/oval/pom.xml struts/struts2/trunk/plugins/pell-multipart/pom.xml struts/struts2/trunk/plugins/plexus/pom.xml struts/struts2/trunk/plugins/pom.xml struts/struts2/trunk/plugins/portlet/pom.xml struts/struts2/trunk/plugins/rest/pom.xml struts/struts2/trunk/plugins/sitegraph/pom.xml struts/struts2/trunk/plugins/sitemesh/pom.xml struts/struts2/trunk/plugins/spring/pom.xml struts/struts2/trunk/plugins/struts1/pom.xml struts/struts2/trunk/plugins/testng/pom.xml struts/struts2/trunk/plugins/tiles/pom.xml struts/struts2/trunk/pom.xml struts/struts2/trunk/xwork-core/pom.xml Modified: struts/struts2/trunk/apps/blank/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/apps/blank/pom.xml (original) +++ struts/struts2/trunk/apps/blank/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-apps</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-blank</artifactId> Modified: struts/struts2/trunk/apps/mailreader/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/apps/mailreader/pom.xml (original) +++ struts/struts2/trunk/apps/mailreader/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-apps</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-mailreader</artifactId> Modified: struts/struts2/trunk/apps/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/apps/pom.xml (original) +++ struts/struts2/trunk/apps/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-apps</artifactId> Modified: struts/struts2/trunk/apps/portlet/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/apps/portlet/pom.xml (original) +++ struts/struts2/trunk/apps/portlet/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-apps</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-portlet</artifactId> Modified: struts/struts2/trunk/apps/rest-showcase/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/rest-showcase/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/apps/rest-showcase/pom.xml (original) +++ struts/struts2/trunk/apps/rest-showcase/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,13 +26,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-apps</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-rest-showcase</artifactId> <packaging>war</packaging> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> <name>Struts 2 Rest Showcase Example</name> <description>Struts 2 Rest Showcase Example</description> Modified: struts/struts2/trunk/apps/showcase/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/pom.xml (original) +++ struts/struts2/trunk/apps/showcase/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-apps</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-showcase</artifactId> Modified: struts/struts2/trunk/archetypes/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/archetypes/pom.xml (original) +++ struts/struts2/trunk/archetypes/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-archetypes</artifactId> Modified: struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml Fri Jun 25 10:44:29 2010 @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-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"> <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-archetypes</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>struts2-archetype-blank</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> <name>Struts 2 Archetypes - Blank</name> <scm> Modified: struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml Fri Jun 25 10:44:29 2010 @@ -1,46 +1,48 @@ -<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"> - <parent> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-archetypes</artifactId> - <version>2.2.1-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>struts2-archetype-convention</artifactId> - <version>2.2.1-SNAPSHOT</version> - <name>Struts 2 Archetypes - Blank Convention</name> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/</developerConnection> - <url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/</url> - </scm> - - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> - - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> \ No newline at end of file +<?xml version="1.0" encoding="UTF-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"> + <parent> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-archetypes</artifactId> + <version>2.2.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>struts2-archetype-convention</artifactId> + <version>2.2.0-SNAPSHOT</version> + <name>Struts 2 Archetypes - Blank Convention</name> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/</developerConnection> + <url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/</url> + </scm> + + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> + + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Modified: struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml Fri Jun 25 10:44:29 2010 @@ -1,46 +1,48 @@ -<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"> - <parent> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-archetypes</artifactId> - <version>2.2.1-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>struts2-archetype-dbportlet</artifactId> - <version>2.2.1-SNAPSHOT</version> - <name>Struts 2 Archetypes - Database Portlet</name> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/</developerConnection> - <url>svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/</url> - </scm> - - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> - - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> \ No newline at end of file +<?xml version="1.0" encoding="UTF-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"> + <parent> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-archetypes</artifactId> + <version>2.2.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>struts2-archetype-dbportlet</artifactId> + <version>2.2.0-SNAPSHOT</version> + <name>Struts 2 Archetypes - Database Portlet</name> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/</developerConnection> + <url>svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/</url> + </scm> + + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> + + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Modified: struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml Fri Jun 25 10:44:29 2010 @@ -1,46 +1,48 @@ -<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"> - <parent> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-archetypes</artifactId> - <version>2.2.1-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>struts2-archetype-plugin</artifactId> - <version>2.2.1-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Struts 2 Archetypes - Plugin</name> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/</developerConnection> - <url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/</url> - </scm> - - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> - - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> \ No newline at end of file +<?xml version="1.0" encoding="UTF-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"> + <parent> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-archetypes</artifactId> + <version>2.2.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>struts2-archetype-plugin</artifactId> + <version>2.2.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Struts 2 Archetypes - Plugin</name> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/</developerConnection> + <url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/</url> + </scm> + + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> + + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> Modified: struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml Fri Jun 25 10:44:29 2010 @@ -1,47 +1,71 @@ -<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"> - <parent> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-archetypes</artifactId> - <version>2.2.1-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>struts2-archetype-portlet</artifactId> - <version>2.2.1-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Struts 2 Archetypes - Portlet</name> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/</developerConnection> - <url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/</url> - </scm> - - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> - - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* + * $Id: $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<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"> + <parent> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-archetypes</artifactId> + <version>2.2.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>struts2-archetype-portlet</artifactId> + <version>2.2.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Struts 2 Archetypes - Portlet</name> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/</developerConnection> + <url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/</url> + </scm> + + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> + + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Modified: struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml Fri Jun 25 10:44:29 2010 @@ -4,12 +4,12 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-archetypes</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>struts2-archetype-starter</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Struts 2 Archetypes - Starter</name> Modified: struts/struts2/trunk/assembly/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/assembly/pom.xml (original) +++ struts/struts2/trunk/assembly/pom.xml Fri Jun 25 10:44:29 2010 @@ -11,7 +11,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <scm> Modified: struts/struts2/trunk/bundles/admin/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/bundles/admin/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/bundles/admin/pom.xml (original) +++ struts/struts2/trunk/bundles/admin/pom.xml Fri Jun 25 10:44:29 2010 @@ -4,7 +4,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-osgi-bundles</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-osgi-admin-bundle</artifactId> Modified: struts/struts2/trunk/bundles/demo/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/bundles/demo/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/bundles/demo/pom.xml (original) +++ struts/struts2/trunk/bundles/demo/pom.xml Fri Jun 25 10:44:29 2010 @@ -4,7 +4,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-osgi-bundles</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-osgi-demo-bundle</artifactId> Modified: struts/struts2/trunk/bundles/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/bundles/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/bundles/pom.xml (original) +++ struts/struts2/trunk/bundles/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-osgi-bundles</artifactId> Modified: struts/struts2/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/core/pom.xml (original) +++ struts/struts2/trunk/core/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> Modified: struts/struts2/trunk/plugins/codebehind/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/codebehind/pom.xml (original) +++ struts/struts2/trunk/plugins/codebehind/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-codebehind-plugin</artifactId> Modified: struts/struts2/trunk/plugins/config-browser/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/config-browser/pom.xml (original) +++ struts/struts2/trunk/plugins/config-browser/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-config-browser-plugin</artifactId> Modified: struts/struts2/trunk/plugins/convention/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/convention/pom.xml (original) +++ struts/struts2/trunk/plugins/convention/pom.xml Fri Jun 25 10:44:29 2010 @@ -3,7 +3,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-convention-plugin</artifactId> @@ -12,7 +12,9 @@ <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-convention-plugin</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-convention-plugin</developerConnection> + <developerConnection> + scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-convention-plugin + </developerConnection> <url>http://svn.apache.org/viewcvs.cgi/struts/sandbox/trunk/struts2-convention-plugin</url> </scm> Modified: struts/struts2/trunk/plugins/dojo/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/dojo/pom.xml (original) +++ struts/struts2/trunk/plugins/dojo/pom.xml Fri Jun 25 10:44:29 2010 @@ -25,7 +25,7 @@ <parent> <artifactId>struts2-plugins</artifactId> <groupId>org.apache.struts</groupId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.struts</groupId> Modified: struts/struts2/trunk/plugins/dwr/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dwr/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/dwr/pom.xml (original) +++ struts/struts2/trunk/plugins/dwr/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-dwr-plugin</artifactId> Modified: struts/struts2/trunk/plugins/embeddedjsp/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/embeddedjsp/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/embeddedjsp/pom.xml (original) +++ struts/struts2/trunk/plugins/embeddedjsp/pom.xml Fri Jun 25 10:44:29 2010 @@ -21,12 +21,13 @@ * under the License. */ --> -<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> <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> @@ -36,7 +37,8 @@ <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/embeddedjsp/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/embeddedjsp/</developerConnection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/embeddedjsp/ + </developerConnection> <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/embeddedjsp/</url> </scm> Modified: struts/struts2/trunk/plugins/jasperreports/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/jasperreports/pom.xml (original) +++ struts/struts2/trunk/plugins/jasperreports/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-jasperreports-plugin</artifactId> Modified: struts/struts2/trunk/plugins/javatemplates/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/javatemplates/pom.xml (original) +++ struts/struts2/trunk/plugins/javatemplates/pom.xml Fri Jun 25 10:44:29 2010 @@ -4,7 +4,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-javatemplates-plugin</artifactId> Modified: struts/struts2/trunk/plugins/jfreechart/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jfreechart/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/jfreechart/pom.xml (original) +++ struts/struts2/trunk/plugins/jfreechart/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-jfreechart-plugin</artifactId> Modified: struts/struts2/trunk/plugins/jsf/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/jsf/pom.xml (original) +++ struts/struts2/trunk/plugins/jsf/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-jsf-plugin</artifactId> Modified: struts/struts2/trunk/plugins/json/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/json/pom.xml (original) +++ struts/struts2/trunk/plugins/json/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-json-plugin</artifactId> @@ -35,7 +35,8 @@ <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/json/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/json/</developerConnection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/json/ + </developerConnection> <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/json/</url> </scm> Modified: struts/struts2/trunk/plugins/junit/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/junit/pom.xml (original) +++ struts/struts2/trunk/plugins/junit/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-junit-plugin</artifactId> @@ -35,7 +35,8 @@ <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/junit/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/junit/</developerConnection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/junit/ + </developerConnection> <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/junit/</url> </scm> Modified: struts/struts2/trunk/plugins/osgi/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/osgi/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/osgi/pom.xml (original) +++ struts/struts2/trunk/plugins/osgi/pom.xml Fri Jun 25 10:44:29 2010 @@ -4,7 +4,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-osgi-plugin</artifactId> Modified: struts/struts2/trunk/plugins/oval/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/oval/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/oval/pom.xml (original) +++ struts/struts2/trunk/plugins/oval/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-oval-plugin</artifactId> Modified: struts/struts2/trunk/plugins/pell-multipart/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pell-multipart/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/pell-multipart/pom.xml (original) +++ struts/struts2/trunk/plugins/pell-multipart/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-pell-multipart-plugin</artifactId> Modified: struts/struts2/trunk/plugins/plexus/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/plexus/pom.xml (original) +++ struts/struts2/trunk/plugins/plexus/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plexus-plugin</artifactId> Modified: struts/struts2/trunk/plugins/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/pom.xml (original) +++ struts/struts2/trunk/plugins/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> Modified: struts/struts2/trunk/plugins/portlet/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/portlet/pom.xml (original) +++ struts/struts2/trunk/plugins/portlet/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-portlet-plugin</artifactId> Modified: struts/struts2/trunk/plugins/rest/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/rest/pom.xml (original) +++ struts/struts2/trunk/plugins/rest/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,11 +26,11 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-rest-plugin</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> <name>Struts 2 REST Plugin</name> <dependencies> Modified: struts/struts2/trunk/plugins/sitegraph/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/sitegraph/pom.xml (original) +++ struts/struts2/trunk/plugins/sitegraph/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-sitegraph-plugin</artifactId> Modified: struts/struts2/trunk/plugins/sitemesh/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/sitemesh/pom.xml (original) +++ struts/struts2/trunk/plugins/sitemesh/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-sitemesh-plugin</artifactId> Modified: struts/struts2/trunk/plugins/spring/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/spring/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/spring/pom.xml (original) +++ struts/struts2/trunk/plugins/spring/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-spring-plugin</artifactId> Modified: struts/struts2/trunk/plugins/struts1/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/struts1/pom.xml (original) +++ struts/struts2/trunk/plugins/struts1/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-struts1-plugin</artifactId> Modified: struts/struts2/trunk/plugins/testng/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/testng/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/testng/pom.xml (original) +++ struts/struts2/trunk/plugins/testng/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-testng-plugin</artifactId> Modified: struts/struts2/trunk/plugins/tiles/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/plugins/tiles/pom.xml (original) +++ struts/struts2/trunk/plugins/tiles/pom.xml Fri Jun 25 10:44:29 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-tiles-plugin</artifactId> Modified: struts/struts2/trunk/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/pom.xml (original) +++ struts/struts2/trunk/pom.xml Fri Jun 25 10:44:29 2010 @@ -9,7 +9,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Struts 2</name> <url>http://struts.apache.org/struts2</url> Modified: struts/struts2/trunk/xwork-core/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/pom.xml?rev=957885&r1=957884&r2=957885&view=diff ============================================================================== --- struts/struts2/trunk/xwork-core/pom.xml (original) +++ struts/struts2/trunk/xwork-core/pom.xml Fri Jun 25 10:44:29 2010 @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-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> <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>com.opensymphony</groupId> @@ -220,7 +221,8 @@ </relocation> </relocations> <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" /> + <transformer + implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/> </transformers> </configuration> </execution>