Google Git
Sign in
apache/oltu/trunk^!/.
commit
a847c13a29e545524420bde68e186a8a1b913acf
[log]
author
Jasha Joachimsthal <jasha@apache.org>
Tue Oct 31 16:43:05 2017 +0000
committer
Jasha Joachimsthal <jasha@apache.org>
Tue Oct 31 16:43:05 2017 +0000
tree
3590194ae7b2da10d1b073aa951196a77a63fed7
parent
778c47e2ba3bdd34f06d76e14c9f50d930a941e7 [diff]
OLTU-215 Upgrade to Java 8

git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1813903 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/commons/pom.xml b/commons/pom.xml
index 1c53450..4c4437d 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml

@@ -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>
 

diff --git a/demos/client-demo/pom.xml b/demos/client-demo/pom.xml
index bc35d23..9b0d0f3 100644
--- a/demos/client-demo/pom.xml
+++ b/demos/client-demo/pom.xml

@@ -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>

diff --git a/demos/pom.xml b/demos/pom.xml
index e6e031c..2a6590f 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml

@@ -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>
 

diff --git a/jose/pom.xml b/jose/pom.xml
index ee05ce7..9589357 100644
--- a/jose/pom.xml
+++ b/jose/pom.xml

@@ -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>
 

diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml
index 06639bb..71be11c 100644
--- a/oauth-2.0/pom.xml
+++ b/oauth-2.0/pom.xml

@@ -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>
 

diff --git a/openid-connect/pom.xml b/openid-connect/pom.xml
index 2f44820..15a3c99 100644
--- a/openid-connect/pom.xml
+++ b/openid-connect/pom.xml

@@ -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>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index f86b58f..f3f8f22 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml

@@ -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>

diff --git a/site/pom.xml b/site/pom.xml
index 777aca3..cd78811 100644
--- a/site/pom.xml
+++ b/site/pom.xml

@@ -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>