struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject svn commit: r1484447 - in /struts/struts2/trunk: assembly/pom.xml pom.xml src/site/xdoc/index.xml.vm xwork-core/pom.xml
Date Mon, 20 May 2013 12:39:31 GMT
Author: lukaszlenart
Date: Mon May 20 12:39:31 2013
New Revision: 1484447

URL: http://svn.apache.org/r1484447
Log:
WW-4070 Removes support for translating project to JDK4

Modified:
    struts/struts2/trunk/assembly/pom.xml
    struts/struts2/trunk/pom.xml
    struts/struts2/trunk/src/site/xdoc/index.xml.vm
    struts/struts2/trunk/xwork-core/pom.xml

Modified: struts/struts2/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=1484447&r1=1484446&r2=1484447&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Mon May 20 12:39:31 2013
@@ -16,185 +16,6 @@
         <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/assembly</url>
     </scm>
 
-    <profiles>
-        <profile>
-            <id>j4</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>make-assembly</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attached</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/all.xml</descriptor>
-                                <descriptor>src/main/assembly/lib.xml</descriptor>
-                                <descriptor>src/main/assembly/lib-jdk14.xml</descriptor>
-                                <descriptor>src/main/assembly/apps.xml</descriptor>
-                                <descriptor>src/main/assembly/src.xml</descriptor>
-                                <descriptor>src/main/assembly/docs.xml</descriptor>
-                            </descriptors>
-                            <finalName>struts-${project.version}</finalName>
-                            <outputDirectory>target/assembly/out</outputDirectory>
-                            <workDirectory>target/assembly/work</workDirectory>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <!-- Backported JDK 1.4 jars -->
-                <dependency>
-                    <groupId>net.sf.retrotranslator</groupId>
-                    <artifactId>retrotranslator-runtime</artifactId>
-                    <version>1.2.1</version>
-                    <scope>runtime</scope>
-                </dependency>
-
-                <dependency>
-                    <groupId>backport-util-concurrent</groupId>
-                    <artifactId>backport-util-concurrent</artifactId>
-                    <version>3.0</version>
-                    <scope>runtime</scope>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts.xwork</groupId>
-                    <artifactId>xwork-core</artifactId>
-                    <version>${project.version}</version>
-                    <type>jar</type>
-                    <classifier>jdk14</classifier>
-                    <scope>runtime</scope>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-core</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-config-browser-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-jasperreports-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-jfreechart-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-jsf-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-pell-multipart-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-plexus-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-sitegraph-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-sitemesh-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-struts1-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-tiles-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-rest-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-oval-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-osgi-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-json-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-embeddedjsp-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.struts</groupId>
-                    <artifactId>struts2-gxp-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <classifier>jdk14</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
     <build>
         <plugins>
             <plugin>

Modified: struts/struts2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1484447&r1=1484446&r2=1484447&view=diff
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Mon May 20 12:39:31 2013
@@ -113,34 +113,6 @@
                 <module>../maven/struts-annotations</module>
             </modules>
         </profile>
-        <profile>
-            <id>j4</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>retrotranslator-maven-plugin</artifactId>
-                        <version>1.0-alpha-3</version>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>translate-project</goal>
-                                </goals>
-                                <configuration>
-                                    <verify>false</verify>
-                                    <failonwarning>true</failonwarning>
-                                    <lazy>true</lazy>
-                                    <advanced>true</advanced>
-                                    <verbose>false</verbose>
-                                    <destdir>${project.build.directory}/classes-retro</destdir>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
 

Modified: struts/struts2/trunk/src/site/xdoc/index.xml.vm
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/xdoc/index.xml.vm?rev=1484447&r1=1484446&r2=1484447&view=diff
==============================================================================
--- struts/struts2/trunk/src/site/xdoc/index.xml.vm (original)
+++ struts/struts2/trunk/src/site/xdoc/index.xml.vm Mon May 20 12:39:31 2013
@@ -215,11 +215,6 @@
         </ul>
 
         <p>
-         An alternate set of JARs for Java 4 are also available.
-         See the "J4" distribution.
-        </p>
-
-        <p>
          For a full list of requirements, including dependencies used by optional plugins,
          see <a href="struts2-core/dependencies.html">Project Dependencies</a>
         </p>

Modified: struts/struts2/trunk/xwork-core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/pom.xml?rev=1484447&r1=1484446&r2=1484447&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/pom.xml (original)
+++ struts/struts2/trunk/xwork-core/pom.xml Mon May 20 12:39:31 2013
@@ -13,7 +13,6 @@
     <packaging>jar</packaging>
     <name>XWork: Core</name>
 
-
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/xwork-core/</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/xwork-core/</developerConnection>
@@ -24,65 +23,6 @@
         <currentVersion>${project.version}</currentVersion>
     </properties>
 
-    <profiles>
-        <profile>
-            <!--
-                   Run the translator for Java 1.4 compatiblity
-
-                   OS/X Sample:
-                   $ cd xwork/
-                   $ mvn clean install -Pj4 -Djava14.jar=$JAVA_HOME/../Classes/classes.jar
-
-                -->
-            <id>j4</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>retrotranslator-maven-plugin</artifactId>
-                        <version>1.0-alpha-4</version>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>translate-project</goal>
-                                </goals>
-                                <configuration>
-                                    <verify>false</verify>
-                                    <failonwarning>true</failonwarning>
-                                    <lazy>true</lazy>
-                                    <advanced>true</advanced>
-                                    <verbose>false</verbose>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <!--
-            <dependencies>
-                <dependency>
-                    <groupId>sun.jdk</groupId>
-                    <artifactId>rt</artifactId>
-                    <version>1.4.0</version>
-                    <scope>system</scope>
-                    <systemPath>${java14.jar}</systemPath>
-                </dependency>
-                <dependency>
-                    <groupId>net.sf.retrotranslator</groupId>
-                    <artifactId>retrotranslator-runtime</artifactId>
-                    <version>1.2.1</version>
-                </dependency>
-                <dependency>
-                    <groupId>net.sf.retrotranslator</groupId>
-                    <artifactId>retrotranslator-transformer</artifactId>
-                    <version>1.2.1</version>
-                </dependency>
-            </dependencies>
-            -->
-        </profile>
-    </profiles>
-
     <build>
         <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
         <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>



Mime
View raw message