Upgrade compilation source/target to JDK 8.

eclipse · Apr 26, 2016 · 9aff1a8 · 9aff1a8
1 parent b08d7d0
commit 9aff1a8
Show file tree

Hide file tree

Showing 62 changed files with 94 additions and 231 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.travis.yml b/.travis.yml
@@ -33,15 +33,6 @@ matrix:
         - DESC="compile jmh-tests and performance-tests"
         - CMD="mvn install --projects jmh-tests,performance-tests --also-make --activate-profiles all -DskipTests=true --batch-mode --show-version --errors"
 
-    - jdk: oraclejdk8
-      env:
-        - DESC="compile with Java 7"
-        - CMD1="mvn install --projects eclipse-collections-code-generator,eclipse-collections-code-generator-maven-plugin -Dmaven.compiler.verbose=true --batch-mode --show-version --errors;"
-        - CMD2="jdk_switcher use oraclejdk7;"
-        - CMD3="mvn install --projects eclipse-collections,eclipse-collections-api,eclipse-collections-testutils,eclipse-collections-forkjoin,serialization-tests -Denforcer.skip=true -Dmaven.compiler.verbose=true --batch-mode --show-version --errors;"
-        - CMD4="jdk_switcher use oraclejdk8;"
-        - CMD5="mvn install --projects unit-tests,junit-trait-runner,unit-tests-java8 -Dmaven.compiler.verbose=true --batch-mode --show-version --errors"
-        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5
 script: eval $CMD
 
 cache:

diff --git a/acceptance-tests/acceptance-tests.iml b/acceptance-tests/acceptance-tests.iml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="eclipse-collections-api" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
@@ -20,4 +19,4 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.14" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-nop:1.7.14" level="project" />
   </component>
-</module>
+</module>
diff --git a/acceptance-tests/build.xml b/acceptance-tests/build.xml
@@ -13,8 +13,6 @@
 <project name="acceptance-tests" default="test" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
     <property name="src.dir" location="src/main/java" />
     <property name="testsrc.dir" location="src/test/java" />
-    <property name="source.level" value="1.5" />
-    <property name="target.level" value="1.5" />
 
     <import file="../common-build.xml" />
 

diff --git a/acceptance-tests/pom.xml b/acceptance-tests/pom.xml
@@ -26,9 +26,6 @@
     <name>Eclipse Collections Acceptance Test Suite</name>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 

diff --git a/common-build.xml b/common-build.xml
@@ -115,8 +115,8 @@
         <javac
             destdir="target/classes"
             fork="true"
-            source="${source.level}"
-            target="${target.level}"
+            source="1.8"
+            target="1.8"
             debug="on">
             <src>
                 <pathelement location="${src.dir}" />
@@ -163,8 +163,8 @@
         <javac
             destdir="target/test-classes"
             fork="false"
-            source="1.5"
-            target="1.5"
+            source="1.8"
+            target="1.8"
             debug="on"
             updatedproperty="compile-tests.success">
             <src>
@@ -260,7 +260,7 @@
             <classpath refid="runtime.classpath" />
 
             <doctitle>${javadoc.title} - ${build.version.full}</doctitle>
-            <link href="http://java.sun.com/j2se/1.5.0/docs/api/" />
+            <link href="https://docs.oracle.com/javase/8/docs/api/" />
         </javadoc>
     </target>
 

diff --git a/eclipse-collections-api/.classpath b/eclipse-collections-api/.classpath
@@ -7,7 +7,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="target/generated-sources/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/eclipse-collections-api/.settings/org.eclipse.jdt.core.prefs b/eclipse-collections-api/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/eclipse-collections-api/build.xml b/eclipse-collections-api/build.xml
@@ -17,8 +17,6 @@
     <property name="testsrc.dir" location="src/test/java" />
     <property name="ivy.pom.name" value="Eclipse Collections API" />
     <property name="javadoc.title" value="Eclipse Collections API" />
-    <property name="source.level" value="1.5" />
-    <property name="target.level" value="1.5" />
 
     <import file="../common-build.xml" />
 

diff --git a/eclipse-collections-api/eclipse-collections-api.iml b/eclipse-collections-api/eclipse-collections-api.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -14,4 +14,4 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
   </component>
-</module>
+</module>
diff --git a/eclipse-collections-api/pom.xml b/eclipse-collections-api/pom.xml
@@ -28,11 +28,6 @@
 
     <name>Eclipse Collections API</name>
 
-    <properties>
-        <maven.compiler.source>1.5</maven.compiler.source>
-        <maven.compiler.target>1.5</maven.compiler.target>
-    </properties>
-
     <dependencies>
 
         <!-- External dependencies -->
@@ -79,7 +74,7 @@
                 <configuration>
                     <instructions>
                         <Export-Package>org.eclipse.collections.api</Export-Package>
-                        <Bundle-RequiredExecutionEnvironment>J2SE-1.5,JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
                         <Import-Package>
                             net.jcip.annotations;resolution:=optional,*
                         </Import-Package>
@@ -109,7 +104,7 @@
                     <windowtitle>Eclipse Collections API - ${project.version}</windowtitle>
                     <show>public</show>
                     <links>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+                        <link>https://docs.oracle.com/javase/8/docs/api/</link>
                     </links>
                     <destDir>${project.version}</destDir>
                     <additionalparam>-Xdoclint:none</additionalparam>

