[apex-core] branch master updated: APEXCORE-808 Change min supported java version dependency to Java 8

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[apex-core] branch master updated: APEXCORE-808 Change min supported java version dependency to Java 8

pramod
This is an automated email from the ASF dual-hosted git repository.

pramod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apex-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 2d4eb2e  APEXCORE-808 Change min supported java version dependency to Java 8
2d4eb2e is described below

commit 2d4eb2e468f6ee015450dd4e03a5dae2a155f9c7
Author: Vlad Rozov <[hidden email]>
AuthorDate: Thu Apr 19 10:54:07 2018 -0700

    APEXCORE-808 Change min supported java version dependency to Java 8
---
 .travis.yml                                                  |  3 ++-
 .../src/main/resources/archetype-resources/pom.xml           |  4 ++--
 .../src/main/resources/archetype-resources/pom.xml           |  4 ++--
 docs/apex_development_setup.md                               | 12 ++++++------
 .../java/com/datatorrent/stram/StreamingContainerAgent.java  |  5 +----
 pom.xml                                                      | 10 +++++-----
 6 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 17d63e4..9d896d4 100644
--- 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
index 474dc01..91ede7d 100644
--- 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
index e488b6c..0af7b9e 100644
--- 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
index f520ba7..562b29b 100644
--- a/docs/apex_development_setup.md
+++ b/docs/apex_development_setup.md
@@ -11,7 +11,7 @@ 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>.
 
@@ -19,7 +19,7 @@ There are a few tools that will be helpful when developing Apache Apex applicati
 
 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  [...]
+* **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  [...]
 * **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/apach [...]
 
 
@@ -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
index 0aa0b83..1aca1d7 100644
--- 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 class StreamingContainerAgent
             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
index 5115c40..3968113 100644
--- 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>

--
To stop receiving notification emails like this one, please contact
[hidden email].