struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgie...@apache.org
Subject svn commit: r718412 - in /struts/struts2/branches/STRUTS_2_0_X: assembly/pom.xml pom.xml
Date Mon, 17 Nov 2008 22:23:48 GMT
Author: rgielen
Date: Mon Nov 17 14:23:47 2008
New Revision: 718412

URL: http://svn.apache.org/viewvc?rev=718412&view=rev
Log:
WW-2872:
Fix problems with retrotranslator assembly failing
TODO: establish XWork 2.0.x jdk14 deployment

Modified:
    struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
    struts/struts2/branches/STRUTS_2_0_X/pom.xml

Modified: struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml?rev=718412&r1=718411&r2=718412&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml Mon Nov 17 14:23:47 2008
@@ -123,9 +123,7 @@
                     <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>
@@ -433,6 +431,122 @@
             <scope>provided</scope>
         </dependency>
 
+
+        <!-- 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>com.opensymphony</groupId>
+            <artifactId>xwork</artifactId>
+            <version>2.0.7</version>
+            <type>jar</type>
+            <classifier>jdk14</classifier>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+            <version>${version}</version>
+            <classifier>jdk14</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-codebehind-plugin</artifactId>
+            <version>${version}</version>
+            <classifier>jdk14</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-config-browser-plugin</artifactId>
+            <version>${version}</version>
+            <classifier>jdk14</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-jasperreports-plugin</artifactId>
+            <version>${version}</version>
+            <classifier>jdk14</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-jfreechart-plugin</artifactId>
+            <version>${version}</version>
+            <classifier>jdk14</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-jsf-plugin</artifactId>
+            <version>${version}</version>
+            <classifier>jdk14</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-pell-multipart-plugin</artifactId>
+            <version>${version}</version>
+            <classifier>jdk14</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-plexus-plugin</artifactId>
+            <version>${version}</version>
+            <classifier>jdk14</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-sitegraph-plugin</artifactId>
+            <version>${version}</version>
+            <classifier>jdk14</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-sitemesh-plugin</artifactId>
+            <version>${version}</version>
+            <classifier>jdk14</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-spring-plugin</artifactId>
+            <version>${version}</version>
+            <classifier>jdk14</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-struts1-plugin</artifactId>
+            <version>${version}</version>
+            <classifier>jdk14</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-tiles-plugin</artifactId>
+            <version>${version}</version>
+            <classifier>jdk14</classifier>
+        </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file

Modified: struts/struts2/branches/STRUTS_2_0_X/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/pom.xml?rev=718412&r1=718411&r2=718412&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/pom.xml Mon Nov 17 14:23:47 2008
@@ -246,7 +246,6 @@
                         </execution>
                     </executions>
                 </plugin>
-<!--
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>retrotranslator-maven-plugin</artifactId>
@@ -259,8 +258,6 @@
                         </goals>
                         <configuration>
                             <verify>false</verify>
-                            <classifier>jdk14</classifier>
-                            <attach>true</attach>
                             <failonwarning>true</failonwarning>
                             <lazy>true</lazy>
                             <advanced>true</advanced>
@@ -270,7 +267,6 @@
                     </execution>
                 </executions>
             </plugin>
--->
             <!-- Commenting out the license plugin, until it works like we want.
             To use the "license:format" goal, remove the "core" module before running,
             otherwise it will ignore the file exclusions.



Mime
View raw message