Skip to content

Commit

Permalink
Upgrade to grgit3
Browse files Browse the repository at this point in the history
  • Loading branch information
ajoberstar committed Nov 18, 2018
1 parent 610be9d commit 6f1f67e
Show file tree
Hide file tree
Showing 16 changed files with 157 additions and 188 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ allprojects {
group = 'org.ajoberstar.reckon'
}

ext.grgitVersion = '[2.0.0,)'
ext.jgitVersion = '[4.11.0,5.0)'
ext.grgitVersion = '[3.0.0,4.0.0)'
ext.jgitVersion = '[5.0,6.0)'
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-rc-3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
17 changes: 9 additions & 8 deletions reckon-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
plugins {
id 'java-library'
id 'groovy'
}

Expand All @@ -10,18 +11,18 @@ repositories {

dependencies {
// logging
compile 'org.slf4j:slf4j-api:[1.7.25,1.8.0-alpha)' // wait until final 1.8.0 is out to upgrade
testRuntime 'org.slf4j:slf4j-simple:[1.7.25,1.8.0-alpha)'
implementation 'org.slf4j:slf4j-api:[1.7.25,1.8.0-alpha)' // wait until final 1.8.0 is out to upgrade
testRuntimeOnly 'org.slf4j:slf4j-simple:[1.7.25,1.8.0-alpha)'

// git
compile "org.eclipse.jgit:org.eclipse.jgit:$jgitVersion"
testCompile "org.ajoberstar:grgit:$grgitVersion"
api "org.eclipse.jgit:org.eclipse.jgit:$jgitVersion"
testImplementation "org.ajoberstar.grgit:grgit-core:$grgitVersion"

// util
compile 'org.apache.commons:commons-lang3:[3.5,4.0)'
compile 'com.github.zafarkhaja:java-semver:[0.9.0,)'
implementation 'org.apache.commons:commons-lang3:[3.5,4.0)'
implementation 'com.github.zafarkhaja:java-semver:[0.9.0,)'

// testing
testCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
testCompile 'org.codehaus.groovy:groovy-all:2.4.15'
testImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
testImplementation 'org.codehaus.groovy:groovy-all:[2.5,2.6-alpha)'
}
8 changes: 2 additions & 6 deletions reckon-core/gradle/dependency-locks/compileClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ 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
commons-codec:commons-codec:1.9
commons-logging:commons-logging:1.2
org.apache.commons:commons-lang3:3.7
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
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
8 changes: 2 additions & 6 deletions reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ 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
commons-codec:commons-codec:1.9
commons-logging:commons-logging:1.2
org.apache.commons:commons-lang3:3.7
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
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
56 changes: 38 additions & 18 deletions reckon-core/gradle/dependency-locks/testCompileClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,46 @@
# 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.agentproxy.core:0.0.9
com.jcraft:jsch.agentproxy.jsch:0.0.9
com.jcraft:jsch.agentproxy.pageant:0.0.9
com.jcraft:jsch.agentproxy.sshagent:0.0.9
com.jcraft:jsch.agentproxy.usocket-jna:0.0.9
com.jcraft:jsch.agentproxy.usocket-nc:0.0.9
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
commons-codec:commons-codec:1.9
commons-logging:commons-logging:1.2
com.thoughtworks.qdox:qdox:1.12.1
commons-cli:commons-cli:1.4
info.picocli:picocli:3.7.0
jline:jline:2.14.6
junit:junit:4.12
net.java.dev.jna:jna-platform:4.1.0
net.java.dev.jna:jna:4.1.0
org.ajoberstar:grgit:2.3.0
org.apache.commons:commons-lang3:3.7
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.codehaus.groovy:groovy-all:2.4.15
org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r
org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
org.ajoberstar.grgit:grgit-core:3.0.0
org.apache.ant:ant-launcher:1.9.13
org.apache.ant:ant:1.9.13
org.apache.commons:commons-lang3:3.8.1
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.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.opentest4j:opentest4j:1.1.1
org.slf4j:slf4j-api:1.7.25
org.spockframework:spock-core:1.1-groovy-2.4
org.spockframework:spock-core:1.2-groovy-2.5
62 changes: 44 additions & 18 deletions reckon-core/gradle/dependency-locks/testRuntimeClasspath.lockfile
Original file line number Diff line number Diff line change
@@ -1,29 +1,55 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.beust:jcommander:1.72
com.github.zafarkhaja:java-semver:0.9.0
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch.agentproxy.core:0.0.9
com.jcraft:jsch.agentproxy.jsch:0.0.9
com.jcraft:jsch.agentproxy.pageant:0.0.9
com.jcraft:jsch.agentproxy.sshagent:0.0.9
com.jcraft:jsch.agentproxy.usocket-jna:0.0.9
com.jcraft:jsch.agentproxy.usocket-nc:0.0.9
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
commons-codec:commons-codec:1.9
commons-logging:commons-logging:1.2
com.thoughtworks.qdox:qdox:1.12.1
commons-cli:commons-cli:1.4
info.picocli:picocli:3.7.0
jline:jline:2.14.6
junit:junit:4.12
net.java.dev.jna:jna-platform:4.1.0
net.java.dev.jna:jna:4.1.0
org.ajoberstar:grgit:2.3.0
org.apache.commons:commons-lang3:3.7
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.codehaus.groovy:groovy-all:2.4.15
org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r
org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
org.ajoberstar.grgit:grgit-core:3.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.8.1
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.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.opentest4j:opentest4j:1.1.1
org.slf4j:slf4j-api:1.7.25
org.slf4j:slf4j-simple:1.7.25
org.spockframework:spock-core:1.1-groovy-2.4
org.spockframework:spock-core:1.2-groovy-2.5
org.testng:testng:6.13.1
24 changes: 12 additions & 12 deletions reckon-gradle/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'groovy'
id 'java-library'
id 'java-gradle-plugin'
id 'groovy'
}

