struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [01/11] struts git commit: Reverts to old version of ASM and adds ASM 5 as well
Date Tue, 23 Dec 2014 08:51:16 GMT
Repository: struts
Updated Branches:
  refs/heads/develop b11bb2574 -> 3bf67283e


Reverts to old version of ASM and adds ASM 5 as well


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6774e840
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6774e840
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6774e840

Branch: refs/heads/develop
Commit: 6774e840c8c48d992911cfd2375b00c1841baa0a
Parents: 61ab813
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Sat Dec 20 21:44:18 2014 +0100
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Sat Dec 20 21:44:18 2014 +0100

----------------------------------------------------------------------
 pom.xml            | 20 ++++++++++++++++++--
 xwork-core/pom.xml |  4 ++--
 2 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/6774e840/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 673c53e..3801c26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,8 @@
         <currentVersion>${project.version}</currentVersion>
         <struts2.springPlatformVersion>3.0.5.RELEASE</struts2.springPlatformVersion>
         <ognl.version>3.0.6</ognl.version>
-        <asm.version>5.0.2</asm.version>
+        <asm.version>3.3</asm.version>
+        <asm5.version>5.0.2</asm5.version>
         <tiles.version>2.0.6</tiles.version>
 
         <!-- SCM Site Configuration -->
@@ -514,6 +515,11 @@
                 <artifactId>struts2-osgi-demo-bundle</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.struts</groupId>
+                <artifactId>struts2-java8-support-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.freemarker</groupId>
@@ -585,11 +591,21 @@
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm</artifactId>
-                <version>${asm.version}</version>
+                <version>${asm5.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm-commons</artifactId>
+                <version>${asm5.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>asm</groupId>
+                <artifactId>asm-commons</artifactId>
                 <version>${asm.version}</version>
             </dependency>
             <dependency>

http://git-wip-us.apache.org/repos/asf/struts/blob/6774e840/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index 8f7a024..f26c25d 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -126,11 +126,11 @@
             <artifactId>ognl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ow2.asm</groupId>
+            <groupId>asm</groupId>
             <artifactId>asm</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ow2.asm</groupId>
+            <groupId>asm</groupId>
             <artifactId>asm-commons</artifactId>
         </dependency>
         <dependency>


Mime
View raw message