APEXCORE-808 Change min supported java version dependency to Java 8

apache · Apr 22, 2018 · 2d4eb2e · 2d4eb2e
1 parent 44b9cef
commit 2d4eb2e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,8 @@
 language: java
 
 jdk:
-  - openjdk7
+  - openjdk8
+  - oraclejdk8
 
 script: mvn apache-rat:check verify -Dlicense.skip=false -Dtravis=true && mvn dependency-check:check -Ddependency.check.showSummary=false
 

diff --git a/apex-app-archetype/src/main/resources/archetype-resources/pom.xml b/apex-app-archetype/src/main/resources/archetype-resources/pom.xml
@@ -33,8 +33,8 @@
          <version>3.3</version>
          <configuration>
            <encoding>UTF-8</encoding>
-           <source>1.7</source>
-           <target>1.7</target>
+           <source>1.8</source>
+           <target>1.8</target>
            <debug>true</debug>
            <optimize>false</optimize>
            <showDeprecation>true</showDeprecation>

diff --git a/apex-conf-archetype/src/main/resources/archetype-resources/pom.xml b/apex-conf-archetype/src/main/resources/archetype-resources/pom.xml
@@ -43,8 +43,8 @@
         <version>3.3</version>
         <configuration>
           <encoding>UTF-8</encoding>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
           <debug>true</debug>
           <optimize>false</optimize>
           <showDeprecation>true</showDeprecation>

diff --git a/docs/apex_development_setup.md b/docs/apex_development_setup.md
@@ -11,15 +11,15 @@ There are a few tools that will be helpful when developing Apache Apex applicati
 
 1.  **git** - A revision control system (version 1.7.1 or later). There are multiple git clients available for Windows (<http://git-scm.com/download/win> for example), so download and install a client of your choice.
 
-2.  **java JDK** (not JRE) - Includes the Java Runtime Environment as well as the Java compiler and a variety of tools (version 1.7.0\_79 or later). Can be downloaded from the Oracle website.
+2.  **java JDK** (not JRE) - Includes the Java Runtime Environment as well as the Java compiler and a variety of tools (version 1.8.0 or later). Can be downloaded from the Oracle website.
 
 3.  **maven** - Apache Maven is a build system for Java projects (version 3.0.5 or later). It can be downloaded from <https://maven.apache.org/download.cgi>.
 
 4.  **IDE** (Optional) - If you prefer to use an IDE (Integrated Development Environment) such as *NetBeans*, *Eclipse* or *IntelliJ*, install that as well.
 
 After installing these tools, make sure that the directories containing the executable files are in your PATH environment variable.
 
-* **Windows** - Open a console window and enter the command `echo %PATH%` to see the value of the `PATH` variable and verify that the above directories for Java, git, and maven executables are present.  JDK executables like _java_ and _javac_, the directory might be something like `C:\Program Files\Java\jdk1.7.0\_80\bin`; for _git_ it might be `C:\Program Files\Git\bin`; and for maven it might be `C:\Users\user\Software\apache-maven-3.3.3\bin`.  If not, you can change its value clicking on the button at _Control Panel_ &#x21e8; _Advanced System Settings_ &#x21e8; _Advanced tab_ &#x21e8; _Environment Variables_.
+* **Windows** - Open a console window and enter the command `echo %PATH%` to see the value of the `PATH` variable and verify that the above directories for Java, git, and maven executables are present.  JDK executables like _java_ and _javac_, the directory might be something like `C:\Program Files\Java\jdk1.8.0_162\bin`; for _git_ it might be `C:\Program Files\Git\bin`; and for maven it might be `C:\Users\user\Software\apache-maven-3.3.3\bin`.  If not, you can change its value clicking on the button at _Control Panel_ &#x21e8; _Advanced System Settings_ &#x21e8; _Advanced tab_ &#x21e8; _Environment Variables_.
 * **Linux and Mac** - Open a console/terminal window and enter the command `echo $PATH` to see the value of the `PATH` variable and verify that the above directories for Java, git, and maven executables are present.  If not, make sure software is downloaded and installed, and optionally PATH reference is added and exported  in a `~/.profile` or `~/.bash_profile`.  For example to add maven located in `/sfw/maven/apache-maven-3.3.3` to PATH add the line: `export PATH=$PATH:/sfw/maven/apache-maven-3.3.3/bin`
 
 
@@ -37,13 +37,13 @@ Confirm by running the following commands and comparing with output that show in
 </tr>
 <tr class="even">
 <td align="left"><p><tt>javac -version</tt></p></td>
-<td align="left"><p>javac 1.7.0_80</p></td>
+<td align="left"><p>javac 1.8.0_162</p></td>
 </tr>
 <tr class="odd">
 <td align="left"><p><tt>java -version</tt></p></td>
-<td align="left"><p>java version &quot;1.7.0_80&quot;</p>
-<p>Java(TM) SE Runtime Environment (build 1.7.0_80-b15)</p>
-<p>Java HotSpot(TM) 64-Bit Server VM (build 24.80-b11, mixed mode)</p></td>
+<td align="left"><p>java version &quot;1.8.0_162&quot;</p>
+<p>Java(TM) SE Runtime Environment (build 1.8.0_162-b12)</p>
+<p>Java HotSpot(TM) 64-Bit Server VM (build 25.162-b12, mixed mode)</p></td>
 </tr>
 <tr class="even">
 <td align="left"><p><tt>git --version</tt></p></td>

diff --git a/engine/src/main/java/com/datatorrent/stram/StreamingContainerAgent.java b/engine/src/main/java/com/datatorrent/stram/StreamingContainerAgent.java
@@ -221,10 +221,7 @@ public List<OperatorDeployInfo> getDeployInfoList(Collection<PTOperator> operato
             if (input.target.getContainer() != out.source.getContainer()) {
               final StreamCodec<?> streamCodec = getIdentifyingInputPortMeta(input).getStreamCodec();
               final Integer id = physicalPlan.getStreamCodecIdentifier(streamCodec);
-              // TODO: replace with inputInfo.streamCodecs.putIfAbsent() after support for JDK 1.7 is dropped.
-              if (!portInfo.streamCodecs.containsKey(id)) {
-                portInfo.streamCodecs.put(id, streamCodec);
-              }
+              portInfo.streamCodecs.putIfAbsent(id, streamCodec);
             }
           }
         }

diff --git a/pom.xml b/pom.xml
@@ -190,8 +190,8 @@
         <version>3.3</version>
         <configuration>
           <encoding>UTF-8</encoding>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
           <debug>true</debug>
           <optimize>true</optimize>
           <showDeprecation>true</showDeprecation>
@@ -214,7 +214,7 @@
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java17</artifactId>
+            <artifactId>java18</artifactId>
             <version>1.0</version>
           </signature>
           <ignores>
@@ -351,8 +351,8 @@
               <configuration>
                 <rules>
                   <requireJavaVersion>
-                    <version>[1.7.0,)</version>
-                    <message>Build requires Java 1.7 or above.</message>
+                    <version>[1.8.0,)</version>
+                    <message>Build requires Java 1.8 or above.</message>
                   </requireJavaVersion>
                 </rules>
               </configuration>