Merge pull request #113 from ajoberstar/bugs

Rebuild fixes
ajoberstar · May 11, 2019 · 72219be · 72219be
2 parents 840b4b4 + bf9c66e
commit 72219be
Show file tree

Hide file tree

Showing 23 changed files with 337 additions and 183 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,16 +8,16 @@ defaults: &defaults
  keys:
  - v2-gradle-caches-{{ checksum "reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile" }}-{{ checksum "reckon-gradle/gradle/dependency-locks/runtimeClasspath.lockfile" }}
  - attach_workspace:
- at: '.'
+ at: "."
  - run:
  name: Compile and test
  command: ./gradlew clean check --continue
  - save_cache:
  paths:
- - '~/.gradle/caches'
+ - "~/.gradle/caches"
  key: v2-gradle-caches-{{ checksum "reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile" }}-{{ checksum "reckon-gradle/gradle/dependency-locks/runtimeClasspath.lockfile" }}
  - store_test_results:
- path: '~/gradle-test-results'
+ path: "~/gradle-test-results"
  when: always
 branches-and-tags: &branches-and-tags
  filters:
@@ -38,41 +38,14 @@ tags-only: &tags-only
 ###############################################################################
 version: 2
 jobs:
- update-dependencies:
- docker:
- - image: ajoberstar/circleci-openjdk-gradle:8-jdk
- steps:
- - checkout
- - restore_cache:
- keys:
- - v2-gradle-caches-{{ checksum "reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile" }}-{{ checksum "reckon-gradle/gradle/dependency-locks/runtimeClasspath.lockfile" }}
- - run:
- name: Update locks
- command: ./gradlew stutterWriteLocks lock --write-locks
- - run:
- name: Diff lock files
- command: git --no-pager diff
- - persist_to_workspace:
- root: '.'
- paths:
- - 'gradle/dependency-locks/'
- - '*/gradle/dependency-locks/'
- - '*/*/gradle/dependency-locks/'
- - '.stutter/'
- - '*/.stutter/'
- - '*/*/.stutter/'
  build-java-8:
  <<: *defaults
  docker:
  - image: ajoberstar/circleci-openjdk-gradle:8-jdk
- build-java-9:
+ build-java-11:
  <<: *defaults
  docker:
- - image: ajoberstar/circleci-openjdk-gradle:9-jdk
- build-java-10:
- <<: *defaults
- docker:
- - image: ajoberstar/circleci-openjdk-gradle:10-jdk
+ - image: ajoberstar/circleci-openjdk-gradle:11-jdk
  publish:
  docker:
  - image: ajoberstar/circleci-openjdk-gradle:8-jdk
@@ -96,36 +69,11 @@ workflows:
  jobs:
  - build-java-8:
  <<: *branches-and-tags
- - build-java-9:
+ - build-java-11:
  <<: *branches-and-tags
- requires:
- - build-java-8
- - build-java-10:
- <<: *branches-and-tags
- requires:
- - build-java-8
  - publish:
  <<: *tags-only
  requires:
  - build-java-8
- - build-java-9
- - build-java-10
+ - build-java-11
  context: ajoberstar
- weekly-deps:
- triggers:
- - schedule:
- cron: "0 8 * * 5"
- filters:
- branches:
- only: master
- jobs:
- - update-dependencies
- - build-java-8:
- requires:
- - update-dependencies
- - build-java-9:
- requires:
- - build-java-8
- - build-java-10:
- requires:
- - build-java-8
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
- id 'org.ajoberstar.defaults' version '0.12.0'
+ id 'org.ajoberstar.defaults' version '0.15.1-rc.1'
 }
 
 apply from: 'gradle/locking.gradle'

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

diff --git a/reckon-core/gradle/dependency-locks/compileClasspath.lockfile b/reckon-core/gradle/dependency-locks/compileClasspath.lockfile
@@ -5,6 +5,9 @@ com.github.zafarkhaja:java-semver:0.9.0
 com.googlecode.javaewah:JavaEWAH:1.1.6
 com.jcraft:jsch:0.1.54
 com.jcraft:jzlib:1.1.1
-org.apache.commons:commons-lang3:3.8.1
-org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
-org.slf4j:slf4j-api:1.7.25
+org.apache.commons:commons-lang3:3.9
+org.bouncycastle:bcpg-jdk15on:1.60
+org.bouncycastle:bcpkix-jdk15on:1.60
+org.bouncycastle:bcprov-jdk15on:1.60
+org.eclipse.jgit:org.eclipse.jgit:5.3.1.201904271842-r
+org.slf4j:slf4j-api:1.7.26
diff --git a/reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile b/reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -5,6 +5,9 @@ com.github.zafarkhaja:java-semver:0.9.0
 com.googlecode.javaewah:JavaEWAH:1.1.6
 com.jcraft:jsch:0.1.54
 com.jcraft:jzlib:1.1.1
