diff --git a/grgit-core/gradle/dependency-locks/compileClasspath.lockfile b/grgit-core/gradle/dependency-locks/compileClasspath.lockfile index b150e1fe..49bbff4a 100644 --- a/grgit-core/gradle/dependency-locks/compileClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/compileClasspath.lockfile @@ -4,9 +4,9 @@ com.googlecode.javaewah:JavaEWAH:1.1.6 com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -org.bouncycastle:bcpg-jdk15on:1.61 -org.bouncycastle:bcpkix-jdk15on:1.61 -org.bouncycastle:bcprov-jdk15on:1.61 +org.bouncycastle:bcpg-jdk15on:1.64 +org.bouncycastle:bcpkix-jdk15on:1.64 +org.bouncycastle:bcprov-jdk15on:1.64 org.codehaus.groovy:groovy:2.5.8 -org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r +org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile b/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile index 9ed987eb..b4894bac 100644 --- a/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -4,8 +4,8 @@ com.googlecode.javaewah:JavaEWAH:1.1.6 com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -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.bouncycastle:bcpg-jdk15on:1.64 +org.bouncycastle:bcpkix-jdk15on:1.64 +org.bouncycastle:bcprov-jdk15on:1.64 +org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile b/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile index 52a98448..0d6cb7b5 100644 --- a/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -4,10 +4,10 @@ com.googlecode.javaewah:JavaEWAH:1.1.6 com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -junit:junit:4.13-rc-1 -org.bouncycastle:bcpg-jdk15on:1.61 -org.bouncycastle:bcpkix-jdk15on:1.61 -org.bouncycastle:bcprov-jdk15on:1.61 +junit:junit:4.13-rc-2 +org.bouncycastle:bcpg-jdk15on:1.64 +org.bouncycastle:bcpkix-jdk15on:1.64 +org.bouncycastle:bcprov-jdk15on:1.64 org.codehaus.groovy:groovy-json:2.5.4 org.codehaus.groovy:groovy-macro:2.5.4 org.codehaus.groovy:groovy-nio:2.5.4 @@ -16,7 +16,7 @@ org.codehaus.groovy:groovy-templates:2.5.4 org.codehaus.groovy:groovy-test: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.5.1.201910021850-r +org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:2.0.0-alpha1 org.spockframework:spock-core:1.3-groovy-2.5 diff --git a/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 6f3b9c4c..dd7a5c68 100644 --- a/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -4,10 +4,10 @@ com.googlecode.javaewah:JavaEWAH:1.1.6 com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -junit:junit:4.13-rc-1 -org.bouncycastle:bcpg-jdk15on:1.61 -org.bouncycastle:bcpkix-jdk15on:1.61 -org.bouncycastle:bcprov-jdk15on:1.61 +junit:junit:4.13-rc-2 +org.bouncycastle:bcpg-jdk15on:1.64 +org.bouncycastle:bcpkix-jdk15on:1.64 +org.bouncycastle:bcprov-jdk15on:1.64 org.codehaus.groovy:groovy-json:2.5.4 org.codehaus.groovy:groovy-macro:2.5.4 org.codehaus.groovy:groovy-nio:2.5.4 @@ -16,7 +16,7 @@ org.codehaus.groovy:groovy-templates:2.5.4 org.codehaus.groovy:groovy-test: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.5.1.201910021850-r +org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:2.0.0-alpha1 org.slf4j:slf4j-simple:2.0.0-alpha1 diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/GrgitSystemReader.java b/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/GrgitSystemReader.java index bc09be6d..dee25c5d 100644 --- a/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/GrgitSystemReader.java +++ b/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/GrgitSystemReader.java @@ -49,6 +49,11 @@ public String getProperty(String key) { return delegate.getProperty(key); } + @Override + public FileBasedConfig openJGitConfig(Config parent, FS fs) { + return delegate.openJGitConfig(parent, fs); + } + @Override public FileBasedConfig openUserConfig(Config parent, FS fs) { return delegate.openUserConfig(parent, fs); diff --git a/grgit-gradle/.stutter/java11.lock b/grgit-gradle/.stutter/java11.lock index c4280bc3..7eba2196 100644 --- a/grgit-gradle/.stutter/java11.lock +++ b/grgit-gradle/.stutter/java11.lock @@ -1,4 +1,5 @@ # DO NOT MODIFY: Generated by Stutter plugin. 5.0 5.6.4 -6.0 +6.0.1 +6.1-rc-1 diff --git a/grgit-gradle/.stutter/java13.lock b/grgit-gradle/.stutter/java13.lock index e0ca0593..f233afc7 100644 --- a/grgit-gradle/.stutter/java13.lock +++ b/grgit-gradle/.stutter/java13.lock @@ -1,2 +1,3 @@ # DO NOT MODIFY: Generated by Stutter plugin. -6.0 +6.0.1 +6.1-rc-1 diff --git a/grgit-gradle/.stutter/java8.lock b/grgit-gradle/.stutter/java8.lock index 15b4047e..6e409b1a 100644 --- a/grgit-gradle/.stutter/java8.lock +++ b/grgit-gradle/.stutter/java8.lock @@ -3,4 +3,5 @@ 4.10.3 5.0 5.6.4 -6.0 +6.0.1 +6.1-rc-1 diff --git a/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile index 98ab7557..9cf88acb 100644 --- a/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile @@ -4,11 +4,11 @@ com.googlecode.javaewah:JavaEWAH:1.1.6 com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -junit:junit:4.13-rc-1 -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 +junit:junit:4.13-rc-2 +org.bouncycastle:bcpg-jdk15on:1.64 +org.bouncycastle:bcpkix-jdk15on:1.64 +org.bouncycastle:bcprov-jdk15on:1.64 +org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.7.2 org.spockframework:spock-core:1.3-groovy-2.5 diff --git a/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile index 98ab7557..9cf88acb 100644 --- a/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile @@ -4,11 +4,11 @@ com.googlecode.javaewah:JavaEWAH:1.1.6 com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -junit:junit:4.13-rc-1 -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 +junit:junit:4.13-rc-2 +org.bouncycastle:bcpg-jdk15on:1.64 +org.bouncycastle:bcpkix-jdk15on:1.64 +org.bouncycastle:bcprov-jdk15on:1.64 +org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.7.2 org.spockframework:spock-core:1.3-groovy-2.5 diff --git a/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile index 9ed987eb..b4894bac 100644 --- a/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile @@ -4,8 +4,8 @@ com.googlecode.javaewah:JavaEWAH:1.1.6 com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -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.bouncycastle:bcpg-jdk15on:1.64 +org.bouncycastle:bcpkix-jdk15on:1.64 +org.bouncycastle:bcprov-jdk15on:1.64 +org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-gradle/gradle/dependency-locks/runtimeClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/runtimeClasspath.lockfile index 9ed987eb..b4894bac 100644 --- a/grgit-gradle/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/runtimeClasspath.lockfile @@ -4,8 +4,8 @@ com.googlecode.javaewah:JavaEWAH:1.1.6 com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -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.bouncycastle:bcpg-jdk15on:1.64 +org.bouncycastle:bcpkix-jdk15on:1.64 +org.bouncycastle:bcprov-jdk15on:1.64 +org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-gradle/gradle/dependency-locks/testCompileClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/testCompileClasspath.lockfile index 9ed987eb..b4894bac 100644 --- a/grgit-gradle/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/testCompileClasspath.lockfile @@ -4,8 +4,8 @@ com.googlecode.javaewah:JavaEWAH:1.1.6 com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -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.bouncycastle:bcpg-jdk15on:1.64 +org.bouncycastle:bcpkix-jdk15on:1.64 +org.bouncycastle:bcprov-jdk15on:1.64 +org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile index 9ed987eb..b4894bac 100644 --- a/grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -4,8 +4,8 @@ com.googlecode.javaewah:JavaEWAH:1.1.6 com.jcraft:jsch:0.1.55 com.jcraft:jzlib:1.1.1 -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.bouncycastle:bcpg-jdk15on:1.64 +org.bouncycastle:bcpkix-jdk15on:1.64 +org.bouncycastle:bcprov-jdk15on:1.64 +org.eclipse.jgit:org.eclipse.jgit:5.6.0.201912101111-r org.slf4j:slf4j-api:1.7.2