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 2007/10/09 09:24:17 UTC
svn commit: r583063 - in /tiles/framework/branches/TILES_2_0_X:
assembly/pom.xml tiles-core/pom.xml tiles-jsp/pom.xml
Author: apetrelli
Date: Tue Oct 9 00:24:16 2007
New Revision: 583063
URL: http://svn.apache.org/viewvc?rev=583063&view=rev
Log:
TILES-196
Merge from trunk to TILES_2_0_X branch.
Removed wrong dependencies for "j4" profile.
Added the j4 assembly in the release profile.
Modified:
tiles/framework/branches/TILES_2_0_X/assembly/pom.xml
tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml
tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml
Modified: tiles/framework/branches/TILES_2_0_X/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/assembly/pom.xml?rev=583063&r1=583062&r2=583063&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/assembly/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/assembly/pom.xml Tue Oct 9 00:24:16 2007
@@ -79,6 +79,7 @@
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
+ <descriptor>src/main/assembly/bin-j4.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml?rev=583063&r1=583062&r2=583063&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/pom.xml Tue Oct 9 00:24:16 2007
@@ -82,14 +82,6 @@
<profile>
<id>j4</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-api</artifactId>
- <version>${pom.version}</version>
- <classifier>j4</classifier>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml?rev=583063&r1=583062&r2=583063&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/pom.xml Tue Oct 9 00:24:16 2007
@@ -82,20 +82,6 @@
<profile>
<id>j4</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-api</artifactId>
- <version>${pom.version}</version>
- <classifier>j4</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-core</artifactId>
- <version>${pom.version}</version>
- <classifier>j4</classifier>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>