-org.apache.commons:commons-lang3:3.8.1
-org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
-org.slf4j:slf4j-api:1.7.25
+org.apache.commons:commons-lang3:3.9
+org.bouncycastle:bcpg-jdk15on:1.60
+org.bouncycastle:bcpkix-jdk15on:1.60
+org.bouncycastle:bcprov-jdk15on:1.60
+org.eclipse.jgit:org.eclipse.jgit:5.3.1.201904271842-r
+org.slf4j:slf4j-api:1.7.26
diff --git a/reckon-core/gradle/dependency-locks/testCompileClasspath.lockfile b/reckon-core/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -7,42 +7,45 @@ com.jcraft:jsch:0.1.54
 com.jcraft:jzlib:1.1.1
 com.thoughtworks.qdox:qdox:1.12.1
 commons-cli:commons-cli:1.4
-info.picocli:picocli:3.7.0
+info.picocli:picocli:3.9.5
 jline:jline:2.14.6
 junit:junit:4.12
-org.ajoberstar.grgit:grgit-core:3.0.0
+org.ajoberstar.grgit:grgit-core:3.1.1
 org.apache.ant:ant-launcher:1.9.13
 org.apache.ant:ant:1.9.13
-org.apache.commons:commons-lang3:3.8.1
+org.apache.commons:commons-lang3:3.9
 org.apiguardian:apiguardian-api:1.0.0
-org.codehaus.groovy:groovy-all:2.5.4
-org.codehaus.groovy:groovy-ant:2.5.4
-org.codehaus.groovy:groovy-cli-commons:2.5.4
-org.codehaus.groovy:groovy-cli-picocli:2.5.4
-org.codehaus.groovy:groovy-console:2.5.4
-org.codehaus.groovy:groovy-datetime:2.5.4
-org.codehaus.groovy:groovy-docgenerator:2.5.4
-org.codehaus.groovy:groovy-groovydoc:2.5.4
-org.codehaus.groovy:groovy-groovysh:2.5.4
-org.codehaus.groovy:groovy-jmx:2.5.4
-org.codehaus.groovy:groovy-json:2.5.4
-org.codehaus.groovy:groovy-jsr223:2.5.4
-org.codehaus.groovy:groovy-macro:2.5.4
-org.codehaus.groovy:groovy-nio:2.5.4
-org.codehaus.groovy:groovy-servlet:2.5.4
-org.codehaus.groovy:groovy-sql:2.5.4
-org.codehaus.groovy:groovy-swing:2.5.4
-org.codehaus.groovy:groovy-templates:2.5.4
-org.codehaus.groovy:groovy-test-junit5:2.5.4
-org.codehaus.groovy:groovy-test:2.5.4
-org.codehaus.groovy:groovy-testng:2.5.4
-org.codehaus.groovy:groovy-xml:2.5.4
-org.codehaus.groovy:groovy:2.5.4
-org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
+org.bouncycastle:bcpg-jdk15on:1.60
+org.bouncycastle:bcpkix-jdk15on:1.60
+org.bouncycastle:bcprov-jdk15on:1.60
+org.codehaus.groovy:groovy-all:2.5.7
+org.codehaus.groovy:groovy-ant:2.5.7
+org.codehaus.groovy:groovy-cli-commons:2.5.7
+org.codehaus.groovy:groovy-cli-picocli:2.5.7
+org.codehaus.groovy:groovy-console:2.5.7
+org.codehaus.groovy:groovy-datetime:2.5.7
+org.codehaus.groovy:groovy-docgenerator:2.5.7
+org.codehaus.groovy:groovy-groovydoc:2.5.7
+org.codehaus.groovy:groovy-groovysh:2.5.7
+org.codehaus.groovy:groovy-jmx:2.5.7
+org.codehaus.groovy:groovy-json:2.5.7
+org.codehaus.groovy:groovy-jsr223:2.5.7
+org.codehaus.groovy:groovy-macro:2.5.7
+org.codehaus.groovy:groovy-nio:2.5.7
+org.codehaus.groovy:groovy-servlet:2.5.7
+org.codehaus.groovy:groovy-sql:2.5.7
+org.codehaus.groovy:groovy-swing:2.5.7
+org.codehaus.groovy:groovy-templates:2.5.7
+org.codehaus.groovy:groovy-test-junit5:2.5.7
+org.codehaus.groovy:groovy-test:2.5.7
+org.codehaus.groovy:groovy-testng:2.5.7
+org.codehaus.groovy:groovy-xml:2.5.7
+org.codehaus.groovy:groovy:2.5.7
+org.eclipse.jgit:org.eclipse.jgit:5.3.0.201903130848-r
 org.hamcrest:hamcrest-core:1.3
-org.junit.platform:junit-platform-commons:1.3.1
-org.junit.platform:junit-platform-engine:1.3.1
-org.junit.platform:junit-platform-launcher:1.3.1
+org.junit.platform:junit-platform-commons:1.4.0
+org.junit.platform:junit-platform-engine:1.4.0
+org.junit.platform:junit-platform-launcher:1.4.0
 org.opentest4j:opentest4j:1.1.1
-org.slf4j:slf4j-api:1.7.25
+org.slf4j:slf4j-api:1.7.26
 org.spockframework:spock-core:1.2-groovy-2.5
