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 2010/06/01 20:39:07 UTC
svn commit: r950198 - in /tiles/sandbox/trunk: tiles-autotag/
tiles-autotag/pom.xml tiles-request/ tiles-request/pom.xml tiles3/
tiles3/pom.xml tiles3/tiles-test-pom/tiles-test/
tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
Author: apetrelli
Date: Tue Jun 1 18:39:07 2010
New Revision: 950198
URL: http://svn.apache.org/viewvc?rev=950198&view=rev
Log:
TILES-508
Merge from trunk to sandboxed Tiles 3.
Removed repository configuration.
Fixed release plugin configuration.
Fixed some artifact and plugin versions.
Modified:
tiles/sandbox/trunk/tiles-autotag/ (props changed)
tiles/sandbox/trunk/tiles-autotag/pom.xml
tiles/sandbox/trunk/tiles-request/ (props changed)
tiles/sandbox/trunk/tiles-request/pom.xml
tiles/sandbox/trunk/tiles3/ (props changed)
tiles/sandbox/trunk/tiles3/pom.xml
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml (props changed)
Propchange: tiles/sandbox/trunk/tiles-autotag/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 1 18:39:07 2010
@@ -1 +1,2 @@
.*
+target
Modified: tiles/sandbox/trunk/tiles-autotag/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/pom.xml?rev=950198&r1=950197&r2=950198&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-autotag/pom.xml Tue Jun 1 18:39:07 2010
@@ -4,7 +4,7 @@
<parent>
<artifactId>tiles-master</artifactId>
<groupId>org.apache.tiles</groupId>
- <version>1</version>
+ <version>3-SNAPSHOT</version>
</parent>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-autotag</artifactId>
Propchange: tiles/sandbox/trunk/tiles-request/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 1 18:39:07 2010
@@ -1 +1,2 @@
.*
+target
Modified: tiles/sandbox/trunk/tiles-request/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/pom.xml?rev=950198&r1=950197&r2=950198&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-request/pom.xml Tue Jun 1 18:39:07 2010
@@ -4,7 +4,7 @@
<parent>
<artifactId>tiles-master</artifactId>
<groupId>org.apache.tiles</groupId>
- <version>1</version>
+ <version>3-SNAPSHOT</version>
</parent>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request</artifactId>
Propchange: tiles/sandbox/trunk/tiles3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 1 18:39:07 2010
@@ -1 +1 @@
-/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637
+/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559
Modified: tiles/sandbox/trunk/tiles3/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/pom.xml?rev=950198&r1=950197&r2=950198&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/pom.xml Tue Jun 1 18:39:07 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-master</artifactId>
- <version>1</version>
+ <version>3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -221,6 +221,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
<configuration>
<includes>
<include>pom.xml</include>
@@ -331,29 +332,4 @@
</profile>
</profiles>
- <!-- Needs to be commented out for releases -->
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
</project>
\ No newline at end of file
Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 1 18:39:07 2010
@@ -1,3 +1,3 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637
+/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559
/tiles/sandbox/trunk/tiles-test:740289
/tiles/sandbox/trunk/tiles-test-sandbox:740290-745038,747727-751891
Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 1 18:39:07 2010
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637
+/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559