Repository: hive Updated Branches: refs/heads/master 5607b384e -> c3aec1236
HIVE-16281: Upgrade master branch to JDK8 (Aihua Xu, reviewed by Thejas M Nair, Sergio Peña, Sean Busbey) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/c3aec123 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/c3aec123 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/c3aec123 Branch: refs/heads/master Commit: c3aec12363b2e81d164fd97363a3eef966f50cd0 Parents: 5607b38 Author: Aihua Xu <aihu...@apache.org> Authored: Wed Mar 22 15:11:01 2017 -0400 Committer: Aihua Xu <aihu...@apache.org> Committed: Fri Mar 24 14:20:43 2017 -0400 ---------------------------------------------------------------------- .travis.yml | 2 +- hcatalog/build.properties | 2 +- pom.xml | 12 +++++------- spark-client/pom.xml | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/c3aec123/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index d0e1568..d13b996 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ cache: env: MAVEN_SKIP_RC=true - MAVEN_OPTS="-Xmx2g -XX:MaxPermSize=512M" + MAVEN_OPTS="-Xmx2g" # workaround added: https://github.com/travis-ci/travis-ci/issues/4629 before_install: http://git-wip-us.apache.org/repos/asf/hive/blob/c3aec123/hcatalog/build.properties ---------------------------------------------------------------------- diff --git a/hcatalog/build.properties b/hcatalog/build.properties index dea1a44..3767cf3 100644 --- a/hcatalog/build.properties +++ b/hcatalog/build.properties @@ -49,7 +49,7 @@ clover.report.dir=${build.dir}/test/clover/reports clover.pdf.report.dir=${build.dir}/test/clover/pdf/reports # junit jvm args -junit.jvm.args=-XX:-UseSplitVerifier -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=128M +junit.jvm.args=-XX:-UseSplitVerifier -XX:+CMSClassUnloadingEnabled apache-rat.version=0.8 http://git-wip-us.apache.org/repos/asf/hive/blob/c3aec123/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index fc7aa44..4c73e27 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>14</version> + <version>18</version> </parent> <groupId>org.apache.hive</groupId> <artifactId>hive</artifactId> @@ -65,6 +65,8 @@ <!-- Build Properties --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.useIncrementalCompilation>false</maven.compiler.useIncrementalCompilation> <maven.repo.local>${settings.localRepository}</maven.repo.local> <hive.path.to.root>.</hive.path.to.root> @@ -90,11 +92,11 @@ <!-- Plugin and Plugin Dependency Versions --> <ant.contrib.version>1.0b3</ant.contrib.version> <datanucleus.maven.plugin.version>3.3.0-release</datanucleus.maven.plugin.version> - <maven.test.jvm.args>-Xmx1024m -XX:MaxPermSize=256M</maven.test.jvm.args> + <maven.test.jvm.args>-Xmx1024m</maven.test.jvm.args> <maven.antrun.plugin.version>1.7</maven.antrun.plugin.version> <maven.assembly.plugin.version>2.3</maven.assembly.plugin.version> <maven.checkstyle.plugin.version>2.12.1</maven.checkstyle.plugin.version> - <maven.compiler.plugin.version>3.1</maven.compiler.plugin.version> + <maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version> <maven.enforcer.plugin.version>1.3.1</maven.enforcer.plugin.version> <maven.install.plugin.version>2.4</maven.install.plugin.version> <maven.jar.plugin.version>2.4</maven.jar.plugin.version> @@ -803,10 +805,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>${maven.compiler.plugin.version}</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/hive/blob/c3aec123/spark-client/pom.xml ---------------------------------------------------------------------- diff --git a/spark-client/pom.xml b/spark-client/pom.xml index effc13b..6faa627 100644 --- a/spark-client/pom.xml +++ b/spark-client/pom.xml @@ -184,7 +184,7 @@ </systemPropertyVariables> <redirectTestOutputToFile>${test.redirectToFile}</redirectTestOutputToFile> <useFile>${test.redirectToFile}</useFile> - <argLine>-Xmx4096m -XX:MaxPermSize=512m</argLine> + <argLine>-Xmx4096m</argLine> </configuration> </plugin> </plugins>
