myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bom...@apache.org
Subject svn commit: r1792185 - in /myfaces/trinidad/branches/trinidad-2.1.x: ./ trinidad-api/ trinidad-api/src/test/java/org/apache/myfaces/trinidad/ trinidad-example/trinidad-demo/ trinidad-example/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/w...
Date Fri, 21 Apr 2017 11:38:22 GMT
Author: bommel
Date: Fri Apr 21 11:38:21 2017
New Revision: 1792185

URL: http://svn.apache.org/viewvc?rev=1792185&view=rev
Log:
cleanup dependencies
update some plugin
one trinidad maven build doesn't work with jdk 1.8 build has to done with 1.6 or 1.7

Modified:
    myfaces/trinidad/branches/trinidad-2.1.x/pom.xml
    myfaces/trinidad/branches/trinidad-2.1.x/trinidad-api/pom.xml
    myfaces/trinidad/branches/trinidad-2.1.x/trinidad-api/src/test/java/org/apache/myfaces/trinidad/ClirrRunnerTest.java
    myfaces/trinidad/branches/trinidad-2.1.x/trinidad-example/trinidad-demo/pom.xml
    myfaces/trinidad/branches/trinidad-2.1.x/trinidad-example/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/webapp/SourceCodeServlet.java
    myfaces/trinidad/branches/trinidad-2.1.x/trinidad-impl/pom.xml
    myfaces/trinidad/branches/trinidad-2.1.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java