diff --git a/reckon-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/reckon-core/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -8,48 +8,51 @@ com.jcraft:jsch:0.1.54
 com.jcraft:jzlib:1.1.1
 com.thoughtworks.qdox:qdox:1.12.1
 commons-cli:commons-cli:1.4
-info.picocli:picocli:3.7.0
+info.picocli:picocli:3.9.5
 jline:jline:2.14.6
 junit:junit:4.12
-org.ajoberstar.grgit:grgit-core:3.0.0
+org.ajoberstar.grgit:grgit-core:3.1.1
 org.apache.ant:ant-antlr:1.9.13
 org.apache.ant:ant-junit:1.9.13
 org.apache.ant:ant-launcher:1.9.13
 org.apache.ant:ant:1.9.13
-org.apache.commons:commons-lang3:3.8.1
+org.apache.commons:commons-lang3:3.9
 org.apiguardian:apiguardian-api:1.0.0
-org.codehaus.groovy:groovy-all:2.5.4
-org.codehaus.groovy:groovy-ant:2.5.4
-org.codehaus.groovy:groovy-cli-commons:2.5.4
-org.codehaus.groovy:groovy-cli-picocli:2.5.4
-org.codehaus.groovy:groovy-console:2.5.4
-org.codehaus.groovy:groovy-datetime:2.5.4
-org.codehaus.groovy:groovy-docgenerator:2.5.4
-org.codehaus.groovy:groovy-groovydoc:2.5.4
-org.codehaus.groovy:groovy-groovysh:2.5.4
-org.codehaus.groovy:groovy-jmx:2.5.4
-org.codehaus.groovy:groovy-json:2.5.4
-org.codehaus.groovy:groovy-jsr223:2.5.4
-org.codehaus.groovy:groovy-macro:2.5.4
-org.codehaus.groovy:groovy-nio:2.5.4
-org.codehaus.groovy:groovy-servlet:2.5.4
-org.codehaus.groovy:groovy-sql:2.5.4
-org.codehaus.groovy:groovy-swing:2.5.4
-org.codehaus.groovy:groovy-templates:2.5.4
-org.codehaus.groovy:groovy-test-junit5:2.5.4
-org.codehaus.groovy:groovy-test:2.5.4
-org.codehaus.groovy:groovy-testng:2.5.4
-org.codehaus.groovy:groovy-xml:2.5.4
-org.codehaus.groovy:groovy:2.5.4
-org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
+org.bouncycastle:bcpg-jdk15on:1.60
+org.bouncycastle:bcpkix-jdk15on:1.60
+org.bouncycastle:bcprov-jdk15on:1.60
+org.codehaus.groovy:groovy-all:2.5.7
+org.codehaus.groovy:groovy-ant:2.5.7
+org.codehaus.groovy:groovy-cli-commons:2.5.7
+org.codehaus.groovy:groovy-cli-picocli:2.5.7
+org.codehaus.groovy:groovy-console:2.5.7
+org.codehaus.groovy:groovy-datetime:2.5.7
+org.codehaus.groovy:groovy-docgenerator:2.5.7
+org.codehaus.groovy:groovy-groovydoc:2.5.7
+org.codehaus.groovy:groovy-groovysh:2.5.7
+org.codehaus.groovy:groovy-jmx:2.5.7
+org.codehaus.groovy:groovy-json:2.5.7
+org.codehaus.groovy:groovy-jsr223:2.5.7
+org.codehaus.groovy:groovy-macro:2.5.7
+org.codehaus.groovy:groovy-nio:2.5.7
+org.codehaus.groovy:groovy-servlet:2.5.7
+org.codehaus.groovy:groovy-sql:2.5.7
+org.codehaus.groovy:groovy-swing:2.5.7
+org.codehaus.groovy:groovy-templates:2.5.7
+org.codehaus.groovy:groovy-test-junit5:2.5.7
+org.codehaus.groovy:groovy-test:2.5.7
+org.codehaus.groovy:groovy-testng:2.5.7
+org.codehaus.groovy:groovy-xml:2.5.7
+org.codehaus.groovy:groovy:2.5.7
+org.eclipse.jgit:org.eclipse.jgit:5.3.0.201903130848-r
 org.hamcrest:hamcrest-core:1.3
-org.junit.jupiter:junit-jupiter-api:5.3.1
-org.junit.jupiter:junit-jupiter-engine:5.3.1
-org.junit.platform:junit-platform-commons:1.3.1
-org.junit.platform:junit-platform-engine:1.3.1
-org.junit.platform:junit-platform-launcher:1.3.1
+org.junit.jupiter:junit-jupiter-api:5.4.0
+org.junit.jupiter:junit-jupiter-engine:5.4.0
+org.junit.platform:junit-platform-commons:1.4.0
+org.junit.platform:junit-platform-engine:1.4.0
+org.junit.platform:junit-platform-launcher:1.4.0
 org.opentest4j:opentest4j:1.1.1
-org.slf4j:slf4j-api:1.7.25
-org.slf4j:slf4j-simple:1.7.25
+org.slf4j:slf4j-api:1.7.26
+org.slf4j:slf4j-simple:1.7.26
 org.spockframework:spock-core:1.2-groovy-2.5
 org.testng:testng:6.13.1