Return-Path: 
 <commits-return-13825-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
X-Original-To: apmail-struts-commits-archive@minotaur.apache.org
Delivered-To: apmail-struts-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id CE10A10854
	for <apmail-struts-commits-archive@minotaur.apache.org>;
 Tue, 23 Dec 2014 08:51:19 +0000 (UTC)
Received: (qmail 20201 invoked by uid 500); 23 Dec 2014 08:51:17 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 20090 invoked by uid 500); 23 Dec 2014 08:51:17 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 19710 invoked by uid 99); 23 Dec 2014 08:51:17 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Dec 2014 08:51:17 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 96D55A34AC8; Tue, 23 Dec 2014 08:51:16 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: lukaszlenart@apache.org
To: commits@struts.apache.org
Date: Tue, 23 Dec 2014 08:51:16 -0000
Message-Id: <7f701fe979144732af5b5c8b6e740594@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [01/11] struts git commit: Reverts to old version of ASM and adds ASM
 5 as well

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>