Author: apetrelli
Date: Tue Jun 30 10:21:06 2009
New Revision: 789653
URL: http://svn.apache.org/viewvc?rev=789653&view=rev
Log:
TILES-356
Upgraded dependencies to plugins.
Modified:
tiles/framework/trunk/assembly/pom.xml
tiles/framework/trunk/pom.xml
tiles/framework/trunk/tiles-test/pom.xml
Modified: tiles/framework/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/pom.xml?rev=789653&r1=789652&r2=789653&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/pom.xml (original)
+++ tiles/framework/trunk/assembly/pom.xml Tue Jun 30 10:21:06 2009
@@ -8,9 +8,9 @@
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.
@@ -38,13 +38,13 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/tiles/framework/trunk/assembly</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/tiles/framework/trunk/assembly</url>
</scm>
-
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
+ <version>2.2-beta-4</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
@@ -67,7 +67,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
+ <version>2.2-beta-4</version>
<executions>
<execution>
<id>make-assembly</id>
@@ -92,7 +92,7 @@
</profiles>
<dependencies>
-
+
<!-- Main Tiles packages -->
<dependency>
<groupId>org.apache.tiles</groupId>
Modified: tiles/framework/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?rev=789653&r1=789652&r2=789653&view=diff
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Tue Jun 30 10:21:06 2009
@@ -45,7 +45,7 @@
</scm>
<ciManagement />
-
+
<modules>
<module>tiles-api</module>
<module>tiles-core</module>
@@ -59,7 +59,7 @@
<module>tiles-test</module>
<module>assembly</module>
</modules>
-
+
<distributionManagement>
<repository>
<id>tiles-staging</id>
@@ -98,13 +98,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<inherited>true</inherited>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-8-SNAPSHOT</version>
+ <version>2.0</version>
</plugin>
</plugins>
</pluginManagement>
@@ -112,7 +111,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<configuration>
<excludeDependencies>true</excludeDependencies>
<manifestLocation>target/osgi</manifestLocation>
@@ -228,7 +226,7 @@
</properties>
<dependencies />
-
+
<profiles>
<profile>
<id>j4</id>
Modified: tiles/framework/trunk/tiles-test/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/pom.xml?rev=789653&r1=789652&r2=789653&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/pom.xml (original)
+++ tiles/framework/trunk/tiles-test/pom.xml Tue Jun 30 10:21:06 2009
@@ -124,7 +124,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.1-beta-1</version>
<configuration>
<webResources>
<resource>
@@ -141,7 +141,6 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0-beta-2</version>
<configuration>
<container>
<containerId>tomcat6x</containerId>
@@ -402,7 +401,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.1-beta-1</version>
<configuration>
<webXml>src/main/webapp/WEB-INF/web-24.xml</webXml>
<webResources>
@@ -421,7 +420,6 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0-beta-2</version>
<configuration>
<container>
<containerId>tomcat5x</containerId>
