AVRO-2043: Move to java8

This closes apache#232
Zetatango · Jul 21, 2017 · f72b620 · f72b620
1 parent 21b3698
commit f72b620
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 15 deletions.
diff --git a/BUILD.txt b/BUILD.txt
@@ -4,7 +4,7 @@ REQUIREMENTS
 
 The following packages must be installed before Avro can be built:
 
- - Java: JDK 1.6, Maven 2 or better, protobuf-compile
+ - Java: JDK 1.8, Maven 2 or better, protobuf-compile
  - PHP: php5, phpunit, php5-gmp
  - Python: 2.5 or greater, python-setuptools for dist target
  - C: gcc, cmake, asciidoc, source-highlight

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -6,6 +6,8 @@ Trunk (not yet released)
 
     AVRO-2035: Java: validate default values when parsing schemas. (cutting)
 
+    AVRO-2043: Move to java8
+
   NEW FEATURES
 
     AVRO-1704: Java: Add support for single-message encoding. (blue)

diff --git a/doc/examples/java-example/pom.xml b/doc/examples/java-example/pom.xml
@@ -61,8 +61,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
     </plugins>

diff --git a/doc/examples/mr-example/pom.xml b/doc/examples/mr-example/pom.xml
@@ -33,8 +33,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <plugin>

diff --git a/doc/src/content/xdocs/gettingstartedjava.xml b/doc/src/content/xdocs/gettingstartedjava.xml
@@ -85,8 +85,8 @@
   &#60;groupId&#62;org.apache.maven.plugins&#60;/groupId&#62;
   &#60;artifactId&#62;maven-compiler-plugin&#60;/artifactId&#62;
   &#60;configuration&#62;
-    &#60;source&#62;1.6&#60;/source&#62;
-    &#60;target&#62;1.6&#60;/target&#62;
+    &#60;source&#62;1.8&#60;/source&#62;
+    &#60;target&#62;1.8&#60;/target&#62;
   &#60;/configuration&#62;
 &#60;/plugin&#62;
       </source>

diff --git a/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml b/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml
@@ -130,8 +130,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${compiler-plugin.version}</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
     </plugins>

diff --git a/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj b/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj
@@ -53,7 +53,7 @@ options {
   ERROR_REPORTING = true;
   STATIC = false;
   FORCE_LA_CHECK = true;
-  JDK_VERSION = "1.6";
+  JDK_VERSION = "1.8";
 }
 
 PARSER_BEGIN(Idl)

diff --git a/lang/java/pom.xml b/lang/java/pom.xml
@@ -165,8 +165,8 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>${compiler-plugin.version}</version>
           <configuration>
-            <source>1.6</source>
-            <target>1.6</target>
+            <source>1.8</source>
+            <target>1.8</target>
           </configuration>
         </plugin>
         <plugin>

diff --git a/lang/java/trevni/pom.xml b/lang/java/trevni/pom.xml
@@ -56,8 +56,8 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>${compiler-plugin.version}</version>
           <configuration>
-            <source>1.6</source>
-            <target>1.6</target>
+            <source>1.8</source>
+            <target>1.8</target>
           </configuration>
         </plugin>
         <plugin>

diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile
@@ -17,7 +17,7 @@
 # Dockerfile for installing the necessary dependencies for building Avro.
 # See BUILD.txt.
 
-FROM java:7-jdk
+FROM java:8-jdk
 
 WORKDIR /root