You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2017/10/23 02:18:06 UTC

groovy git commit: use jdk8 to get zip and plugins

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_4_X 926347356 -> 468a24df3


use jdk8 to get zip and plugins


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/468a24df
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/468a24df
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/468a24df

Branch: refs/heads/GROOVY_2_4_X
Commit: 468a24df3f271fe28519a8623e3c363b5fd6f71f
Parents: 9263473
Author: paulk <pa...@asert.com.au>
Authored: Mon Oct 23 12:17:57 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Mon Oct 23 12:17:57 2017 +1000

----------------------------------------------------------------------
 .travis.yml                              | 32 +++++++++++++++++----------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 2 files changed, 21 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/468a24df/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 4e02c39..f97cc77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,9 +19,9 @@ sudo: required
 
 matrix:
   include:
-    - jdk: openjdk6
-    - jdk: openjdk7
     - jdk: oraclejdk8
+    - jdk: openjdk7
+    - jdk: openjdk6
 addons:
   apt:
     packages:
@@ -29,33 +29,41 @@ addons:
 
 dist: trusty
 
+# use bouncycastle security provider to avoid:
+# javax.net.ssl.SSLException: ... java.security.InvalidKeyException: EC parameters error
 before_install:
   - |
     if [ $TRAVIS_JDK_VERSION == "openjdk7" ]; then
-      BCPROV_FILENAME=bcprov-ext-jdk15on-158.jar
-      wget "https://bouncycastle.org/download/${BCPROV_FILENAME}"
-      sudo mv $BCPROV_FILENAME /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/ext
-      sudo perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-7-openjdk/security/java.security
-      echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | sudo tee -a /etc/java-7-openjdk/security/java.security
+      JAVA_ETC=java-7-openjdk
     elif [ $TRAVIS_JDK_VERSION == "openjdk6" ]; then
+      JAVA_ETC=java-6-openjdk
+    fi
+    if [ $TRAVIS_JDK_VERSION == "openjdk6" ] || [ $TRAVIS_JDK_VERSION == "openjdk7" ]; then
       BCPROV_FILENAME=bcprov-ext-jdk15on-158.jar
       wget "https://bouncycastle.org/download/${BCPROV_FILENAME}"
-      sudo mv $BCPROV_FILENAME /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/ext
-      sudo perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-6-openjdk/security/java.security
-      echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | sudo tee -a /etc/java-6-openjdk/security/java.security
+      sudo mv $BCPROV_FILENAME ${JAVA_HOME}/jre/lib/ext
+      sudo perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/${JAVA_ETC}/security/java.security
+      echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | sudo tee -a /etc/${JAVA_ETC}/security/java.security
     fi
 
 install: true
 
+# use default mem settings for java 8 only
+# avoid getting gradle zip and plugins using openjdk6
 before_script:
   - |
-    if [ $TRAVIS_JDK_VERSION -eq "openjdk6" ] || [ $TRAVIS_JDK_VERSION -eq "openjdk6" ]; then
+    if [ $TRAVIS_JDK_VERSION == "openjdk6" ] || [ $TRAVIS_JDK_VERSION == "openjdk7" ]; then
       export _JAVA_OPTIONS=-Xms1024m\ -Xmx2048m
     else
       unset _JAVA_OPTIONS
     fi
+    if [ $TRAVIS_JDK_VERSION == "openjdk6" ]; then
+      jdk_switcher use oraclejdk8
+      ./gradlew assemble
+      jdk_switcher use openjdk6
+    fi
 
-script: travis_wait 60 ./gradlew test
+script: travis_wait 60 ./gradlew clean test
 
 # As recommended in:
 # https://docs.travis-ci.com/user/languages/java/#Caching

http://git-wip-us.apache.org/repos/asf/groovy/blob/468a24df/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 65c3f07..38f0a68 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip