diff options
| author | Beluga Behr <dam6923@gmail.com> | 2018-12-30 22:10:00 -0500 |
|---|---|---|
| committer | James E. King III <jking@apache.org> | 2019-01-02 19:20:56 -0500 |
| commit | 99f673a767104a037e24eb10e1f3341e0ab428f4 (patch) | |
| tree | dd395cec4e473649d388b3817755204bd80c75a3 /contrib | |
| parent | a3a7c6c7890b742379db5691f000fb242469af0e (diff) | |
| download | thrift-99f673a767104a037e24eb10e1f3341e0ab428f4.tar.gz | |
THRIFT-4694: Upgrade Java to Java 1.8
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Vagrantfile | 6 | ||||
| -rw-r--r-- | contrib/thrift-maven-plugin/pom.xml | 4 | ||||
| -rw-r--r-- | contrib/vagrant/centos-6.5/Vagrantfile | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/contrib/Vagrantfile b/contrib/Vagrantfile index 3bcc46a96..ff53316bb 100644 --- a/contrib/Vagrantfile +++ b/contrib/Vagrantfile @@ -43,7 +43,7 @@ sudo apt-get install -qq automake libtool flex bison pkg-config g++ libssl-dev m sudo apt-get install -qq libboost-dev libboost-test-dev libboost-program-options-dev libboost-filesystem-dev libboost-system-dev libevent-dev # Java dependencies -sudo apt-get install -qq ant openjdk-7-jdk maven +sudo apt-get install -qq ant openjdk-8-jdk maven # Python dependencies sudo apt-get install -qq python-all python-all-dev python-all-dbg python-setuptools python-support python-six python3-six @@ -89,8 +89,8 @@ sudo apt-get install -qq xdg-utils dmd-bin # Customize the system # --- -# Default java to latest 1.7 version -update-java-alternatives -s java-1.7.0-openjdk-amd64 +# Default java to latest 1.8 version +update-java-alternatives -s java-1.8.0-openjdk-amd64 # PHPUnit package broken in ubuntu. see https://bugs.launchpad.net/ubuntu/+source/phpunit/+bug/701544 sudo apt-get upgrade pear diff --git a/contrib/thrift-maven-plugin/pom.xml b/contrib/thrift-maven-plugin/pom.xml index d364cfc1f..1d66bc619 100644 --- a/contrib/thrift-maven-plugin/pom.xml +++ b/contrib/thrift-maven-plugin/pom.xml @@ -34,8 +34,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> <plugin> diff --git a/contrib/vagrant/centos-6.5/Vagrantfile b/contrib/vagrant/centos-6.5/Vagrantfile index 6207958b3..51a2239bc 100644 --- a/contrib/vagrant/centos-6.5/Vagrantfile +++ b/contrib/vagrant/centos-6.5/Vagrantfile @@ -87,7 +87,7 @@ sudo ./b2 install # Java LIB Dependencies ##################################### -sudo yum install -y ant junit ant-nodeps ant-junit java-1.7.0-openjdk-devel +sudo yum install -y ant junit ant-nodeps ant-junit java-1.8.0-openjdk-devel # Python LIB Dependencies ##################################### |