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/08/04 21:50:45 UTC
svn commit: r982383 - in /tiles/sandbox/trunk/tiles3: assembly/pom.xml
tiles-test-pom/tiles-test/ tiles-test-pom/tiles-test/pom.xml
tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
Author: apetrelli
Date: Wed Aug 4 19:50:45 2010
New Revision: 982383
URL: http://svn.apache.org/viewvc?rev=982383&view=rev
Log:
TILES-481
Merge from trunk to sandboxed Tiles 3.
Fixed uploading of assemblies in the release process.
Modified:
tiles/sandbox/trunk/tiles3/assembly/pom.xml
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml (props changed)
Modified: tiles/sandbox/trunk/tiles3/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/assembly/pom.xml?rev=982383&r1=982382&r2=982383&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/assembly/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/assembly/pom.xml Wed Aug 4 19:50:45 2010
@@ -61,7 +61,7 @@
</build>
<profiles>
<profile>
- <id>release</id>
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
@@ -96,6 +96,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
<executions>
<execution>
<phase>deploy</phase>
@@ -110,6 +111,7 @@
<fileset dir="${settings.localRepository}/org/apache/tiles/tiles-assembly/${pom.version}">
<include name="tiles-assembly-${pom.version}-*.zip*" />
<include name="tiles-assembly-${pom.version}-*.tar.gz*" />
+ <exclude name="tiles-assembly-${pom.version}-source-release.*"/>
</fileset>
<mapper type="glob" from="tiles-assembly-*" to="tiles-*"/>
</copy>
Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 4 19:50:45 2010
@@ -1,3 +1,3 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449
+/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367
/tiles/sandbox/trunk/tiles-test:740289
/tiles/sandbox/trunk/tiles-test-sandbox:740290-745038,747727-751891
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml?rev=982383&r1=982382&r2=982383&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml Wed Aug 4 19:50:45 2010
@@ -389,12 +389,7 @@
</properties>
</profile>
<profile>
- <id>release</id>
- <activation>
- <property>
- <name>release</name>
- </property>
- </activation>
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 4 19:50:45 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,949559,950449
+/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,950449,982366-982367