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.
git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_2_0_X@583063 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assembly/pom.xml b/assembly/pom.xml
index c65b15e..c1b4aa5 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -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>
diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml
index 773f9f0..c26c053 100644
--- a/tiles-core/pom.xml
+++ b/tiles-core/pom.xml
@@ -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>
diff --git a/tiles-jsp/pom.xml b/tiles-jsp/pom.xml
index f1d2d1e..20ffc9e 100644
--- a/tiles-jsp/pom.xml
+++ b/tiles-jsp/pom.xml
@@ -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>
