Repository: tajo Updated Branches: refs/heads/master caf8cca94 -> 45882b624
TAJO-1590: Moving to JDK 7. Closes #682 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/45882b62 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/45882b62 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/45882b62 Branch: refs/heads/master Commit: 45882b62435489bda580cff655525ba9c214468a Parents: caf8cca Author: Jinho Kim <[email protected]> Authored: Tue Aug 11 17:26:52 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Tue Aug 11 17:26:52 2015 +0900 ---------------------------------------------------------------------- BUILDING | 2 +- CHANGES | 2 ++ README | 2 +- pom.xml | 10 +++++----- tajo-algebra/pom.xml | 5 ----- tajo-catalog/tajo-catalog-client/pom.xml | 5 ----- tajo-catalog/tajo-catalog-common/pom.xml | 5 ----- tajo-catalog/tajo-catalog-drivers/tajo-hive/pom.xml | 5 ----- tajo-catalog/tajo-catalog-server/pom.xml | 5 ----- tajo-cli/pom.xml | 5 ----- tajo-client/pom.xml | 5 ----- tajo-common/pom.xml | 5 ----- tajo-core/pom.xml | 5 ----- tajo-docs/src/main/sphinx/getting_started.rst | 2 +- tajo-jdbc/pom.xml | 5 ----- tajo-metrics/pom.xml | 5 ----- tajo-plan/pom.xml | 5 ----- tajo-project/pom.xml | 15 ++++++++------- tajo-rpc/tajo-rpc-common/pom.xml | 5 ----- tajo-rpc/tajo-rpc-protobuf/pom.xml | 5 ----- tajo-rpc/tajo-ws-rs/pom.xml | 5 ----- tajo-storage/tajo-storage-common/pom.xml | 5 ----- tajo-storage/tajo-storage-hbase/pom.xml | 5 ----- tajo-storage/tajo-storage-hdfs/pom.xml | 5 ----- tajo-thirdparty/asm/pom.xml | 5 ----- 25 files changed, 18 insertions(+), 110 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/BUILDING ---------------------------------------------------------------------- diff --git a/BUILDING b/BUILDING index 118206f..4c5f23a 100644 --- a/BUILDING +++ b/BUILDING @@ -4,7 +4,7 @@ Build instructions for Tajo Requirements: * Unix System -* JDK 1.6 or higher +* JDK 1.7 or higher * Maven 3.0 or higher * Protocol Buffers 2.5.0 * Internet connection for first build (to fetch all Maven and Tajo dependencies) http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 18de625..6c95f4b 100644 --- a/CHANGES +++ b/CHANGES @@ -402,6 +402,8 @@ Release 0.11.0 - unreleased TASKS + TAJO-1590: Moving to JDK 7. (jinho) + TAJO-1300: Merge the index branch into the master branch. (jihoon) TAJO-1713: Change the type of edge cache in JoinGraphContext from http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/README ---------------------------------------------------------------------- diff --git a/README b/README index d904eaf..07f8f24 100644 --- a/README +++ b/README @@ -31,7 +31,7 @@ Documents Requirements ============ -* Java 1.6 or higher +* Java 1.7 or higher * Hadoop 2.3.0 or higher Mailing lists http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e4c8331..296830a 100644 --- a/pom.xml +++ b/pom.xml @@ -115,24 +115,24 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> + <version>3.3</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> <encoding>${project.build.sourceEncoding}</encoding> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.3.1</version> + <version>1.4</version> <configuration> <rules> <requireMavenVersion> <version>[3.0.2,)</version> </requireMavenVersion> <requireJavaVersion> - <version>1.6</version> + <version>1.7</version> </requireJavaVersion> </rules> </configuration> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-algebra/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-algebra/pom.xml b/tajo-algebra/pom.xml index 5b19e1a..59756cf 100644 --- a/tajo-algebra/pom.xml +++ b/tajo-algebra/pom.xml @@ -38,11 +38,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-catalog/tajo-catalog-client/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-client/pom.xml b/tajo-catalog/tajo-catalog-client/pom.xml index 84e2aa3..e661678 100644 --- a/tajo-catalog/tajo-catalog-client/pom.xml +++ b/tajo-catalog/tajo-catalog-client/pom.xml @@ -38,11 +38,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-catalog/tajo-catalog-common/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/pom.xml b/tajo-catalog/tajo-catalog-common/pom.xml index 9164996..adf470d 100644 --- a/tajo-catalog/tajo-catalog-common/pom.xml +++ b/tajo-catalog/tajo-catalog-common/pom.xml @@ -38,11 +38,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-catalog/tajo-catalog-drivers/tajo-hive/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hive/pom.xml b/tajo-catalog/tajo-catalog-drivers/tajo-hive/pom.xml index 16cb170..6b3806a 100644 --- a/tajo-catalog/tajo-catalog-drivers/tajo-hive/pom.xml +++ b/tajo-catalog/tajo-catalog-drivers/tajo-hive/pom.xml @@ -42,11 +42,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-catalog/tajo-catalog-server/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/pom.xml b/tajo-catalog/tajo-catalog-server/pom.xml index 8efeecf..88ba5fb 100644 --- a/tajo-catalog/tajo-catalog-server/pom.xml +++ b/tajo-catalog/tajo-catalog-server/pom.xml @@ -38,11 +38,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-cli/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-cli/pom.xml b/tajo-cli/pom.xml index e8360ad..c72ea9b 100644 --- a/tajo-cli/pom.xml +++ b/tajo-cli/pom.xml @@ -51,11 +51,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-client/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-client/pom.xml b/tajo-client/pom.xml index 1044d28..4d63ae7 100644 --- a/tajo-client/pom.xml +++ b/tajo-client/pom.xml @@ -50,11 +50,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.7</source> - <target>1.7</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-common/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-common/pom.xml b/tajo-common/pom.xml index 6806265..1e17198 100644 --- a/tajo-common/pom.xml +++ b/tajo-common/pom.xml @@ -91,11 +91,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-core/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-core/pom.xml b/tajo-core/pom.xml index 60e02a6..da89551 100644 --- a/tajo-core/pom.xml +++ b/tajo-core/pom.xml @@ -53,11 +53,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.7</source> - <target>1.7</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-docs/src/main/sphinx/getting_started.rst ---------------------------------------------------------------------- diff --git a/tajo-docs/src/main/sphinx/getting_started.rst b/tajo-docs/src/main/sphinx/getting_started.rst index ecb013e..a328261 100644 --- a/tajo-docs/src/main/sphinx/getting_started.rst +++ b/tajo-docs/src/main/sphinx/getting_started.rst @@ -9,7 +9,7 @@ Prerequisites ====================== * Hadoop 2.3.0 or higher (up to 2.6.0) - * Java 1.6 or 1.7 + * Java 1.7 or higher * Protocol buffer 2.5.0 =================================== http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-jdbc/pom.xml b/tajo-jdbc/pom.xml index de4520a..3af8b23 100644 --- a/tajo-jdbc/pom.xml +++ b/tajo-jdbc/pom.xml @@ -49,11 +49,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-metrics/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-metrics/pom.xml b/tajo-metrics/pom.xml index 123138e..73beb27 100644 --- a/tajo-metrics/pom.xml +++ b/tajo-metrics/pom.xml @@ -39,11 +39,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-plan/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-plan/pom.xml b/tajo-plan/pom.xml index ee68a00..95fd56d 100644 --- a/tajo-plan/pom.xml +++ b/tajo-plan/pom.xml @@ -39,11 +39,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-project/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-project/pom.xml b/tajo-project/pom.xml index 63dc9e3..e9256ae 100644 --- a/tajo-project/pom.xml +++ b/tajo-project/pom.xml @@ -383,24 +383,24 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> + <version>3.3</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> <encoding>${project.build.sourceEncoding}</encoding> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.3</version> + <version>1.4</version> <configuration> <rules> <requireMavenVersion> <version>[3.0.2,)</version> </requireMavenVersion> <requireJavaVersion> - <version>1.6</version> + <version>1.7</version> </requireJavaVersion> </rules> </configuration> @@ -609,9 +609,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <version>3.3</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> <encoding>${project.build.sourceEncoding}</encoding> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-rpc/tajo-rpc-common/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-rpc/tajo-rpc-common/pom.xml b/tajo-rpc/tajo-rpc-common/pom.xml index 2b1cd7a..b8301de 100644 --- a/tajo-rpc/tajo-rpc-common/pom.xml +++ b/tajo-rpc/tajo-rpc-common/pom.xml @@ -34,11 +34,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-rpc/tajo-rpc-protobuf/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-rpc/tajo-rpc-protobuf/pom.xml b/tajo-rpc/tajo-rpc-protobuf/pom.xml index 1f67255..a14f506 100644 --- a/tajo-rpc/tajo-rpc-protobuf/pom.xml +++ b/tajo-rpc/tajo-rpc-protobuf/pom.xml @@ -34,11 +34,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-rpc/tajo-ws-rs/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-rpc/tajo-ws-rs/pom.xml b/tajo-rpc/tajo-ws-rs/pom.xml index 271d29a..5ef957b 100644 --- a/tajo-rpc/tajo-ws-rs/pom.xml +++ b/tajo-rpc/tajo-ws-rs/pom.xml @@ -34,11 +34,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-storage/tajo-storage-common/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-common/pom.xml b/tajo-storage/tajo-storage-common/pom.xml index f1d3438..90e9862 100644 --- a/tajo-storage/tajo-storage-common/pom.xml +++ b/tajo-storage/tajo-storage-common/pom.xml @@ -49,11 +49,6 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-storage/tajo-storage-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hbase/pom.xml b/tajo-storage/tajo-storage-hbase/pom.xml index 5a1dc9a..cef830e 100644 --- a/tajo-storage/tajo-storage-hbase/pom.xml +++ b/tajo-storage/tajo-storage-hbase/pom.xml @@ -52,11 +52,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-storage/tajo-storage-hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/pom.xml b/tajo-storage/tajo-storage-hdfs/pom.xml index 1784ab3..9edd57f 100644 --- a/tajo-storage/tajo-storage-hdfs/pom.xml +++ b/tajo-storage/tajo-storage-hdfs/pom.xml @@ -52,11 +52,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/45882b62/tajo-thirdparty/asm/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-thirdparty/asm/pom.xml b/tajo-thirdparty/asm/pom.xml index c781a52..1febe44 100644 --- a/tajo-thirdparty/asm/pom.xml +++ b/tajo-thirdparty/asm/pom.xml @@ -46,11 +46,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId>
