You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oltu.apache.org by ja...@apache.org on 2017/10/31 16:43:05 UTC

svn commit: r1813903 - in /oltu/trunk: commons/pom.xml demos/client-demo/pom.xml demos/pom.xml jose/pom.xml oauth-2.0/pom.xml openid-connect/pom.xml parent/pom.xml site/pom.xml

Author: jasha
Date: Tue Oct 31 16:43:05 2017
New Revision: 1813903

URL: http://svn.apache.org/viewvc?rev=1813903&view=rev
Log:
OLTU-215 Upgrade to Java 8

Modified:
    oltu/trunk/commons/pom.xml
    oltu/trunk/demos/client-demo/pom.xml
    oltu/trunk/demos/pom.xml
    oltu/trunk/jose/pom.xml
    oltu/trunk/oauth-2.0/pom.xml
    oltu/trunk/openid-connect/pom.xml
    oltu/trunk/parent/pom.xml
    oltu/trunk/site/pom.xml

Modified: oltu/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/commons/pom.xml?rev=1813903&r1=1813902&r2=1813903&view=diff
==============================================================================
--- oltu/trunk/commons/pom.xml (original)
+++ oltu/trunk/commons/pom.xml Tue Oct 31 16:43:05 2017
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.oltu</groupId>
     <artifactId>org.apache.oltu.parent</artifactId>
-    <version>4</version>
+    <version>5-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 

Modified: oltu/trunk/demos/client-demo/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/demos/client-demo/pom.xml?rev=1813903&r1=1813902&r2=1813903&view=diff
==============================================================================
--- oltu/trunk/demos/client-demo/pom.xml (original)
+++ oltu/trunk/demos/client-demo/pom.xml Tue Oct 31 16:43:05 2017
@@ -33,9 +33,9 @@
     <oltu.oauth2.version>1.0.3-SNAPSHOT</oltu.oauth2.version>
     <oltu.oauth2.jwt.version>1.0.4-SNAPSHOT</oltu.oauth2.jwt.version>
     <oltu.oidc.version>0.0.1-SNAPSHOT</oltu.oidc.version>
-    <org.springframework.version>3.2.4.RELEASE</org.springframework.version>
+    <org.springframework.version>3.2.18.RELEASE</org.springframework.version>
     <servlet-api.version>2.5</servlet-api.version>
-    <slf4j.version>1.7.18</slf4j.version>
+    <slf4j.version>1.7.25</slf4j.version>
   </properties>
 
   <dependencies>

Modified: oltu/trunk/demos/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/demos/pom.xml?rev=1813903&r1=1813902&r2=1813903&view=diff
==============================================================================
--- oltu/trunk/demos/pom.xml (original)
+++ oltu/trunk/demos/pom.xml Tue Oct 31 16:43:05 2017
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.oltu</groupId>
     <artifactId>org.apache.oltu.parent</artifactId>
-    <version>4</version>
+    <version>5-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 

Modified: oltu/trunk/jose/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/jose/pom.xml?rev=1813903&r1=1813902&r2=1813903&view=diff
==============================================================================
--- oltu/trunk/jose/pom.xml (original)
+++ oltu/trunk/jose/pom.xml Tue Oct 31 16:43:05 2017
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.oltu</groupId>
     <artifactId>org.apache.oltu.parent</artifactId>
-    <version>4</version>
+    <version>5-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 

Modified: oltu/trunk/oauth-2.0/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/pom.xml?rev=1813903&r1=1813902&r2=1813903&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/pom.xml (original)
+++ oltu/trunk/oauth-2.0/pom.xml Tue Oct 31 16:43:05 2017
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.oltu</groupId>
     <artifactId>org.apache.oltu.parent</artifactId>
-    <version>4</version>
+    <version>5-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 

Modified: oltu/trunk/openid-connect/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/openid-connect/pom.xml?rev=1813903&r1=1813902&r2=1813903&view=diff
==============================================================================
--- oltu/trunk/openid-connect/pom.xml (original)
+++ oltu/trunk/openid-connect/pom.xml Tue Oct 31 16:43:05 2017
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.oltu</groupId>
     <artifactId>org.apache.oltu.parent</artifactId>