Modified: myfaces/trinidad/branches/trinidad-2.1.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.1.x/pom.xml?rev=1792185&r1=1792184&r2=1792185&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.1.x/pom.xml (original)
+++ myfaces/trinidad/branches/trinidad-2.1.x/pom.xml Fri Apr 21 11:38:21 2017
@@ -70,9 +70,9 @@ Create A Branch (http://maven.apache.org
     <jsf-ri.version>2.1.29-08</jsf-ri.version>
     <jsf-myfaces.version>2.1.18</jsf-myfaces.version>
     <portlet-bridge.version>2.0.0</portlet-bridge.version>
-    <commons-lang.version>2.4</commons-lang.version>
-    <commons-io.version>2.0</commons-io.version>
-	<commons-codec.version>1.3</commons-codec.version>
+    <commons-lang.version>3.5</commons-lang.version>
+    <commons-io.version>2.5</commons-io.version>
+    <commons-codec.version>1.10</commons-codec.version>
 
     <pluto-embedded.version>1.0.1</pluto-embedded.version>
     
@@ -116,8 +116,8 @@ Create A Branch (http://maven.apache.org
   </issueManagement>
 
   <ciManagement>
-    <system>continuum</system>
-    <url>http://myfaces.zones.apache.org:8080/continuum</url>
+    <system>Jenkins</system>
+    <url>https://builds.apache.org/view/M-R/view/MyFaces/</url>
     <notifiers>
       <notifier>
         <type>mail</type>
@@ -283,8 +283,8 @@ Create A Branch (http://maven.apache.org
       </dependency>
       
       <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
         <version>${commons-lang.version}</version>
       </dependency>
 
@@ -293,12 +293,12 @@ Create A Branch (http://maven.apache.org
         <artifactId>commons-io</artifactId>
         <version>${commons-io.version}</version>
       </dependency>
-	  
+
       <dependency>
-		<groupId>commons-codec</groupId>
-		<artifactId>commons-codec</artifactId>
-		<version>${commons-codec.version}</version>
-	  </dependency>	  
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>${commons-codec.version}</version>
+      </dependency>
 
       <dependency>
         <groupId>org.apache.myfaces.buildtools</groupId>
@@ -382,70 +382,33 @@ Create A Branch (http://maven.apache.org
     <module>trinidad-impl</module>
     <module>trinidad-example</module>
   </modules>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>0.12</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.0.1</version>
+      </plugin>
+    </plugins>
+  </reporting>
 
   <build>
-  
-    <!-- Since Maven 3.0, this is required to add scpexe as protocol for deploy. -->
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-ssh-external</artifactId>
-        <version>1.0-beta-7</version>
-      </extension>
-    </extensions>
-        
+
     <pluginManagement>
       <plugins>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.3</version>
+          <version>3.5.1</version>
           <inherited>true</inherited>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.maven.wagon</groupId>
-              <artifactId>wagon-ssh</artifactId>
-              <version>1.0-beta-7</version>
-            </dependency>
-          </dependencies>
           <configuration>
             <stagingRepositoryId>myfaces-local-staging</stagingRepositoryId>
             <stagingSiteURL>${siteDeploy.url}</stagingSiteURL>
             <outputEncoding>UTF-8</outputEncoding>
-            <reportPlugins>
-              <!--plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.0</version>
-                <configuration>
-                  <threshold>Low</threshold>
-                </configuration>
-              </plugin-->
-
-              <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>rat-maven-plugin</artifactId>
-              </plugin>
-
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.0.1</version>
-              </plugin>
-
-              <!--plugin>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                  <rulesets>
-                    <ruleset>/rulesets/basic.xml</ruleset>
-                    <ruleset>/rulesets/unusedcode.xml</ruleset>
-                  </rulesets>
-                  <linkXref>true</linkXref>
-                  <minimumTokens>100</minimumTokens>
-                  <targetJdk>${jdk.version}</targetJdk>
-                </configuration>
-              </plugin -->
-            </reportPlugins>
           </configuration>
         </plugin>
 
@@ -623,24 +586,24 @@ Create A Branch (http://maven.apache.org
           <version>2.8</version>
         </plugin>
 
-		<!-- Begin dependency fix for .md5 and .sha1 -->
-		<plugin>
-		  <groupId>org.apache.maven.plugins</groupId>
-		  <artifactId>maven-release-plugin</artifactId>
-		  <version>2.5.3</version>
-		</plugin>
-		<plugin>
-		  <groupId>org.apache.maven.plugins</groupId>
-		  <artifactId>maven-gpg-plugin</artifactId>
-		  <version>1.6</version>
-		</plugin>
-		<plugin>
-		  <groupId>org.apache.maven.plugins</groupId>
-		  <artifactId>maven-deploy-plugin</artifactId>
-		  <version>2.8.2</version>
-		</plugin>
-		<!-- End -->		
-		
+        <!-- Begin dependency fix for .md5 and .sha1 -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.5.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>1.6</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <!-- End -->
+
       </plugins>
     </pluginManagement>
     
@@ -652,7 +615,7 @@ Create A Branch (http://maven.apache.org
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.0.1</version>
+        <version>1.4.1</version>
         <executions>
           <execution>
             <id>enforce-maven</id>
@@ -667,8 +630,8 @@ Create A Branch (http://maven.apache.org
                   <version>[${maven.min-version},)</version>
                 </requireMavenVersion>
                 <requireJavaVersion>
-                  <message>Apache MyFaces Trinidad 2 needs to be compiled with at least
JDK ${jdk.min-version}</message>                
-                  <version>[${jdk.min-version},)</version>
+                  <message>Apache MyFaces Trinidad 2 needs to be compiled with at least
JDK ${jdk.min-version} and max JDK 1.7</message>
+                  <version>[${jdk.min-version},1.8)</version>
                 </requireJavaVersion>
               </rules>    
             </configuration>
@@ -683,7 +646,7 @@ Create A Branch (http://maven.apache.org
           <headerLocation>default/myfaces-header.txt</headerLocation>
         </configuration>
       </plugin>
-    
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
@@ -760,7 +723,7 @@ Create A Branch (http://maven.apache.org
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-scm-publish-plugin</artifactId>
-        <version>1.0-beta-2</version>
+        <version>1.1</version>
         <configuration>
         <pubScmUrl>${siteScmPublish.url}</pubScmUrl>
         <tryUpdate>true</tryUpdate>

Modified: myfaces/trinidad/branches/trinidad-2.1.x/trinidad-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.1.x/trinidad-api/pom.xml?rev=1792185&r1=1792184&r2=1792185&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.1.x/trinidad-api/pom.xml (original)
+++ myfaces/trinidad/branches/trinidad-2.1.x/trinidad-api/pom.xml Fri Apr 21 11:38:21 2017
@@ -103,9 +103,9 @@
       <groupId>jmock</groupId>
       <artifactId>jmock-cglib</artifactId>
     </dependency>
-     <dependency> 	 
-       <groupId>commons-lang</groupId> 	 
-       <artifactId>commons-lang</artifactId> 	 
+     <dependency>
+       <groupId>org.apache.commons</groupId>
+       <artifactId>commons-lang3</artifactId>
        <scope>test</scope> 	 
      </dependency> 	 
 

Modified: myfaces/trinidad/branches/trinidad-2.1.x/trinidad-api/src/test/java/org/apache/myfaces/trinidad/ClirrRunnerTest.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.1.x/trinidad-api/src/test/java/org/apache/myfaces/trinidad/ClirrRunnerTest.java?rev=1792185&r1=1792184&r2=1792185&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.1.x/trinidad-api/src/test/java/org/apache/myfaces/trinidad/ClirrRunnerTest.java
(original)
+++ myfaces/trinidad/branches/trinidad-2.1.x/trinidad-api/src/test/java/org/apache/myfaces/trinidad/ClirrRunnerTest.java
Fri Apr 21 11:38:21 2017
@@ -22,7 +22,7 @@ import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

Modified: myfaces/trinidad/branches/trinidad-2.1.x/trinidad-example/trinidad-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.1.x/trinidad-example/trinidad-demo/pom.xml?rev=1792185&r1=1792184&r2=1792185&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.1.x/trinidad-example/trinidad-demo/pom.xml (original)
+++ myfaces/trinidad/branches/trinidad-2.1.x/trinidad-example/trinidad-demo/pom.xml Fri Apr
21 11:38:21 2017
@@ -86,8 +86,8 @@
     
     <!-- For SourceCodeServlet -->
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
 
 <!--

Modified: myfaces/trinidad/branches/trinidad-2.1.x/trinidad-example/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/webapp/SourceCodeServlet.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.1.x/trinidad-example/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/webapp/SourceCodeServlet.java?rev=1792185&r1=1792184&r2=1792185&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.1.x/trinidad-example/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/webapp/SourceCodeServlet.java
(original)
+++ myfaces/trinidad/branches/trinidad-2.1.x/trinidad-example/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/webapp/SourceCodeServlet.java
Fri Apr 21 11:38:21 2017
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class SourceCodeServlet extends HttpServlet
 {

Modified: myfaces/trinidad/branches/trinidad-2.1.x/trinidad-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.1.x/trinidad-impl/pom.xml?rev=1792185&r1=1792184&r2=1792185&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.1.x/trinidad-impl/pom.xml (original)
+++ myfaces/trinidad/branches/trinidad-2.1.x/trinidad-impl/pom.xml Fri Apr 21 11:38:21 2017
@@ -127,8 +127,8 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
       <scope>test</scope>
     </dependency>
 

Modified: myfaces/trinidad/branches/trinidad-2.1.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.1.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java?rev=1792185&r1=1792184&r2=1792185&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.1.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
(original)
+++ myfaces/trinidad/branches/trinidad-2.1.x/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
Fri Apr 21 11:38:21 2017
@@ -48,7 +48,7 @@ import javax.faces.context.ResponseWrite
 
 import javax.faces.event.PhaseId;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.apache.myfaces.trinidad.context.Agent;
 import org.apache.myfaces.trinidad.context.RequestContext;



Mime
View raw message