From commits-return-6912-archive-asf-public=cust-asf.ponee.io@groovy.apache.org Thu Jun 7 03:56:26 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id A0E57180671 for ; Thu, 7 Jun 2018 03:56:25 +0200 (CEST) Received: (qmail 2186 invoked by uid 500); 7 Jun 2018 01:56:24 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 2177 invoked by uid 99); 7 Jun 2018 01:56:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2018 01:56:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 74EE7E04BC; Thu, 7 Jun 2018 01:56:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sunlan@apache.org To: commits@groovy.apache.org Message-Id: <2bca0668306641d8bf4afb8bdfe5d7b7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: groovy git commit: Add openjdk10 build(closes #752) Date: Thu, 7 Jun 2018 01:56:24 +0000 (UTC) Repository: groovy Updated Branches: refs/heads/master 334b5df0a -> a680ff3b4 Add openjdk10 build(closes #752) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a680ff3b Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a680ff3b Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a680ff3b Branch: refs/heads/master Commit: a680ff3b48c9acb679e25964ec8b358efc69010d Parents: 334b5df Author: sunlan Authored: Thu Jun 7 09:56:17 2018 +0800 Committer: sunlan Committed: Thu Jun 7 09:56:17 2018 +0800 ---------------------------------------------------------------------- .travis.yml | 19 +------ src/install/install-jdk.sh | 107 ---------------------------------------- 2 files changed, 1 insertion(+), 125 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/a680ff3b/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index e7a17d5..b36837a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,26 +22,9 @@ dist: trusty matrix: include: -# Java 10 "Oracle JDK" -# - env: JDK_RELEASE='Oracle JDK 10' EXTRA_GRADLE_ARGS='' -# install: . ./src/install/install-jdk.sh -F 10 -L BCL -# Java 10 "OpenJDK" -# - env: JDK_RELEASE='OpenJDK 10' EXTRA_GRADLE_ARGS='' -# install: . ./src/install/install-jdk.sh -F 10 -L GPL -# Java 9 "Oracle JDK" (provided by Travis CI) + - jdk: openjdk10 - jdk: oraclejdk9 - env: JDK_RELEASE='Oracle JDK 9' EXTRA_GRADLE_ARGS='' - install: echo "Don't let Travis CI execute './gradlew assemble' by default" -# Java 9 "OpenJDK" -# - env: TRAVIS_JDK_VERSION='openjdk9' JDK_RELEASE='OpenJDK 9' EXTRA_GRADLE_ARGS='' -# install: . ./src/install/install-jdk.sh -F 9 -L GPL -# Java 8 "Oracle JDK" (provided by Travis CI) - jdk: oraclejdk8 - env: JDK_RELEASE='Oracle JDK 8' EXTRA_GRADLE_ARGS='' - install: echo "Don't let Travis CI execute './gradlew assemble' by default" -# Java 8 "OpenJDK" -# - env: JDK_RELEASE='OpenJDK 8' EXTRA_GRADLE_ARGS='' -# install: . ./src/install/install-jdk.sh -F 8 -L GPL before_script: - | http://git-wip-us.apache.org/repos/asf/groovy/blob/a680ff3b/src/install/install-jdk.sh ---------------------------------------------------------------------- diff --git a/src/install/install-jdk.sh b/src/install/install-jdk.sh deleted file mode 100644 index 47ba4c3..0000000 --- a/src/install/install-jdk.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/usr/bin/env bash - -# -# Install JDK for Linux -# -# This script determines the most recent early-access build number, -# downloads the JDK archive to the user home directory and extracts -# it there. -# -# Example usage -# -# install-jdk.sh | install most recent early-access JDK -# install-jdk.sh -W /usr/opt | install most recent early-access JDK to /usr/opt -# install-jdk.sh -F 9 | install most recent OpenJDK 9 -# install-jdk.sh -F 10 | install most recent OpenJDK 10 -# install-jdk.sh -F 10 -L BCL | install most recent OracleJDK 10 -# -# Options -# -# -F f | Feature number of the JDK release, [9|10|...] -# -B b | Build number of the JDK release [?|1|2...] -# -L l | License of the JDK [GPL|BCL] -# -W w | Working directory and install path [${HOME}] -# -# Exported environment variables -# -# JAVA_HOME is set to the extracted JDK directory -# PATH is prepended with ${JAVA_HOME}/bin -# -# (C) 2018 Christian Stein -# -# https://github.com/sormuras/bach/blob/master/install-jdk.sh -# -set -e - -JDK_FEATURE='10' -JDK_BUILD='?' -JDK_LICENSE='GPL' -JDK_WORKSPACE=${HOME} - -while getopts F:B:L:W: option -do - case "${option}" in - F) JDK_FEATURE=${OPTARG};; - B) JDK_BUILD=${OPTARG};; - L) JDK_LICENSE=${OPTARG};; - W) JDK_WORKSPACE=${OPTARG};; - esac -done - -# -# Other constants -# -JDK_DOWNLOAD='https://download.java.net/java' -JDK_BASENAME='openjdk' -if [ "${JDK_LICENSE}" != 'GPL' ]; then - JDK_BASENAME='jdk' -fi - -# -# 9 -# -if [ "${JDK_FEATURE}" == '9' ]; then - if [ "${JDK_BUILD}" == '?' ]; then - TMP=$(curl -L jdk.java.net/${JDK_FEATURE}) - TMP="${TMP#*

JDK}" # remove everything before the number - TMP="${TMP%%General-Availability Release*}" # remove everything after the number - JDK_BUILD="$(echo -e "${TMP}" | tr -d '[:space:]')" # remove all whitespace - fi - - JDK_ARCHIVE=${JDK_BASENAME}-${JDK_BUILD}_linux-x64_bin.tar.gz - JDK_URL=${JDK_DOWNLOAD}/GA/jdk${JDK_FEATURE}/${JDK_BUILD}/binaries/${JDK_ARCHIVE} - JDK_HOME=jdk-${JDK_BUILD} -fi - -# -# 10 -# -if [ "${JDK_FEATURE}" == '10' ]; then - if [ "${JDK_BUILD}" == '?' ]; then - TMP=$(curl -L jdk.java.net/${JDK_FEATURE}) - TMP="${TMP#*Most recent build: jdk-${JDK_FEATURE}+}" # remove everything before the number - TMP="${TMP%%<*}" # remove everything after the number - JDK_BUILD="$(echo -e "${TMP}" | tr -d '[:space:]')" # remove all whitespace - fi - - JDK_ARCHIVE=${JDK_BASENAME}-${JDK_FEATURE}+${JDK_BUILD}_linux-x64_bin.tar.gz - JDK_URL=${JDK_DOWNLOAD}/jdk${JDK_FEATURE}/archive/${JDK_BUILD}/${JDK_LICENSE}/${JDK_ARCHIVE} - JDK_HOME=jdk-${JDK_FEATURE} -fi - -# -# Create any missing intermediate paths, switch to workspace, download, unpack, switch back. -# -mkdir -p ${JDK_WORKSPACE} -cd ${JDK_WORKSPACE} -wget ${JDK_URL} -tar -xzf ${JDK_ARCHIVE} -cd - - -# -# Update environment and test-drive. -# -export JAVA_HOME=${JDK_WORKSPACE}/${JDK_HOME} -export PATH=${JAVA_HOME}/bin:$PATH - -java --version