Modified: struts/struts2/trunk/plugins/osgi/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/osgi/pom.xml?rev=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/plugins/osgi/pom.xml (original) +++ struts/struts2/trunk/plugins/osgi/pom.xml Sat Jul 17 09:13:53 2010 @@ -1,72 +1,73 @@ -<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.2-SNAPSHOT</version> - </parent> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-osgi-plugin</artifactId> - <packaging>jar</packaging> - <name>Struts 2 OSGi Plugin</name> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/osgi/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/osgi/</developerConnection> - <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/osgi/</url> - </scm> - - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - <version>1.4.1</version> - </dependency> - - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <version>1.6.3</version> - </dependency> - - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity-tools</artifactId> - <version>1.3</version> - <exclusions> - <exclusion> - <groupId>velocity</groupId> - <artifactId>velocity</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>struts</groupId> - <artifactId>struts</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>2.0</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - <version>3.8.1</version> - </dependency> - - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <scope>test</scope> - <version>2.4</version> - </dependency> - </dependencies> -</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";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-plugins</artifactId> + <version>2.2.1-SNAPSHOT</version> + </parent> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-osgi-plugin</artifactId> + <packaging>jar</packaging> + <name>Struts 2 OSGi Plugin</name> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/osgi/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/osgi/</developerConnection> + <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/osgi/</url> + </scm> + + <dependencies> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.main</artifactId> + <version>1.4.1</version> + </dependency> + + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.6.3</version> + </dependency> + + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity-tools</artifactId> + <version>1.3</version> + <exclusions> + <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>struts</groupId> + <artifactId>struts</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>2.0</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + <version>3.8.1</version> + </dependency> + + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + <version>2.4</version> + </dependency> + </dependencies> +</project>
Modified: struts/struts2/trunk/plugins/oval/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/oval/pom.xml?rev=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/plugins/oval/pom.xml (original) +++ struts/struts2/trunk/plugins/oval/pom.xml Sat Jul 17 09:13:53 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1-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=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/plugins/pell-multipart/pom.xml (original) +++ struts/struts2/trunk/plugins/pell-multipart/pom.xml Sat Jul 17 09:13:53 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1-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=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/plugins/plexus/pom.xml (original) +++ struts/struts2/trunk/plugins/plexus/pom.xml Sat Jul 17 09:13:53 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1-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=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/plugins/pom.xml (original) +++ struts/struts2/trunk/plugins/pom.xml Sat Jul 17 09:13:53 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1-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=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/plugins/portlet/pom.xml (original) +++ struts/struts2/trunk/plugins/portlet/pom.xml Sat Jul 17 09:13:53 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1-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=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/plugins/rest/pom.xml (original) +++ struts/struts2/trunk/plugins/rest/pom.xml Sat Jul 17 09:13:53 2010 @@ -26,11 +26,11 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-rest-plugin</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1-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=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/plugins/sitegraph/pom.xml (original) +++ struts/struts2/trunk/plugins/sitegraph/pom.xml Sat Jul 17 09:13:53 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1-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=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/plugins/sitemesh/pom.xml (original) +++ struts/struts2/trunk/plugins/sitemesh/pom.xml Sat Jul 17 09:13:53 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1-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=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/plugins/spring/pom.xml (original) +++ struts/struts2/trunk/plugins/spring/pom.xml Sat Jul 17 09:13:53 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1-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=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/plugins/struts1/pom.xml (original) +++ struts/struts2/trunk/plugins/struts1/pom.xml Sat Jul 17 09:13:53 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1-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=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/plugins/testng/pom.xml (original) +++ struts/struts2/trunk/plugins/testng/pom.xml Sat Jul 17 09:13:53 2010 @@ -1,54 +1,77 @@ -<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.2-SNAPSHOT</version> - </parent> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-testng-plugin</artifactId> - <packaging>jar</packaging> - <name>Struts 2 TestNG Plugin</name> - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/testng/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/testng/</developerConnection> - <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/testng/</url> - </scm> - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.1</version> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${struts2.springPlatformVersion}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${struts2.springPlatformVersion}</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - - - - </dependencies> -</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";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-plugins</artifactId> + <version>2.2.1-SNAPSHOT</version> + </parent> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-testng-plugin</artifactId> + <packaging>jar</packaging> + <name>Struts 2 TestNG Plugin</name> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/testng/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/testng/</developerConnection> + <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/testng/</url> + </scm> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.1</version> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${struts2.springPlatformVersion}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${struts2.springPlatformVersion}</version> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + + + + </dependencies> +</project> Modified: struts/struts2/trunk/plugins/tiles/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/pom.xml?rev=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/plugins/tiles/pom.xml (original) +++ struts/struts2/trunk/plugins/tiles/pom.xml Sat Jul 17 09:13:53 2010 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1-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=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/pom.xml (original) +++ struts/struts2/trunk/pom.xml Sat Jul 17 09:13:53 2010 @@ -9,7 +9,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1-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=965038&r1=965037&r2=965038&view=diff ============================================================================== --- struts/struts2/trunk/xwork-core/pom.xml (original) +++ struts/struts2/trunk/xwork-core/pom.xml Sat Jul 17 09:13:53 2010 @@ -5,7 +5,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1-SNAPSHOT</version> </parent> <groupId>org.apache.struts.xwork</groupId>
