Author: mrdon Date: Thu Apr 17 03:01:30 2008 New Revision: 649036 URL: http://svn.apache.org/viewvc?rev=649036&view=rev Log: [maven-release-plugin] prepare for next development iteration
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/core/pom.xml struts/struts2/trunk/plugins/codebehind/pom.xml struts/struts2/trunk/plugins/config-browser/pom.xml struts/struts2/trunk/plugins/dojo/pom.xml struts/struts2/trunk/plugins/dwr/pom.xml struts/struts2/trunk/plugins/jasperreports/pom.xml struts/struts2/trunk/plugins/jfreechart/pom.xml struts/struts2/trunk/plugins/jsf/pom.xml struts/struts2/trunk/plugins/junit/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 Modified: struts/struts2/trunk/apps/blank/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/apps/blank/pom.xml (original) +++ struts/struts2/trunk/apps/blank/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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-apps</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/apps/mailreader/pom.xml (original) +++ struts/struts2/trunk/apps/mailreader/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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-apps</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/apps/pom.xml (original) +++ struts/struts2/trunk/apps/pom.xml Thu Apr 17 03:01:30 2008 @@ -1,34 +1,9 @@ -<?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"> +<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.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-apps</artifactId> @@ -109,14 +84,10 @@ </goals> <configuration> <tasks> - <taskdef resource="hostedqatasks" classpathref="maven.plugin.classpath"/> - <upload file="${project.build.directory}/${project.build.finalName}.war" - account="struts" email="${email}" - password="${password}" resourceId="${resourceId}"/> - - <playsuite suiteId="${suiteId}" clientConfigs="${clientConfigs}" appConfigs="${appConfigs}" account="struts" - email="${email}" - password="${password}"/> + <taskdef resource="hostedqatasks" classpathref="maven.plugin.classpath" /> + <upload file="${project.build.directory}/${project.build.finalName}.war" account="struts" email="${email}" password="${password}" resourceId="${resourceId}" /> + + <playsuite suiteId="${suiteId}" clientConfigs="${clientConfigs}" appConfigs="${appConfigs}" account="struts" email="${email}" password="${password}" /> </tasks> </configuration> </execution> @@ -202,13 +173,11 @@ <phase>process-sources</phase> <configuration> <tasks> - <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" - failonerror="false"> - <fileset dir="${basedir}/src/main/java"/> + <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false"> + <fileset dir="${basedir}/src/main/java" /> </copy> - <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" - failonerror="false"> - <fileset dir="${basedir}/src/main/resources"/> + <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false"> + <fileset dir="${basedir}/src/main/resources" /> </copy> </tasks> </configuration> @@ -257,4 +226,4 @@ </dependency> </dependencies> -</project> +</project> \ No newline at end of file Modified: struts/struts2/trunk/apps/portlet/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/apps/portlet/pom.xml (original) +++ struts/struts2/trunk/apps/portlet/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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-apps</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/apps/rest-showcase/pom.xml (original) +++ struts/struts2/trunk/apps/rest-showcase/pom.xml Thu Apr 17 03:01:30 2008 @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<project> +<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-apps</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-rest-showcase</artifactId> <packaging>war</packaging> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/pom.xml (original) +++ struts/struts2/trunk/apps/showcase/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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-apps</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-showcase</artifactId> Modified: struts/struts2/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/core/pom.xml (original) +++ struts/struts2/trunk/core/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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-parent</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/codebehind/pom.xml (original) +++ struts/struts2/trunk/plugins/codebehind/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/config-browser/pom.xml (original) +++ struts/struts2/trunk/plugins/config-browser/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-config-browser-plugin</artifactId> Modified: struts/struts2/trunk/plugins/dojo/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/pom.xml?rev=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/dojo/pom.xml (original) +++ struts/struts2/trunk/plugins/dojo/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,11 +21,11 @@ * under the License. */ --> -<project> +<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> <artifactId>struts2-plugins</artifactId> <groupId>org.apache.struts</groupId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.struts</groupId> @@ -33,15 +33,9 @@ <name>Struts 2 Dojo Plugin</name> <scm> - <connection> - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/dojo/ - </connection> - <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/dojo/ - </developerConnection> - <url> - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/dojo/ - </url> + <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/dojo/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/dojo/</developerConnection> + <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/dojo/</url> </scm> <profiles> <profile> Modified: struts/struts2/trunk/plugins/dwr/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dwr/pom.xml?rev=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/dwr/pom.xml (original) +++ struts/struts2/trunk/plugins/dwr/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-dwr-plugin</artifactId> Modified: struts/struts2/trunk/plugins/jasperreports/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/pom.xml?rev=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/jasperreports/pom.xml (original) +++ struts/struts2/trunk/plugins/jasperreports/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-jasperreports-plugin</artifactId> Modified: struts/struts2/trunk/plugins/jfreechart/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jfreechart/pom.xml?rev=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/jfreechart/pom.xml (original) +++ struts/struts2/trunk/plugins/jfreechart/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/jsf/pom.xml (original) +++ struts/struts2/trunk/plugins/jsf/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-jsf-plugin</artifactId> Modified: struts/struts2/trunk/plugins/junit/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/pom.xml?rev=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/junit/pom.xml (original) +++ struts/struts2/trunk/plugins/junit/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-junit-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/pell-multipart/pom.xml (original) +++ struts/struts2/trunk/plugins/pell-multipart/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/plexus/pom.xml (original) +++ struts/struts2/trunk/plugins/plexus/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/pom.xml (original) +++ struts/struts2/trunk/plugins/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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-parent</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/portlet/pom.xml (original) +++ struts/struts2/trunk/plugins/portlet/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/rest/pom.xml (original) +++ struts/struts2/trunk/plugins/rest/pom.xml Thu Apr 17 03:01:30 2008 @@ -1,15 +1,14 @@ <?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-rest-plugin</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> <name>Struts 2 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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/sitegraph/pom.xml (original) +++ struts/struts2/trunk/plugins/sitegraph/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/sitemesh/pom.xml (original) +++ struts/struts2/trunk/plugins/sitemesh/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/spring/pom.xml (original) +++ struts/struts2/trunk/plugins/spring/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/struts1/pom.xml (original) +++ struts/struts2/trunk/plugins/struts1/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/testng/pom.xml (original) +++ struts/struts2/trunk/plugins/testng/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/plugins/tiles/pom.xml (original) +++ struts/struts2/trunk/plugins/tiles/pom.xml Thu Apr 17 03:01:30 2008 @@ -21,13 +21,12 @@ * 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.1.1-SNAPSHOT</version> + <version>2.1.2-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=649036&r1=649035&r2=649036&view=diff ============================================================================== --- struts/struts2/trunk/pom.xml (original) +++ struts/struts2/trunk/pom.xml Thu Apr 17 03:01:30 2008 @@ -1,30 +1,4 @@ -<?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"> +<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> @@ -35,7 +9,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Struts 2</name> <url>http://struts.apache.org/struts2</url> @@ -64,7 +38,7 @@ <url>http://issues.apache.org/struts/</url> </issueManagement> - <ciManagement/> + <ciManagement /> <distributionManagement> <repository> <id>struts-staging</id> @@ -93,7 +67,7 @@ <name>The Apache Software License, Version 2.0</name> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> - <comments/> + <comments /> </license> </licenses> @@ -392,4 +366,4 @@ </plugins> </reporting> -</project> +</project> \ No newline at end of file