-    <version>4</version>
+    <version>5-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 

Modified: oltu/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/parent/pom.xml?rev=1813903&r1=1813902&r2=1813903&view=diff
==============================================================================
--- oltu/trunk/parent/pom.xml (original)
+++ oltu/trunk/parent/pom.xml Tue Oct 31 16:43:05 2017
@@ -354,8 +354,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <javac.src.version>1.6</javac.src.version>
-    <javac.target.version>1.6</javac.target.version>
+    <javac.src.version>1.8</javac.src.version>
+    <javac.target.version>1.8</javac.target.version>
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format>
     <implementation.build>${scmBranch}@r${buildNumber}</implementation.build>
     <!--
@@ -538,8 +538,8 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>[1.6,)</version>
-                  <message>[ERROR] The currently supported version of Java is 1.6 or higher</message>
+                  <version>[1.8,)</version>
+                  <message>[ERROR] The currently supported version of Java is 1.8 or higher</message>
                 </requireJavaVersion>
                 <requireMavenVersion>
                   <version>[2.2.0,)</version>
@@ -691,7 +691,7 @@
         <configuration>
           <linkXref>true</linkXref>
           <minimumTokens>100</minimumTokens>
-          <targetJdk>1.6</targetJdk>
+          <targetJdk>1.8</targetJdk>
         </configuration>
       </plugin>
     </plugins>
@@ -937,8 +937,9 @@
       </reporting>
     </profile>
     <profile>
-      <!-- repository.apache.org doesn't accept connections from jdk 1.6 (https://issues.apache.org/jira/browse/BUILDS-85)
-      so use toolchains to require jdk 1.6 for compiling but deploy using a newer jdk
+      <!--
+      Originally added to compile with Java 1.6 while using Java 1.8 to run Maven. Now to make sure the correct JDK
+      version is used.
       -->
       <id>toolchain</id>
       <build>
@@ -951,7 +952,7 @@
               <configuration>
                 <toolchains>
                   <jdk>
-                    <version>1.6</version>
+                    <version>1.8</version>
                     <vendor>oracle</vendor>
                   </jdk>
                 </toolchains>

Modified: oltu/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/site/pom.xml?rev=1813903&r1=1813902&r2=1813903&view=diff
==============================================================================
--- oltu/trunk/site/pom.xml (original)
+++ oltu/trunk/site/pom.xml Tue Oct 31 16:43:05 2017
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.oltu</groupId>
     <artifactId>org.apache.oltu.parent</artifactId>
-    <version>4</version>
+    <version>5-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 



Re: svn commit: r1813903 - in /oltu/trunk: commons/pom.xml demos/client-demo/pom.xml demos/pom.xml jose/pom.xml oauth-2.0/pom.xml openid-connect/pom.xml parent/pom.xml site/pom.xml

Posted by Simone Tripodi <si...@apache.org>.
sweet <3

thanks a lot for taking care of it!

http://people.apache.org/~simonetripodi/
http://twitter.com/simonetripodi

On Tue, Oct 31, 2017 at 5:43 PM, <ja...@apache.org> wrote:

> Author: jasha
> Date: Tue Oct 31 16:43:05 2017
> New Revision: 1813903
>
> URL: http://svn.apache.org/viewvc?rev=1813903&view=rev
> Log:
> OLTU-215 Upgrade to Java 8
>
> Modified:
>     oltu/trunk/commons/pom.xml
>     oltu/trunk/demos/client-demo/pom.xml
>     oltu/trunk/demos/pom.xml
>     oltu/trunk/jose/pom.xml
>     oltu/trunk/oauth-2.0/pom.xml
>     oltu/trunk/openid-connect/pom.xml
>     oltu/trunk/parent/pom.xml
>     oltu/trunk/site/pom.xml
>
> Modified: oltu/trunk/commons/pom.xml
> URL: http://svn.apache.org/viewvc/oltu/trunk/commons/pom.xml?
> rev=1813903&r1=1813902&r2=1813903&view=diff
> ============================================================
> ==================
> --- oltu/trunk/commons/pom.xml (original)
> +++ oltu/trunk/commons/pom.xml Tue Oct 31 16:43:05 2017
> @@ -21,7 +21,7 @@
>    <parent>
>      <groupId>org.apache.oltu</groupId>
>      <artifactId>org.apache.oltu.parent</artifactId>
> -    <version>4</version>
> +    <version>5-SNAPSHOT</version>
>      <relativePath>../parent</relativePath>
>    </parent>
>
>
> Modified: oltu/trunk/demos/client-demo/pom.xml
> URL: http://svn.apache.org/viewvc/oltu/trunk/demos/client-demo/
> pom.xml?rev=1813903&r1=1813902&r2=1813903&view=diff
> ============================================================
> ==================
> --- oltu/trunk/demos/client-demo/pom.xml (original)
> +++ oltu/trunk/demos/client-demo/pom.xml Tue Oct 31 16:43:05 2017
> @@ -33,9 +33,9 @@
>      <oltu.oauth2.version>1.0.3-SNAPSHOT</oltu.oauth2.version>
>      <oltu.oauth2.jwt.version>1.0.4-SNAPSHOT</oltu.oauth2.jwt.version>
>      <oltu.oidc.version>0.0.1-SNAPSHOT</oltu.oidc.version>
> -    <org.springframework.version>3.2.4.RELEASE</org.
> springframework.version>
> +    <org.springframework.version>3.2.18.RELEASE</org.
> springframework.version>
>      <servlet-api.version>2.5</servlet-api.version>
> -    <slf4j.version>1.7.18</slf4j.version>
> +    <slf4j.version>1.7.25</slf4j.version>
>    </properties>
>
>    <dependencies>
>
> Modified: oltu/trunk/demos/pom.xml
> URL: http://svn.apache.org/viewvc/oltu/trunk/demos/pom.xml?rev=
> 1813903&r1=1813902&r2=1813903&view=diff
> ============================================================
> ==================
> --- oltu/trunk/demos/pom.xml (original)
> +++ oltu/trunk/demos/pom.xml Tue Oct 31 16:43:05 2017
> @@ -21,7 +21,7 @@
>    <parent>
>      <groupId>org.apache.oltu</groupId>
>      <artifactId>org.apache.oltu.parent</artifactId>
> -    <version>4</version>
> +    <version>5-SNAPSHOT</version>
>      <relativePath>../parent</relativePath>
>    </parent>
>
>
> Modified: oltu/trunk/jose/pom.xml
> URL: http://svn.apache.org/viewvc/oltu/trunk/jose/pom.xml?rev=
> 1813903&r1=1813902&r2=1813903&view=diff
> ============================================================
> ==================
> --- oltu/trunk/jose/pom.xml (original)
> +++ oltu/trunk/jose/pom.xml Tue Oct 31 16:43:05 2017
> @@ -21,7 +21,7 @@
>    <parent>
>      <groupId>org.apache.oltu</groupId>
>      <artifactId>org.apache.oltu.parent</artifactId>
> -    <version>4</version>
> +    <version>5-SNAPSHOT</version>
>      <relativePath>../parent</relativePath>
>    </parent>
>
>
> Modified: oltu/trunk/oauth-2.0/pom.xml
> URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/pom.xml?
> rev=1813903&r1=1813902&r2=1813903&view=diff
> ============================================================
> ==================
> --- oltu/trunk/oauth-2.0/pom.xml (original)
> +++ oltu/trunk/oauth-2.0/pom.xml Tue Oct 31 16:43:05 2017
> @@ -21,7 +21,7 @@
>    <parent>
>      <groupId>org.apache.oltu</groupId>
>      <artifactId>org.apache.oltu.parent</artifactId>
> -    <version>4</version>
> +    <version>5-SNAPSHOT</version>
>      <relativePath>../parent</relativePath>
>    </parent>
>
>
> Modified: oltu/trunk/openid-connect/pom.xml
> URL: http://svn.apache.org/viewvc/oltu/trunk/openid-connect/pom.
> xml?rev=1813903&r1=1813902&r2=1813903&view=diff
> ============================================================
> ==================
> --- oltu/trunk/openid-connect/pom.xml (original)
> +++ oltu/trunk/openid-connect/pom.xml Tue Oct 31 16:43:05 2017
> @@ -21,7 +21,7 @@
>    <parent>
>      <groupId>org.apache.oltu</groupId>
>      <artifactId>org.apache.oltu.parent</artifactId>
> -    <version>4</version>
> +    <version>5-SNAPSHOT</version>
>      <relativePath>../parent</relativePath>
>    </parent>
>
>
> Modified: oltu/trunk/parent/pom.xml
> URL: http://svn.apache.org/viewvc/oltu/trunk/parent/pom.xml?rev=
> 1813903&r1=1813902&r2=1813903&view=diff
> ============================================================
> ==================
> --- oltu/trunk/parent/pom.xml (original)
> +++ oltu/trunk/parent/pom.xml Tue Oct 31 16:43:05 2017
> @@ -354,8 +354,8 @@
>      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
>      <project.build.resourceEncoding>UTF-8</project.build.
> resourceEncoding>
>      <project.reporting.outputEncoding>UTF-8</project.
> reporting.outputEncoding>
> -    <javac.src.version>1.6</javac.src.version>
> -    <javac.target.version>1.6</javac.target.version>
> +    <javac.src.version>1.8</javac.src.version>
> +    <javac.target.version>1.8</javac.target.version>
>      <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.
> timestamp.format>
>      <implementation.build>${scmBranch}@r${buildNumber}</
> implementation.build>
>      <!--
> @@ -538,8 +538,8 @@
>              <configuration>
>                <rules>
>                  <requireJavaVersion>
> -                  <version>[1.6,)</version>
> -                  <message>[ERROR] The currently supported version of
> Java is 1.6 or higher</message>
> +                  <version>[1.8,)</version>
> +                  <message>[ERROR] The currently supported version of
> Java is 1.8 or higher</message>
>                  </requireJavaVersion>
>                  <requireMavenVersion>
>                    <version>[2.2.0,)</version>
> @@ -691,7 +691,7 @@
>          <configuration>
>            <linkXref>true</linkXref>
>            <minimumTokens>100</minimumTokens>
> -          <targetJdk>1.6</targetJdk>
> +          <targetJdk>1.8</targetJdk>
>          </configuration>
>        </plugin>
>      </plugins>
> @@ -937,8 +937,9 @@
>        </reporting>
>      </profile>
>      <profile>
> -      <!-- repository.apache.org doesn't accept connections from jdk 1.6
> (https://issues.apache.org/jira/browse/BUILDS-85)
> -      so use toolchains to require jdk 1.6 for compiling but deploy using
> a newer jdk
> +      <!--
> +      Originally added to compile with Java 1.6 while using Java 1.8 to
> run Maven. Now to make sure the correct JDK
> +      version is used.
>        -->
>        <id>toolchain</id>
>        <build>
> @@ -951,7 +952,7 @@
>                <configuration>
>                  <toolchains>
>                    <jdk>
> -                    <version>1.6</version>
> +                    <version>1.8</version>
>                      <vendor>oracle</vendor>
>                    </jdk>
>                  </toolchains>
>
> Modified: oltu/trunk/site/pom.xml
> URL: http://svn.apache.org/viewvc/oltu/trunk/site/pom.xml?rev=
> 1813903&r1=1813902&r2=1813903&view=diff
> ============================================================
> ==================
> --- oltu/trunk/site/pom.xml (original)
> +++ oltu/trunk/site/pom.xml Tue Oct 31 16:43:05 2017
> @@ -24,7 +24,7 @@
>    <parent>
>      <groupId>org.apache.oltu</groupId>
>      <artifactId>org.apache.oltu.parent</artifactId>
> -    <version>4</version>
> +    <version>5-SNAPSHOT</version>
>      <relativePath>../parent</relativePath>
>    </parent>
>
>
>
>