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/07/26 20:24:54 UTC
svn commit: r797970 - in /tiles/framework/trunk: ./ assembly/
assembly/src/main/assembly/ assembly/src/main/resources/ src/site/apt/dev/
tiles-test/
Author: apetrelli
Date: Sun Jul 26 18:24:53 2009
New Revision: 797970
URL: http://svn.apache.org/viewvc?rev=797970&view=rev
Log:
TILES-438
Removed "j4" profile.
Removed dependencies on retrotranslator.
Removed "j4" assembly.
Removed:
tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml
tiles/framework/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
Modified:
tiles/framework/trunk/NOTICE.txt
tiles/framework/trunk/assembly/pom.xml
tiles/framework/trunk/assembly/src/main/assembly/bin.xml
tiles/framework/trunk/pom.xml
tiles/framework/trunk/src/site/apt/dev/release.apt
tiles/framework/trunk/tiles-test/pom.xml
Modified: tiles/framework/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/NOTICE.txt?rev=797970&r1=797969&r2=797970&view=diff
==============================================================================
--- tiles/framework/trunk/NOTICE.txt (original)
+++ tiles/framework/trunk/NOTICE.txt Sun Jul 26 18:24:53 2009
@@ -6,6 +6,3 @@
The binary distribution contains software developed by:
SpringSource: http://www.springsource.com/
-
- The Java 1.4-compatible distribution contains software developed by:
- Retrotranslator (http://retrotranslator.sourceforge.net/).
\ No newline at end of file
Modified: tiles/framework/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/pom.xml?rev=797970&r1=797969&r2=797970&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/pom.xml (original)
+++ tiles/framework/trunk/assembly/pom.xml Sun Jul 26 18:24:53 2009
@@ -49,7 +49,6 @@
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
- <descriptor>src/main/assembly/bin-j4.xml</descriptor>
</descriptors>
<finalName>tiles-${version}</finalName>
<outputDirectory>target/assembly/out</outputDirectory>
@@ -81,7 +80,6 @@
<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>
@@ -137,57 +135,6 @@
<type>war</type>
</dependency>
- <!-- Tiles retrotranslated packages -->
- <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>
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-servlet</artifactId>
- <version>${pom.version}</version>
- <classifier>j4</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-portlet</artifactId>
- <version>${pom.version}</version>
- <classifier>j4</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-jsp</artifactId>
- <version>${pom.version}</version>
- <classifier>j4</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-compat</artifactId>
- <version>${pom.version}</version>
- <classifier>j4</classifier>
- </dependency>
-
- <!-- Retrotranslator dependencies -->
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-runtime</artifactId>
- <version>1.2.7</version>
- <scope>runtime</scope>
- </dependency>
-
<!-- Optional dependencies that will be redistributed -->
<dependency>
<groupId>javax.el</groupId>
Modified: tiles/framework/trunk/assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/assembly/bin.xml?rev=797970&r1=797969&r2=797970&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/bin.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/bin.xml Sun Jul 26 18:24:53 2009
@@ -46,8 +46,6 @@
<exclude>commons-logging:commons-logging-api</exclude>
<exclude>commons-beanutils:commons-beanutils</exclude>
<exclude>commons-digester:commons-digester</exclude>
- <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
- <exclude>backport-util-concurrent:backport-util-concurrent</exclude>
</excludes>
</dependencySet>
<dependencySet>
@@ -61,9 +59,6 @@
<include>org.apache.tiles:tiles-portlet</include>
<include>org.apache.tiles:tiles-compat</include>
</includes>
- <excludes>
- <exclude>*:j4</exclude>
- </excludes>
</dependencySet>
<dependencySet>
<outputDirectory>/examples</outputDirectory>
Modified: tiles/framework/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?rev=797970&r1=797969&r2=797970&view=diff
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Sun Jul 26 18:24:53 2009
@@ -229,30 +229,6 @@
<profiles>
<profile>
- <id>j4</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>retrotranslator-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <executions>
- <execution>
- <id>retrotranslate</id>
- <goals>
- <goal>translate-project</goal>
- </goals>
- <configuration>
- <classifier>j4</classifier>
- <attach>true</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>release</id>
<activation>
<property>
Modified: tiles/framework/trunk/src/site/apt/dev/release.apt
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/dev/release.apt?rev=797970&r1=797969&r2=797970&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/dev/release.apt (original)
+++ tiles/framework/trunk/src/site/apt/dev/release.apt Sun Jul 26 18:24:53 2009
@@ -28,17 +28,17 @@
Prerequisites
To create a release you have to install:
-
+
* {{{http://java.sun.com/j2se/1.5.0/}Java 5.0}}. If you are using a newer
version of Java, it is suggested to <<change JAVA_HOME environment variable>>
when calling Maven, so it points to an instance of Java 5.0;
-
+
* {{{http://maven.apache.org/}Maven 2}};
-
+
* {{{http://www.gnupg.org/}GnuPG}};
-
+
* {{{http://www.openssh.com/}OpenSSH}};
-
+
* {{{http://www.graphviz.org/}GraphViz}}: use version 2.8. See
{{{building.html}building Tiles}} for the reason of not using the latest
version.
@@ -117,7 +117,7 @@
To perform the release, i.e. creating and deploying Maven artifacts, use:
-----------------------------------
-mvn -Prelease -Darguments="-Prelease,j4" release:perform
+mvn -Prelease -Darguments="-Prelease" release:perform
-----------------------------------
* Digest and upload assemblies
@@ -142,7 +142,7 @@
-----------------------------------
* Upload everything to the build site:
-
+
-----------------------------------
scp * user@people.apache.org:/www/people.apache.org/builds/tiles/${version}
-----------------------------------
@@ -150,9 +150,9 @@
* Release the JIRA version
* In JIRA go to the version that you want to release and release it.
-
+
* Create a new version, if it has not been done before.
-
+
* Create the release notes and <<write down the link>> that it uses.
* Send announcement for the test build
Modified: tiles/framework/trunk/tiles-test/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/pom.xml?rev=797970&r1=797969&r2=797970&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/pom.xml (original)
+++ tiles/framework/trunk/tiles-test/pom.xml Sun Jul 26 18:24:53 2009
@@ -316,36 +316,6 @@
</properties>
</profile>
<profile>
- <id>j4</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>retrotranslator-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <executions>
- <execution>
- <id>retrotranslate</id>
- <goals>
- <goal>translate-war</goal>
- </goals>
- <configuration>
- <jarfileset>
- <includes>
- <include>tiles-*.jar</include>
- </includes>
- </jarfileset>
- <classifier>j4</classifier>
- <attach>true</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>release</id>
<activation>
<property>