Return-Path: <commits-return-64681-archive-asf-public=cust-asf.ponee.io@myfaces.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 66465200C47
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu, 16 Mar 2017 00:19:22 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 64D10160B7C; Wed, 15 Mar 2017 23:19:22 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 8902D160B78
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 16 Mar 2017 00:19:21 +0100 (CET)
Received: (qmail 73608 invoked by uid 500); 15 Mar 2017 23:19:20 -0000
Mailing-List: contact commits-help@myfaces.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@myfaces.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@myfaces.apache.org>
List-Post: <mailto:commits@myfaces.apache.org>
List-Id: <commits.myfaces.apache.org>
Reply-To: "MyFaces Development" <dev@myfaces.apache.org>
Delivered-To: mailing list commits@myfaces.apache.org
Received: (qmail 73594 invoked by uid 99); 15 Mar 2017 23:19:20 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Mar 2017 23:19:20 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 6C93D3A0565
	for <commits@myfaces.apache.org>; Wed, 15 Mar 2017 23:19:18 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1787112 - in /myfaces/core/branches/2.3.x: api/pom.xml
 bundle/pom.xml impl/pom.xml parent/pom.xml
Date: Wed, 15 Mar 2017 23:19:17 -0000
To: commits@myfaces.apache.org
From: lu4242@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20170315231918.6C93D3A0565@svn01-us-west.apache.org>
archived-at: Wed, 15 Mar 2017 23:19:22 -0000

Author: lu4242
Date: Wed Mar 15 23:19:17 2017
New Revision: 1787112

URL: http://svn.apache.org/viewvc?rev=1787112&view=rev
Log:
MYFACES-4104 Update plugins to compile java 8 code in JSF 2.3 branch

Modified:
    myfaces/core/branches/2.3.x/api/pom.xml
    myfaces/core/branches/2.3.x/bundle/pom.xml
    myfaces/core/branches/2.3.x/impl/pom.xml
    myfaces/core/branches/2.3.x/parent/pom.xml

Modified: myfaces/core/branches/2.3.x/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/pom.xml?rev=1787112&r1=1787111&r2=1787112&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/pom.xml (original)
+++ myfaces/core/branches/2.3.x/api/pom.xml Wed Mar 15 23:19:17 2017
@@ -104,6 +104,14 @@
                 </configuration>
             </plugin>
             
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <excludes>javax/faces/component/**/*.java</excludes>
+                </configuration>
+            </plugin>
+            
             <!-- compilation and compression of our javascripts -->
             <plugin>
                 <artifactId>myfaces-javascript-plugin</artifactId>
@@ -386,7 +394,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.5.3</version>
                 <executions>
                     <execution>
                         <id>bundle-manifest</id>
@@ -510,7 +517,7 @@
                                 <comparisonArtifact>
                                     <groupId>org.glassfish</groupId>
                                     <artifactId>javax.faces</artifactId>
-                                    <version>2.3.0-m09</version>
+                                    <version>2.3.0-m11</version>
                                 </comparisonArtifact>
                             </comparisonArtifacts>
                             <includes>

Modified: myfaces/core/branches/2.3.x/bundle/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/bundle/pom.xml?rev=1787112&r1=1787111&r2=1787112&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/bundle/pom.xml (original)
+++ myfaces/core/branches/2.3.x/bundle/pom.xml Wed Mar 15 23:19:17 2017
@@ -41,7 +41,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.5.3</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

Modified: myfaces/core/branches/2.3.x/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/pom.xml?rev=1787112&r1=1787111&r2=1787112&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/pom.xml (original)
+++ myfaces/core/branches/2.3.x/impl/pom.xml Wed Mar 15 23:19:17 2017
@@ -111,6 +111,20 @@
                 </configuration>
             </plugin>
             
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        org/apache/myfaces/push/WebsocketComponent.java,
+                        org/apache/myfaces/push/WebsocketInit.java,
+                        org/apache/myfaces/taglib/core/*,
+                        org/apache/myfaces/taglib/html/*,
+                        org/apache/myfaces/view/facelets/component/JsfElement.java,
+                        org/apache/myfaces/webapp/WebConfigParamsLogger.java</excludes>
+                </configuration>
+            </plugin>
+            
             <!-- myfaces-build-plugin - we generate a lot of stuff with this plugin (see executions) -->
             <plugin>
                 <groupId>org.apache.myfaces.buildtools</groupId>
@@ -719,7 +733,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.1.0</version>
                 <executions>
                     <execution>
                         <id>bundle-manifest</id>

Modified: myfaces/core/branches/2.3.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/parent/pom.xml?rev=1787112&r1=1787111&r2=1787112&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/parent/pom.xml (original)
+++ myfaces/core/branches/2.3.x/parent/pom.xml Wed Mar 15 23:19:17 2017
@@ -81,6 +81,7 @@
                   -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
                 <executions>
                     <execution>
                         <id>verify-style</id>
@@ -158,7 +159,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>1.3.3</version>
+                    <version>2.4.3</version>
                 </plugin>
 
                 <plugin>
@@ -168,6 +169,12 @@
                 </plugin>
 
                 <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>2.5.4</version>
+                </plugin>
+
+                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-idea-plugin</artifactId>
                     <version>2.1</version>