You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/06/30 12:45:08 UTC
svn commit: r789669 - in /tiles/framework/branches/TILES_2_1_X:
assembly/pom.xml pom.xml tiles-api/pom.xml tiles-compat/pom.xml tiles-core/
tiles-core/pom.xml tiles-jsp/pom.xml tiles-portlet/pom.xml
tiles-servlet/pom.xml tiles-test/ tiles-test/pom.xml
Author: apetrelli
Date: Tue Jun 30 10:45:07 2009
New Revision: 789669
URL: http://svn.apache.org/viewvc?rev=789669&view=rev
Log:
TILES-356
Merge from trunk to TILES_2_1_X branch.
Upgraded libraries and plugins.
Modified:
tiles/framework/branches/TILES_2_1_X/assembly/pom.xml
tiles/framework/branches/TILES_2_1_X/pom.xml
tiles/framework/branches/TILES_2_1_X/tiles-api/pom.xml
tiles/framework/branches/TILES_2_1_X/tiles-compat/pom.xml
tiles/framework/branches/TILES_2_1_X/tiles-core/ (props changed)
tiles/framework/branches/TILES_2_1_X/tiles-core/pom.xml
tiles/framework/branches/TILES_2_1_X/tiles-jsp/pom.xml
tiles/framework/branches/TILES_2_1_X/tiles-portlet/pom.xml
tiles/framework/branches/TILES_2_1_X/tiles-servlet/pom.xml
tiles/framework/branches/TILES_2_1_X/tiles-test/ (props changed)
tiles/framework/branches/TILES_2_1_X/tiles-test/pom.xml
Modified: tiles/framework/branches/TILES_2_1_X/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/assembly/pom.xml?rev=789669&r1=789668&r2=789669&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/assembly/pom.xml (original)
+++ tiles/framework/branches/TILES_2_1_X/assembly/pom.xml Tue Jun 30 10:45:07 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/branches/TILES_2_1_X/assembly</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/tiles/framework/branches/TILES_2_1_X/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/branches/TILES_2_1_X/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/pom.xml?rev=789669&r1=789668&r2=789669&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/pom.xml (original)
+++ tiles/framework/branches/TILES_2_1_X/pom.xml Tue Jun 30 10:45:07 2009
@@ -45,7 +45,7 @@
</scm>
<ciManagement />
-
+
<modules>
<module>tiles-api</module>
<module>tiles-core</module>
@@ -56,7 +56,7 @@
<module>tiles-test</module>
<module>assembly</module>
</modules>
-
+
<distributionManagement>
<repository>
<id>tiles-staging</id>
@@ -95,13 +95,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>
@@ -109,7 +108,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>
@@ -225,7 +223,7 @@
</properties>
<dependencies />
-
+
<profiles>
<profile>
<id>j4</id>
Modified: tiles/framework/branches/TILES_2_1_X/tiles-api/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-api/pom.xml?rev=789669&r1=789668&r2=789669&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/tiles-api/pom.xml (original)
+++ tiles/framework/branches/TILES_2_1_X/tiles-api/pom.xml Tue Jun 30 10:45:07 2009
@@ -90,14 +90,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
+ <version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
+ <version>2.5.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tiles/framework/branches/TILES_2_1_X/tiles-compat/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-compat/pom.xml?rev=789669&r1=789668&r2=789669&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/tiles-compat/pom.xml (original)
+++ tiles/framework/branches/TILES_2_1_X/tiles-compat/pom.xml Tue Jun 30 10:45:07 2009
@@ -107,14 +107,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
+ <version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
+ <version>2.5.1</version>
<scope>test</scope>
</dependency>
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 30 10:45:07 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-core:749981,761052,761061,772781,784975,785782,788065
+/tiles/framework/trunk/tiles-core:749981,761052,761061,772781,784975,785782,788065-789653
Modified: tiles/framework/branches/TILES_2_1_X/tiles-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-core/pom.xml?rev=789669&r1=789668&r2=789669&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/tiles-core/pom.xml (original)
+++ tiles/framework/branches/TILES_2_1_X/tiles-core/pom.xml Tue Jun 30 10:45:07 2009
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper-el</artifactId>
- <version>6.0.18</version>
+ <version>6.0.20</version>
<scope>compile</scope>
<optional>true</optional>
<exclusions>
@@ -133,14 +133,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
+ <version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
+ <version>2.5.1</version>
<scope>test</scope>
</dependency>
Modified: tiles/framework/branches/TILES_2_1_X/tiles-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-jsp/pom.xml?rev=789669&r1=789668&r2=789669&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/tiles-jsp/pom.xml (original)
+++ tiles/framework/branches/TILES_2_1_X/tiles-jsp/pom.xml Tue Jun 30 10:45:07 2009
@@ -117,25 +117,25 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
+ <version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.3</version>
+ <version>2.5.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5</version>
<scope>test</scope>
</dependency>
Modified: tiles/framework/branches/TILES_2_1_X/tiles-portlet/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-portlet/pom.xml?rev=789669&r1=789668&r2=789669&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/tiles-portlet/pom.xml (original)
+++ tiles/framework/branches/TILES_2_1_X/tiles-portlet/pom.xml Tue Jun 30 10:45:07 2009
@@ -121,14 +121,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
+ <version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
+ <version>2.5.1</version>
<scope>test</scope>
</dependency>
Modified: tiles/framework/branches/TILES_2_1_X/tiles-servlet/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-servlet/pom.xml?rev=789669&r1=789668&r2=789669&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/tiles-servlet/pom.xml (original)
+++ tiles/framework/branches/TILES_2_1_X/tiles-servlet/pom.xml Tue Jun 30 10:45:07 2009
@@ -117,13 +117,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.0</version>
+ <version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
+ <version>2.5.1</version>
<scope>test</scope>
</dependency>
<dependency>
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 30 10:45:07 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-test:747340,772781,785782,788065
+/tiles/framework/trunk/tiles-test:747340,772781,785782,788065-789653
Modified: tiles/framework/branches/TILES_2_1_X/tiles-test/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-test/pom.xml?rev=789669&r1=789668&r2=789669&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/tiles-test/pom.xml (original)
+++ tiles/framework/branches/TILES_2_1_X/tiles-test/pom.xml Tue Jun 30 10:45:07 2009
@@ -35,7 +35,7 @@
<name>Tiles - Apps - Test</name>
<description>Tiles Test web application: tests Tiles functionality.
</description>
-
+
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper-el</artifactId>
- <version>6.0.18</version>
+ <version>6.0.20</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -85,7 +85,7 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
+ <version>1.8.0.10</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -103,13 +103,13 @@
<version>2.5.6</version>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<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>
@@ -126,7 +126,6 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0-beta-2</version>
<configuration>
<container>
<containerId>tomcat6x</containerId>
@@ -207,7 +206,7 @@
</repository>
</repositories>
</profile>
-
+
<profile>
<id>hostedqa</id>
<dependencies>
@@ -387,7 +386,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>
@@ -406,7 +405,6 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0-beta-2</version>
<configuration>
<container>
<containerId>tomcat5x</containerId>