sourceCompatibility = 8
Expand All @@ -11,25 +12,24 @@ repositories {

dependencies {
// gradle
compile gradleApi()
compileOnly gradleApi()

// reckon
compile project(':reckon-core')
api project(':reckon-core')

// git
compile "org.eclipse.jgit:org.eclipse.jgit:$jgitVersion"
compile "org.ajoberstar:grgit:$grgitVersion"
compatTestCompile "org.ajoberstar:grgit:$grgitVersion"
api "org.ajoberstar.grgit:grgit-gradle:$grgitVersion"
implementation "org.eclipse.jgit:org.eclipse.jgit:$jgitVersion"
compatTestImplementation "org.ajoberstar.grgit:grgit-core:$grgitVersion"

// util
compile 'com.google.guava:guava:latest.release'
compile 'com.github.zafarkhaja:java-semver:latest.release'
implementation 'com.google.guava:guava:latest.release'

// testing
compatTestCompile gradleTestKit()
compatTestCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
compatTestCompile 'org.codehaus.groovy:groovy-all:2.4.15'
compatTestCompile 'junit:junit:latest.release'
compatTestImplementation gradleTestKit()
compatTestImplementation 'org.spockframework:spock-core:1.2-groovy-2.5'
compatTestImplementation 'org.codehaus.groovy:groovy-all:[2.5,2.6-alpha)'
compatTestImplementation 'junit:junit:latest.release'
}

stutter {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,11 @@
# 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.agentproxy.core:0.0.9
com.jcraft:jsch.agentproxy.jsch:0.0.9
com.jcraft:jsch.agentproxy.pageant:0.0.9
com.jcraft:jsch.agentproxy.sshagent:0.0.9
com.jcraft:jsch.agentproxy.usocket-jna:0.0.9
com.jcraft:jsch.agentproxy.usocket-nc:0.0.9
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
commons-codec:commons-codec:1.9
commons-logging:commons-logging:1.2
junit:junit:4.12
net.java.dev.jna:jna-platform:4.1.0
net.java.dev.jna:jna:4.1.0
org.ajoberstar:grgit:2.3.0
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r
org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
org.ajoberstar.grgit:grgit-core:3.0.0
org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
org.hamcrest:hamcrest-core:1.3
org.slf4j:slf4j-api:1.7.2
org.spockframework:spock-core:1.1-groovy-2.4
org.spockframework:spock-core:1.2-groovy-2.5
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,11 @@
# 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.agentproxy.core:0.0.9
com.jcraft:jsch.agentproxy.jsch:0.0.9
com.jcraft:jsch.agentproxy.pageant:0.0.9
com.jcraft:jsch.agentproxy.sshagent:0.0.9
com.jcraft:jsch.agentproxy.usocket-jna:0.0.9
com.jcraft:jsch.agentproxy.usocket-nc:0.0.9
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
commons-codec:commons-codec:1.9
commons-logging:commons-logging:1.2
junit:junit:4.12
net.java.dev.jna:jna-platform:4.1.0
net.java.dev.jna:jna:4.1.0
org.ajoberstar:grgit:2.3.0
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r
org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
org.ajoberstar.grgit:grgit-core:3.0.0
org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
org.hamcrest:hamcrest-core:1.3
org.slf4j:slf4j-api:1.7.2
org.spockframework:spock-core:1.1-groovy-2.4
org.spockframework:spock-core:1.2-groovy-2.5
32 changes: 10 additions & 22 deletions reckon-gradle/gradle/dependency-locks/compileClasspath.lockfile
Original file line number Diff line number Diff line change
@@ -1,30 +1,18 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# 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.1.3
com.google.guava:guava:25.1-jre
com.google.errorprone:error_prone_annotations:2.2.0
com.google.guava:failureaccess:1.0
com.google.guava:guava:27.0-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch.agentproxy.core:0.0.9
com.jcraft:jsch.agentproxy.jsch:0.0.9
com.jcraft:jsch.agentproxy.pageant:0.0.9
com.jcraft:jsch.agentproxy.sshagent:0.0.9
com.jcraft:jsch.agentproxy.usocket-jna:0.0.9
com.jcraft:jsch.agentproxy.usocket-nc:0.0.9
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
commons-codec:commons-codec:1.9
commons-logging:commons-logging:1.2
net.java.dev.jna:jna-platform:4.1.0
net.java.dev.jna:jna:4.1.0
org.ajoberstar:grgit:2.3.0
org.apache.commons:commons-lang3:3.7
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.checkerframework:checker-qual:2.0.0
org.codehaus.mojo:animal-sniffer-annotations:1.14
org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r
org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
org.slf4j:slf4j-api:1.7.25
org.ajoberstar.grgit:grgit-core:3.0.0
org.ajoberstar.grgit:grgit-gradle:3.0.0
org.checkerframework:checker-qual:2.5.2
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
org.slf4j:slf4j-api:1.7.2
30 changes: 10 additions & 20 deletions reckon-gradle/gradle/dependency-locks/runtimeClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,18 @@
# 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.1.3
com.google.guava:guava:25.1-jre
com.google.errorprone:error_prone_annotations:2.2.0
com.google.guava:failureaccess:1.0
com.google.guava:guava:27.0-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.google.j2objc:j2objc-annotations:1.1
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch.agentproxy.core:0.0.9
com.jcraft:jsch.agentproxy.jsch:0.0.9
com.jcraft:jsch.agentproxy.pageant:0.0.9
com.jcraft:jsch.agentproxy.sshagent:0.0.9
com.jcraft:jsch.agentproxy.usocket-jna:0.0.9
com.jcraft:jsch.agentproxy.usocket-nc:0.0.9
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
commons-codec:commons-codec:1.9
commons-logging:commons-logging:1.2
net.java.dev.jna:jna-platform:4.1.0
net.java.dev.jna:jna:4.1.0
org.ajoberstar:grgit:2.3.0
org.apache.commons:commons-lang3:3.7
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.checkerframework:checker-qual:2.0.0
org.codehaus.mojo:animal-sniffer-annotations:1.14
org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r
org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
org.ajoberstar.grgit:grgit-core:3.0.0
org.ajoberstar.grgit:grgit-gradle:3.0.0
org.apache.commons:commons-lang3:3.8.1
org.checkerframework:checker-qual:2.5.2
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r
org.slf4j:slf4j-api:1.7.25
Loading

0 comments on commit 6f1f67e

Please sign in to comment.