diff --git a/eclipse-collections-code-generator-ant/.classpath b/eclipse-collections-code-generator-ant/.classpath
@@ -12,7 +12,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/eclipse-collections-code-generator-ant/.settings/org.eclipse.jdt.core.prefs b/eclipse-collections-code-generator-ant/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/eclipse-collections-code-generator-ant/build.xml b/eclipse-collections-code-generator-ant/build.xml
@@ -11,8 +11,6 @@
 <project name="eclipse-collections-code-generator-ant">
     <property name="src.dir" location="src/main/java" />
     <property name="testsrc.dir" location="src/test/java" />
-    <property name="source.level" value="1.5" />
-    <property name="target.level" value="1.5" />
 
     <import file="../common-build.xml" />
 

diff --git a/eclipse-collections-code-generator-ant/eclipse-collections-code-generator-ant.iml b/eclipse-collections-code-generator-ant/eclipse-collections-code-generator-ant.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -15,4 +15,4 @@
     <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.6" level="project" />
   </component>
-</module>
+</module>
diff --git a/eclipse-collections-code-generator-ant/pom.xml b/eclipse-collections-code-generator-ant/pom.xml
@@ -26,12 +26,6 @@
     <name>Eclipse Collections Code Generator Ant Task</name>
 
     <properties>
-        <maven.compiler.source>1.5</maven.compiler.source>
-        <maven.compiler.target>1.5</maven.compiler.target>
-
-        <maven.compiler.source>1.5</maven.compiler.source>
-        <maven.compiler.target>1.5</maven.compiler.target>
-
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
@@ -83,7 +77,7 @@
                     <windowtitle>Eclipse Collections - ${project.version}</windowtitle>
                     <show>public</show>
                     <links>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+                        <link>https://docs.oracle.com/javase/8/docs/api/</link>
                     </links>
                     <destDir>${project.version}</destDir>
                     <additionalparam>-Xdoclint:none</additionalparam>

diff --git a/eclipse-collections-code-generator-maven-plugin/.classpath b/eclipse-collections-code-generator-maven-plugin/.classpath
@@ -12,7 +12,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/eclipse-collections-code-generator-maven-plugin/.settings/org.eclipse.jdt.core.prefs b/eclipse-collections-code-generator-maven-plugin/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/...llections-code-generator-maven-plugin/eclipse-collections-code-generator-maven-plugin.iml b/...llections-code-generator-maven-plugin/eclipse-collections-code-generator-maven-plugin.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -26,4 +26,4 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: classworlds:classworlds:1.1-alpha-2" level="project" />
   </component>
-</module>
+</module>
diff --git a/eclipse-collections-code-generator-maven-plugin/pom.xml b/eclipse-collections-code-generator-maven-plugin/pom.xml
@@ -27,12 +27,6 @@
     <name>Eclipse Collections Code Generator Maven Plugin</name>
 
     <properties>
-        <maven.compiler.source>1.5</maven.compiler.source>
-        <maven.compiler.target>1.5</maven.compiler.target>
-
-        <maven.compiler.source>1.5</maven.compiler.source>
-        <maven.compiler.target>1.5</maven.compiler.target>
-
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
@@ -91,7 +85,7 @@
                     <windowtitle>Eclipse Collections - ${project.version}</windowtitle>
                     <show>public</show>
                     <links>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+                        <link>https://docs.oracle.com/javase/8/docs/api/</link>
                     </links>
                     <destDir>${project.version}</destDir>
                     <additionalparam>-Xdoclint:none</additionalparam>

diff --git a/eclipse-collections-code-generator/.classpath b/eclipse-collections-code-generator/.classpath
@@ -17,7 +17,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/eclipse-collections-code-generator/.settings/org.eclipse.jdt.core.prefs b/eclipse-collections-code-generator/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/eclipse-collections-code-generator/eclipse-collections-code-generator.iml b/eclipse-collections-code-generator/eclipse-collections-code-generator.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -13,4 +13,4 @@
     <orderEntry type="library" name="Maven: org.antlr:ST4:4.0.8" level="project" />
     <orderEntry type="library" name="Maven: org.antlr:antlr-runtime:3.5.2" level="project" />
   </component>
-</module>
+</module>
diff --git a/eclipse-collections-code-generator/pom.xml b/eclipse-collections-code-generator/pom.xml
@@ -26,12 +26,6 @@
     <name>Eclipse Collections Code Generator</name>
 
     <properties>
-        <maven.compiler.source>1.5</maven.compiler.source>
-        <maven.compiler.target>1.5</maven.compiler.target>
-
-        <maven.compiler.source>1.5</maven.compiler.source>
-        <maven.compiler.target>1.5</maven.compiler.target>
-
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
@@ -82,7 +76,7 @@
                     <windowtitle>Eclipse Collections - ${project.version}</windowtitle>
                     <show>public</show>
                     <links>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+                        <link>https://docs.oracle.com/javase/8/docs/api/</link>
                     </links>
                     <destDir>${project.version}</destDir>
                     <additionalparam>-Xdoclint:none</additionalparam>

diff --git a/eclipse-collections-forkjoin/.classpath b/eclipse-collections-forkjoin/.classpath
@@ -17,7 +17,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/eclipse-collections-forkjoin/.settings/org.eclipse.jdt.core.prefs b/eclipse-collections-forkjoin/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8