diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index cff8b98a..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# Anchors for common settings -############################################################################### -defaults: &defaults - steps: - - checkout - - restore_cache: - keys: - - v2-gradle-caches-{{ checksum "reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile" }}-{{ checksum "reckon-gradle/gradle/dependency-locks/runtimeClasspath.lockfile" }} - - attach_workspace: - at: "." - - run: - name: Compile and test - command: ./gradlew clean check --continue - - save_cache: - paths: - - "~/.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" - when: always -branches-and-tags: &branches-and-tags - filters: - branches: - ignore: - - gh-pages - tags: - only: /^\d+\.\d+\.\d+(?:-.+)?$/ -tags-only: &tags-only - filters: - branches: - ignore: /.*/ - tags: - only: /^\d+\.\d+\.\d+(?:-.+)?$/ - -############################################################################### -# Jobs -############################################################################### -version: 2 -jobs: - build-java-8: - <<: *defaults - docker: - - image: ajoberstar/circleci-openjdk-gradle:8-jdk - build-java-11: - <<: *defaults - docker: - - image: ajoberstar/circleci-openjdk-gradle:11-jdk - publish: - 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: Decrypt Gradle properties - command: openssl enc -d -aes256 -base64 -in gradle.properties.enc -out gradle.properties -pass 'pass:$GRADLE_PROPS_KEY' - - run: - name: Publish Artifacts - command: ./gradlew publish publishPlugins -############################################################################### -# Workflows -############################################################################### -workflows: - version: 2 - main: - jobs: - - build-java-8: - <<: *branches-and-tags - - build-java-11: - <<: *branches-and-tags - - publish: - <<: *tags-only - requires: - - build-java-8 - - build-java-11 - context: ajoberstar diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 00000000..e7958355 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,19 @@ +on: + push: + branches: + - master + pull_request: +jobs: + check: + runs-on: ubuntu-latest + strategy: + matrix: + java: [8, 11] + fail-fast: false + steps: + - uses: "actions/checkout@master" + - uses: "actions/setup-java@master" + with: + java-version: ${{ matrix.java }} + - name: "Gradle check" + run: "./gradlew check" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 00000000..3990973c --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,31 @@ +on: + push: + tags: + - "*" +jobs: + check: + runs-on: ubuntu-latest + strategy: + matrix: + java: [8, 11] + fail-fast: false + steps: + - uses: "actions/checkout@master" + - uses: "actions/setup-java@master" + with: + java-version: ${{ matrix.java }} + - run: "./gradlew check --continue" + publish: + runs-on: ubuntu-latest + needs: check + steps: + - uses: "actions/checkout@master" + - uses: "actions/setup-java@master" + with: + java-version: 11 + - name: "Gradle publish" + env: + BINTRAY_USER: ${{ secrets.BINTRAY_USER }} + BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} + GRADLE_OPTS: "-Dorg.gradle.project.gradle.publish.key=${{ secrets.GRADLE_PLUGIN_KEY }} -Dorg.gradle.project.gradle.publish.secret=${{ secrets.GRADLE_PLUGIN_SECRET }}" + run: "./gradlew publish publishPlugins" diff --git a/README.md b/README.md index 049827d0..9034544f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # reckon [![Download](https://api.bintray.com/packages/ajoberstar/maven/reckon/images/download.svg)](https://bintray.com/ajoberstar/maven/reckon/_latestVersion) -[![CircleCI](https://circleci.com/gh/ajoberstar/reckon.svg?style=svg)](https://circleci.com/gh/ajoberstar/reckon) +![](https://github.com/ajoberstar/reckon/workflows/.github/workflows/build.yaml/badge.svg) ## Why do you care? diff --git a/build.gradle b/build.gradle index 4035ffa6..a2246d83 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ plugins { id 'org.ajoberstar.defaults' version '0.15.1-rc.1' + id 'org.ajoberstar.stutter' version '0.5.1' } apply from: 'gradle/locking.gradle' @@ -9,5 +10,5 @@ allprojects { group = 'org.ajoberstar.reckon' } -ext.grgitVersion = '[3.0.0,4.0.0)' +ext.grgitVersion = '[4.0.0,5.0.0)' ext.jgitVersion = '[5.0,6.0)' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8c8ba28d..5c2d1cf0 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f4d7b2bf..5028f28f 100644 --- 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.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index af6708ff..b0d6d0ab 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,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='"-Xmx64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index 0f8d5937..15e1ee37 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,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="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @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 index 51a1cf09..7630ed27 100644 --- a/reckon-core/gradle/dependency-locks/compileClasspath.lockfile +++ b/reckon-core/gradle/dependency-locks/compileClasspath.lockfile @@ -3,11 +3,11 @@ # This file is expected to be part of source control. com.github.zafarkhaja:java-semver:0.9.0 com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 +com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 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 +org.bouncycastle:bcpg-jdk15on:1.61 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 +org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r +org.slf4j:slf4j-api:1.7.29 diff --git a/reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile b/reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile index 51a1cf09..7630ed27 100644 --- a/reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -3,11 +3,11 @@ # This file is expected to be part of source control. com.github.zafarkhaja:java-semver:0.9.0 com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 +com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 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 +org.bouncycastle:bcpg-jdk15on:1.61 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 +org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r +org.slf4j:slf4j-api:1.7.29 diff --git a/reckon-core/gradle/dependency-locks/testCompileClasspath.lockfile b/reckon-core/gradle/dependency-locks/testCompileClasspath.lockfile index 62c05c3f..dde7c7c1 100644 --- a/reckon-core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/reckon-core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -3,49 +3,49 @@ # This file is expected to be part of source control. com.github.zafarkhaja:java-semver:0.9.0 com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 +com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 com.thoughtworks.qdox:qdox:1.12.1 commons-cli:commons-cli:1.4 -info.picocli:picocli:3.9.5 +info.picocli:picocli:4.0.1 jline:jline:2.14.6 junit:junit:4.12 -org.ajoberstar.grgit:grgit-core:3.1.1 +org.ajoberstar.grgit:grgit-core:4.0.0 org.apache.ant:ant-launcher:1.9.13 org.apache.ant:ant:1.9.13 org.apache.commons:commons-lang3:3.9 org.apiguardian:apiguardian-api:1.0.0 -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.bouncycastle:bcpg-jdk15on:1.61 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 +org.codehaus.groovy:groovy-all:2.5.8 +org.codehaus.groovy:groovy-ant:2.5.8 +org.codehaus.groovy:groovy-cli-commons:2.5.8 +org.codehaus.groovy:groovy-cli-picocli:2.5.8 +org.codehaus.groovy:groovy-console:2.5.8 +org.codehaus.groovy:groovy-datetime:2.5.8 +org.codehaus.groovy:groovy-docgenerator:2.5.8 +org.codehaus.groovy:groovy-groovydoc:2.5.8 +org.codehaus.groovy:groovy-groovysh:2.5.8 +org.codehaus.groovy:groovy-jmx:2.5.8 +org.codehaus.groovy:groovy-json:2.5.8 +org.codehaus.groovy:groovy-jsr223:2.5.8 +org.codehaus.groovy:groovy-macro:2.5.8 +org.codehaus.groovy:groovy-nio:2.5.8 +org.codehaus.groovy:groovy-servlet:2.5.8 +org.codehaus.groovy:groovy-sql:2.5.8 +org.codehaus.groovy:groovy-swing:2.5.8 +org.codehaus.groovy:groovy-templates:2.5.8 +org.codehaus.groovy:groovy-test-junit5:2.5.8 +org.codehaus.groovy:groovy-test:2.5.8 +org.codehaus.groovy:groovy-testng:2.5.8 +org.codehaus.groovy:groovy-xml:2.5.8 +org.codehaus.groovy:groovy:2.5.8 +org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r org.hamcrest:hamcrest-core:1.3 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.26 +org.slf4j:slf4j-api:1.7.29 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 index 4e72f4b1..cf8ae530 100644 --- a/reckon-core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/reckon-core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -4,47 +4,47 @@ com.beust:jcommander:1.72 com.github.zafarkhaja:java-semver:0.9.0 com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 +com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 com.thoughtworks.qdox:qdox:1.12.1 commons-cli:commons-cli:1.4 -info.picocli:picocli:3.9.5 +info.picocli:picocli:4.0.1 jline:jline:2.14.6 junit:junit:4.12 -org.ajoberstar.grgit:grgit-core:3.1.1 +org.ajoberstar.grgit:grgit-core:4.0.0 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.9 org.apiguardian:apiguardian-api:1.0.0 -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.bouncycastle:bcpg-jdk15on:1.61 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 +org.codehaus.groovy:groovy-all:2.5.8 +org.codehaus.groovy:groovy-ant:2.5.8 +org.codehaus.groovy:groovy-cli-commons:2.5.8 +org.codehaus.groovy:groovy-cli-picocli:2.5.8 +org.codehaus.groovy:groovy-console:2.5.8 +org.codehaus.groovy:groovy-datetime:2.5.8 +org.codehaus.groovy:groovy-docgenerator:2.5.8 +org.codehaus.groovy:groovy-groovydoc:2.5.8 +org.codehaus.groovy:groovy-groovysh:2.5.8 +org.codehaus.groovy:groovy-jmx:2.5.8 +org.codehaus.groovy:groovy-json:2.5.8 +org.codehaus.groovy:groovy-jsr223:2.5.8 +org.codehaus.groovy:groovy-macro:2.5.8 +org.codehaus.groovy:groovy-nio:2.5.8 +org.codehaus.groovy:groovy-servlet:2.5.8 +org.codehaus.groovy:groovy-sql:2.5.8 +org.codehaus.groovy:groovy-swing:2.5.8 +org.codehaus.groovy:groovy-templates:2.5.8 +org.codehaus.groovy:groovy-test-junit5:2.5.8 +org.codehaus.groovy:groovy-test:2.5.8 +org.codehaus.groovy:groovy-testng:2.5.8 +org.codehaus.groovy:groovy-xml:2.5.8 +org.codehaus.groovy:groovy:2.5.8 +org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r org.hamcrest:hamcrest-core:1.3 org.junit.jupiter:junit-jupiter-api:5.4.0 org.junit.jupiter:junit-jupiter-engine:5.4.0 @@ -52,7 +52,7 @@ 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.26 -org.slf4j:slf4j-simple:1.7.26 +org.slf4j:slf4j-api:1.7.29 +org.slf4j:slf4j-simple:1.7.29 org.spockframework:spock-core:1.2-groovy-2.5 org.testng:testng:6.13.1 diff --git a/reckon-gradle/.stutter/java11.lock b/reckon-gradle/.stutter/java11.lock index 793d956b..f42aa017 100644 --- a/reckon-gradle/.stutter/java11.lock +++ b/reckon-gradle/.stutter/java11.lock @@ -1,3 +1,5 @@ # DO NOT MODIFY: Generated by Stutter plugin. 5.0 -5.4.1 +5.6.4 +6.0.1 +6.1-milestone-1 diff --git a/reckon-gradle/.stutter/java13.lock b/reckon-gradle/.stutter/java13.lock new file mode 100644 index 00000000..e603d361 --- /dev/null +++ b/reckon-gradle/.stutter/java13.lock @@ -0,0 +1,3 @@ +# DO NOT MODIFY: Generated by Stutter plugin. +6.0.1 +6.1-milestone-1 diff --git a/reckon-gradle/.stutter/java8.lock b/reckon-gradle/.stutter/java8.lock index 48a049b8..8c2a7c88 100644 --- a/reckon-gradle/.stutter/java8.lock +++ b/reckon-gradle/.stutter/java8.lock @@ -1,7 +1,7 @@ # DO NOT MODIFY: Generated by Stutter plugin. -3.0 -3.5.1 4.0.2 4.10.3 5.0 -5.4.1 +5.6.4 +6.0.1 +6.1-milestone-1 diff --git a/reckon-gradle/build.gradle b/reckon-gradle/build.gradle index 4cffb3ee..1a8a5bc1 100644 --- a/reckon-gradle/build.gradle +++ b/reckon-gradle/build.gradle @@ -36,11 +36,14 @@ stutter { sparse = true java(8) { - compatibleRange '3.0' + compatibleRange '4.0' } java(11) { compatibleRange '5.0' } + java(13) { + compatibleRange '6.0' + } } pluginBundle { diff --git a/reckon-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile b/reckon-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile index 2bb0ad89..3a163fc1 100644 --- a/reckon-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile +++ b/reckon-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile @@ -2,14 +2,14 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 +com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -junit:junit:4.13-beta-2 -org.ajoberstar.grgit:grgit-core:3.1.1 -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.0.201903130848-r +junit:junit:4.13-rc-1 +org.ajoberstar.grgit:grgit-core:4.0.0 +org.bouncycastle:bcpg-jdk15on:1.61 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 +org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.7.2 org.spockframework:spock-core:1.2-groovy-2.5 diff --git a/reckon-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile b/reckon-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile index 2bb0ad89..3a163fc1 100644 --- a/reckon-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile +++ b/reckon-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile @@ -2,14 +2,14 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 +com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -junit:junit:4.13-beta-2 -org.ajoberstar.grgit:grgit-core:3.1.1 -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.0.201903130848-r +junit:junit:4.13-rc-1 +org.ajoberstar.grgit:grgit-core:4.0.0 +org.bouncycastle:bcpg-jdk15on:1.61 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 +org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.7.2 org.spockframework:spock-core:1.2-groovy-2.5 diff --git a/reckon-gradle/gradle/dependency-locks/compileClasspath.lockfile b/reckon-gradle/gradle/dependency-locks/compileClasspath.lockfile index d3153f74..97a05783 100644 --- a/reckon-gradle/gradle/dependency-locks/compileClasspath.lockfile +++ b/reckon-gradle/gradle/dependency-locks/compileClasspath.lockfile @@ -2,20 +2,20 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.2.0 +com.google.errorprone:error_prone_annotations:2.3.2 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:27.1-jre +com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.1 +com.google.j2objc:j2objc-annotations:1.3 com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 +com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -org.ajoberstar.grgit:grgit-core:3.1.1 -org.ajoberstar.grgit:grgit-gradle:3.1.1 -org.bouncycastle:bcpg-jdk15on:1.60 -org.bouncycastle:bcpkix-jdk15on:1.60 -org.bouncycastle:bcprov-jdk15on:1.60 -org.checkerframework:checker-qual:2.5.2 -org.codehaus.mojo:animal-sniffer-annotations:1.17 -org.eclipse.jgit:org.eclipse.jgit:5.3.0.201903130848-r +org.ajoberstar.grgit:grgit-core:4.0.0 +org.ajoberstar.grgit:grgit-gradle:4.0.0 +org.bouncycastle:bcpg-jdk15on:1.61 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 +org.checkerframework:checker-qual:2.8.1 +org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r org.slf4j:slf4j-api:1.7.2 diff --git a/reckon-gradle/gradle/dependency-locks/runtimeClasspath.lockfile b/reckon-gradle/gradle/dependency-locks/runtimeClasspath.lockfile index 2c6964d8..954c5bd6 100644 --- a/reckon-gradle/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/reckon-gradle/gradle/dependency-locks/runtimeClasspath.lockfile @@ -3,21 +3,21 @@ # This file is expected to be part of source control. com.github.zafarkhaja:java-semver:0.9.0 com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.2.0 +com.google.errorprone:error_prone_annotations:2.3.2 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:27.1-jre +com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.1 +com.google.j2objc:j2objc-annotations:1.3 com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 +com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -org.ajoberstar.grgit:grgit-core:3.1.1 -org.ajoberstar.grgit:grgit-gradle:3.1.1 +org.ajoberstar.grgit:grgit-core:4.0.0 +org.ajoberstar.grgit:grgit-gradle:4.0.0 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.checkerframework:checker-qual:2.5.2 -org.codehaus.mojo:animal-sniffer-annotations:1.17 -org.eclipse.jgit:org.eclipse.jgit:5.3.0.201903130848-r -org.slf4j:slf4j-api:1.7.26 +org.bouncycastle:bcpg-jdk15on:1.61 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 +org.checkerframework:checker-qual:2.8.1 +org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r +org.slf4j:slf4j-api:1.7.29 diff --git a/reckon-gradle/gradle/dependency-locks/testCompileClasspath.lockfile b/reckon-gradle/gradle/dependency-locks/testCompileClasspath.lockfile index d3153f74..97a05783 100644 --- a/reckon-gradle/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/reckon-gradle/gradle/dependency-locks/testCompileClasspath.lockfile @@ -2,20 +2,20 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.2.0 +com.google.errorprone:error_prone_annotations:2.3.2 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:27.1-jre +com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.1 +com.google.j2objc:j2objc-annotations:1.3 com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 +com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -org.ajoberstar.grgit:grgit-core:3.1.1 -org.ajoberstar.grgit:grgit-gradle:3.1.1 -org.bouncycastle:bcpg-jdk15on:1.60 -org.bouncycastle:bcpkix-jdk15on:1.60 -org.bouncycastle:bcprov-jdk15on:1.60 -org.checkerframework:checker-qual:2.5.2 -org.codehaus.mojo:animal-sniffer-annotations:1.17 -org.eclipse.jgit:org.eclipse.jgit:5.3.0.201903130848-r +org.ajoberstar.grgit:grgit-core:4.0.0 +org.ajoberstar.grgit:grgit-gradle:4.0.0 +org.bouncycastle:bcpg-jdk15on:1.61 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 +org.checkerframework:checker-qual:2.8.1 +org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r org.slf4j:slf4j-api:1.7.2 diff --git a/reckon-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile b/reckon-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile index 2c6964d8..954c5bd6 100644 --- a/reckon-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/reckon-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -3,21 +3,21 @@ # This file is expected to be part of source control. com.github.zafarkhaja:java-semver:0.9.0 com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.2.0 +com.google.errorprone:error_prone_annotations:2.3.2 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:27.1-jre +com.google.guava:guava:28.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.1 +com.google.j2objc:j2objc-annotations:1.3 com.googlecode.javaewah:JavaEWAH:1.1.6 -com.jcraft:jsch:0.1.54 +com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -org.ajoberstar.grgit:grgit-core:3.1.1 -org.ajoberstar.grgit:grgit-gradle:3.1.1 +org.ajoberstar.grgit:grgit-core:4.0.0 +org.ajoberstar.grgit:grgit-gradle:4.0.0 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.checkerframework:checker-qual:2.5.2 -org.codehaus.mojo:animal-sniffer-annotations:1.17 -org.eclipse.jgit:org.eclipse.jgit:5.3.0.201903130848-r -org.slf4j:slf4j-api:1.7.26 +org.bouncycastle:bcpg-jdk15on:1.61 +org.bouncycastle:bcpkix-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 +org.checkerframework:checker-qual:2.8.1 +org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r +org.slf4j:slf4j-api:1.7.29