Repository: avro Updated Branches: refs/heads/master 21b369895 -> f72b620b9
AVRO-2043: Move to java8 This closes #232 Project: http://git-wip-us.apache.org/repos/asf/avro/repo Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/f72b620b Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/f72b620b Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/f72b620b Branch: refs/heads/master Commit: f72b620b9d700cf5f2febb0022079b69b9c9577e Parents: 21b3698 Author: Gabor Szadovszky <[email protected]> Authored: Fri Jun 16 11:01:09 2017 +0200 Committer: Gabor Szadovszky <[email protected]> Committed: Fri Jul 21 10:42:49 2017 +0200 ---------------------------------------------------------------------- BUILD.txt | 2 +- CHANGES.txt | 2 ++ doc/examples/java-example/pom.xml | 4 ++-- doc/examples/mr-example/pom.xml | 4 ++-- doc/src/content/xdocs/gettingstartedjava.xml | 4 ++-- lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml | 4 ++-- .../compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj | 2 +- lang/java/pom.xml | 4 ++-- lang/java/trevni/pom.xml | 4 ++-- share/docker/Dockerfile | 2 +- 10 files changed, 17 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/avro/blob/f72b620b/BUILD.txt ---------------------------------------------------------------------- diff --git a/BUILD.txt b/BUILD.txt index 7c3eea7..223bc4d 100644 --- 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 http://git-wip-us.apache.org/repos/asf/avro/blob/f72b620b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 2d59d39..f1ff089 100644 --- 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) http://git-wip-us.apache.org/repos/asf/avro/blob/f72b620b/doc/examples/java-example/pom.xml ---------------------------------------------------------------------- diff --git a/doc/examples/java-example/pom.xml b/doc/examples/java-example/pom.xml index decc235..5fe2df8 100644 --- 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> http://git-wip-us.apache.org/repos/asf/avro/blob/f72b620b/doc/examples/mr-example/pom.xml ---------------------------------------------------------------------- diff --git a/doc/examples/mr-example/pom.xml b/doc/examples/mr-example/pom.xml index df52314..6f5b60a 100644 --- 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> http://git-wip-us.apache.org/repos/asf/avro/blob/f72b620b/doc/src/content/xdocs/gettingstartedjava.xml ---------------------------------------------------------------------- diff --git a/doc/src/content/xdocs/gettingstartedjava.xml b/doc/src/content/xdocs/gettingstartedjava.xml index 6474ebc..fe6c7d2 100644 --- a/doc/src/content/xdocs/gettingstartedjava.xml +++ b/doc/src/content/xdocs/gettingstartedjava.xml @@ -85,8 +85,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> </source> http://git-wip-us.apache.org/repos/asf/avro/blob/f72b620b/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml ---------------------------------------------------------------------- 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 index 4e6ca35..4db3b95 100644 --- 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> http://git-wip-us.apache.org/repos/asf/avro/blob/f72b620b/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj ---------------------------------------------------------------------- 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 index 7d05db8..4213210 100644 --- 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) http://git-wip-us.apache.org/repos/asf/avro/blob/f72b620b/lang/java/pom.xml ---------------------------------------------------------------------- diff --git a/lang/java/pom.xml b/lang/java/pom.xml index 70c8693..74e71a4 100644 --- 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> http://git-wip-us.apache.org/repos/asf/avro/blob/f72b620b/lang/java/trevni/pom.xml ---------------------------------------------------------------------- diff --git a/lang/java/trevni/pom.xml b/lang/java/trevni/pom.xml index 13e6498..ffca08a 100644 --- 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> http://git-wip-us.apache.org/repos/asf/avro/blob/f72b620b/share/docker/Dockerfile ---------------------------------------------------------------------- diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile index 0176055..f974167 100644 --- 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
