From 6047d52185fd6f24beb9a712555eea74b5137a68 Mon Sep 17 00:00:00 2001 From: Andrew Oberstar Date: Mon, 2 Jul 2018 20:38:12 -0500 Subject: [PATCH 01/11] Break into two projects Separate the core grgit lib and the Gradle plugin so that its easier to test a Groovy 2.5 dependency in core and not in the plugin. --- build.gradle | 145 ++---------------- gradle/bintray.gradle | 16 ++ .../annotationProcessor.lockfile | 3 - gradle/dependency-locks/archives.lockfile | 3 - .../compatTestAnnotationProcessor.lockfile | 3 - .../compatTestCompileOnly.lockfile | 3 - gradle/dependency-locks/compileOnly.lockfile | 3 - gradle/dependency-locks/jbake.lockfile | 44 ------ .../testAnnotationProcessor.lockfile | 3 - gradle/dependency-locks/testCompile.lockfile | 25 --- .../dependency-locks/testCompileOnly.lockfile | 3 - gradle/dependency-locks/testRuntime.lockfile | 26 ---- gradle/locking.gradle | 20 +++ gradle/wrapper/gradle-wrapper.jar | Bin 54418 -> 54418 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- grgit-core/build.gradle | 63 ++++++++ .../gradle/dependency-locks/compile.lockfile | 11 -- .../compileClasspath.lockfile | 1 + .../gradle/dependency-locks/default.lockfile | 1 + .../gradle/dependency-locks/runtime.lockfile | 13 ++ .../runtimeClasspath.lockfile | 4 +- .../dependency-locks/testCompile.lockfile | 13 ++ .../testCompileClasspath.lockfile | 4 +- .../dependency-locks/testRuntime.lockfile | 14 ++ .../testRuntimeClasspath.lockfile | 6 +- .../groovy/org/ajoberstar/grgit/Branch.groovy | 0 .../org/ajoberstar/grgit/BranchStatus.groovy | 0 .../groovy/org/ajoberstar/grgit/Commit.groovy | 0 .../org/ajoberstar/grgit/CommitDiff.groovy | 0 .../org/ajoberstar/grgit/Credentials.groovy | 0 .../groovy/org/ajoberstar/grgit/Grgit.groovy | 0 .../groovy/org/ajoberstar/grgit/Person.groovy | 0 .../org/ajoberstar/grgit/PushException.java | 0 .../groovy/org/ajoberstar/grgit/Ref.groovy | 0 .../groovy/org/ajoberstar/grgit/Remote.groovy | 0 .../org/ajoberstar/grgit/Repository.groovy | 0 .../groovy/org/ajoberstar/grgit/Status.groovy | 0 .../groovy/org/ajoberstar/grgit/Tag.groovy | 0 .../ajoberstar/grgit/auth/AuthConfig.groovy | 0 .../grgit/auth/GrgitSystemReader.java | 0 .../auth/JschAgentProxyConfigCallback.groovy | 0 .../auth/JschAgentProxySessionFactory.groovy | 0 .../grgit/auth/TransportOpUtil.groovy | 0 .../ajoberstar/grgit/auth/package-info.groovy | 0 .../ajoberstar/grgit/internal/OpSyntax.groovy | 0 .../ajoberstar/grgit/internal/Operation.java | 0 .../grgit/internal/WithOperations.java | 0 .../WithOperationsASTTransformation.java | 0 .../ajoberstar/grgit/operation/AddOp.groovy | 0 .../ajoberstar/grgit/operation/ApplyOp.groovy | 0 .../grgit/operation/BranchAddOp.groovy | 0 .../grgit/operation/BranchChangeOp.groovy | 0 .../grgit/operation/BranchListOp.groovy | 0 .../grgit/operation/BranchRemoveOp.groovy | 0 .../grgit/operation/BranchStatusOp.groovy | 0 .../grgit/operation/CheckoutOp.groovy | 0 .../ajoberstar/grgit/operation/CleanOp.groovy | 0 .../ajoberstar/grgit/operation/CloneOp.groovy | 0 .../grgit/operation/CommitOp.groovy | 0 .../grgit/operation/DescribeOp.groovy | 0 .../ajoberstar/grgit/operation/FetchOp.groovy | 0 .../ajoberstar/grgit/operation/InitOp.groovy | 0 .../ajoberstar/grgit/operation/LogOp.groovy | 0 .../grgit/operation/LsRemoteOp.groovy | 0 .../ajoberstar/grgit/operation/MergeOp.groovy | 0 .../ajoberstar/grgit/operation/OpenOp.groovy | 0 .../ajoberstar/grgit/operation/PullOp.groovy | 0 .../ajoberstar/grgit/operation/PushOp.groovy | 0 .../grgit/operation/RemoteAddOp.groovy | 0 .../grgit/operation/RemoteListOp.groovy | 0 .../ajoberstar/grgit/operation/ResetOp.groovy | 0 .../grgit/operation/RevertOp.groovy | 0 .../ajoberstar/grgit/operation/RmOp.groovy | 0 .../ajoberstar/grgit/operation/ShowOp.groovy | 0 .../grgit/operation/StatusOp.groovy | 0 .../grgit/operation/TagAddOp.groovy | 0 .../grgit/operation/TagListOp.groovy | 0 .../grgit/operation/TagRemoveOp.groovy | 0 .../grgit/operation/package-info.groovy | 0 .../org/ajoberstar/grgit/package-info.groovy | 0 .../grgit/service/BranchService.groovy | 0 .../grgit/service/RemoteService.groovy | 0 .../grgit/service/ResolveService.groovy | 0 .../grgit/service/TagService.groovy | 0 .../grgit/service/package-info.groovy | 0 .../ajoberstar/grgit/util/CoercionUtil.groovy | 0 .../org/ajoberstar/grgit/util/JGitUtil.groovy | 0 .../ajoberstar/grgit/util/package-info.groovy | 0 .../grgit/auth/AuthConfigSpec.groovy | 0 .../grgit/auth/LinuxAuthenticationSpec.groovy | 0 .../auth/WindowsAuthenticationSpec.groovy | 0 .../grgit/fixtures/Categories.groovy | 0 .../grgit/fixtures/GitTestUtil.groovy | 0 .../grgit/fixtures/MultiGitOpSpec.groovy | 0 .../grgit/fixtures/SimpleGitOpSpec.groovy | 0 .../grgit/operation/AddOpSpec.groovy | 0 .../grgit/operation/ApplyOpSpec.groovy | 0 .../grgit/operation/BranchAddOpSpec.groovy | 0 .../grgit/operation/BranchChangeOpSpec.groovy | 0 .../grgit/operation/BranchListOpSpec.groovy | 0 .../grgit/operation/BranchRemoveOpSpec.groovy | 0 .../grgit/operation/BranchStatusOpSpec.groovy | 0 .../grgit/operation/CheckoutOpSpec.groovy | 0 .../grgit/operation/CleanOpSpec.groovy | 0 .../grgit/operation/CloneOpSpec.groovy | 0 .../grgit/operation/CommitOpSpec.groovy | 0 .../grgit/operation/DescribeOpSpec.groovy | 0 .../grgit/operation/FetchOpSpec.groovy | 0 .../grgit/operation/GenericOpTest.java | 0 .../grgit/operation/InitOpSpec.groovy | 0 .../grgit/operation/LogOpSpec.groovy | 0 .../grgit/operation/LsRemoteOpSpec.groovy | 0 .../grgit/operation/MergeOpSpec.groovy | 0 .../grgit/operation/OpenOpSpec.groovy | 0 .../grgit/operation/PullOpSpec.groovy | 0 .../grgit/operation/PushOpSpec.groovy | 0 .../grgit/operation/RemoteAddOpSpec.groovy | 0 .../grgit/operation/RemoteListOpSpec.groovy | 0 .../grgit/operation/ResetOpSpec.groovy | 0 .../grgit/operation/RevertOpSpec.groovy | 0 .../grgit/operation/RmOpSpec.groovy | 0 .../grgit/operation/ShowOpSpec.groovy | 0 .../grgit/operation/StatusOpSpec.groovy | 0 .../grgit/operation/TagAddOpSpec.groovy | 0 .../grgit/operation/TagListOpSpec.groovy | 0 .../grgit/operation/TagRemoveOpSpec.groovy | 0 .../ajoberstar/grgit/util/JGitUtilSpec.groovy | 0 .../ajoberstar/grgit/operation/sample.patch | 0 .../.stutter}/java8.lock | 2 +- .../.stutter}/java9.lock | 2 +- grgit-gradle/build.gradle | 51 ++++++ .../compatTestCompileClasspath.lockfile | 8 - .../compatTestRuntimeClasspath.lockfile | 0 .../compileClasspath.lockfile | 13 ++ .../gradle}/dependency-locks/default.lockfile | 0 .../runtimeClasspath.lockfile | 0 .../testCompileClasspath.lockfile | 13 ++ .../testRuntimeClasspath.lockfile | 0 .../grgit/gradle/BaseCompatTest.groovy | 0 .../grgit/gradle/GrgitPlugin.groovy | 0 .../org.ajoberstar.grgit.properties | 0 settings.gradle | 4 + 142 files changed, 241 insertions(+), 281 deletions(-) create mode 100644 gradle/bintray.gradle delete mode 100644 gradle/dependency-locks/annotationProcessor.lockfile delete mode 100644 gradle/dependency-locks/archives.lockfile delete mode 100644 gradle/dependency-locks/compatTestAnnotationProcessor.lockfile delete mode 100644 gradle/dependency-locks/compatTestCompileOnly.lockfile delete mode 100644 gradle/dependency-locks/compileOnly.lockfile delete mode 100644 gradle/dependency-locks/jbake.lockfile delete mode 100644 gradle/dependency-locks/testAnnotationProcessor.lockfile delete mode 100644 gradle/dependency-locks/testCompile.lockfile delete mode 100644 gradle/dependency-locks/testCompileOnly.lockfile delete mode 100644 gradle/dependency-locks/testRuntime.lockfile create mode 100644 gradle/locking.gradle create mode 100644 grgit-core/build.gradle rename gradle/dependency-locks/compatTestCompile.lockfile => grgit-core/gradle/dependency-locks/compile.lockfile (57%) rename {gradle => grgit-core/gradle}/dependency-locks/compileClasspath.lockfile (95%) rename gradle/dependency-locks/runtime.lockfile => grgit-core/gradle/dependency-locks/default.lockfile (95%) create mode 100644 grgit-core/gradle/dependency-locks/runtime.lockfile rename gradle/dependency-locks/compatTestRuntime.lockfile => grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile (90%) create mode 100644 grgit-core/gradle/dependency-locks/testCompile.lockfile rename {gradle => grgit-core/gradle}/dependency-locks/testCompileClasspath.lockfile (92%) create mode 100644 grgit-core/gradle/dependency-locks/testRuntime.lockfile rename {gradle => grgit-core/gradle}/dependency-locks/testRuntimeClasspath.lockfile (89%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/Branch.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/BranchStatus.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/Commit.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/CommitDiff.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/Credentials.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/Grgit.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/Person.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/PushException.java (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/Ref.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/Remote.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/Repository.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/Status.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/Tag.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/auth/AuthConfig.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/auth/GrgitSystemReader.java (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/auth/JschAgentProxyConfigCallback.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/auth/JschAgentProxySessionFactory.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/auth/TransportOpUtil.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/auth/package-info.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/internal/OpSyntax.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/internal/Operation.java (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/internal/WithOperations.java (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/internal/WithOperationsASTTransformation.java (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/AddOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/ApplyOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/BranchAddOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/BranchChangeOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/BranchListOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/BranchRemoveOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/BranchStatusOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/CheckoutOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/CleanOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/CloneOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/CommitOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/DescribeOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/FetchOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/InitOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/LogOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/LsRemoteOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/MergeOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/OpenOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/PullOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/PushOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/RemoteAddOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/RemoteListOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/ResetOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/RevertOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/RmOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/ShowOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/StatusOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/TagAddOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/TagListOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/TagRemoveOp.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/operation/package-info.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/package-info.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/service/BranchService.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/service/RemoteService.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/service/ResolveService.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/service/TagService.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/service/package-info.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/util/CoercionUtil.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/util/JGitUtil.groovy (100%) rename {src => grgit-core/src}/main/groovy/org/ajoberstar/grgit/util/package-info.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/auth/AuthConfigSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/auth/LinuxAuthenticationSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/auth/WindowsAuthenticationSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/fixtures/Categories.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/fixtures/GitTestUtil.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/fixtures/MultiGitOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/fixtures/SimpleGitOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/AddOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/ApplyOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/BranchAddOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/BranchChangeOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/BranchListOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/BranchRemoveOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/BranchStatusOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/CheckoutOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/CleanOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/CloneOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/CommitOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/DescribeOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/FetchOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/GenericOpTest.java (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/InitOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/LogOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/LsRemoteOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/MergeOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/OpenOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/PullOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/PushOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/RemoteAddOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/RemoteListOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/ResetOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/RevertOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/RmOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/ShowOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/StatusOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/TagAddOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/TagListOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/operation/TagRemoveOpSpec.groovy (100%) rename {src => grgit-core/src}/test/groovy/org/ajoberstar/grgit/util/JGitUtilSpec.groovy (100%) rename {src => grgit-core/src}/test/resources/org/ajoberstar/grgit/operation/sample.patch (100%) rename {.stutter => grgit-gradle/.stutter}/java8.lock (86%) rename {.stutter => grgit-gradle/.stutter}/java9.lock (85%) create mode 100644 grgit-gradle/build.gradle rename {gradle => grgit-gradle/gradle}/dependency-locks/compatTestCompileClasspath.lockfile (67%) rename {gradle => grgit-gradle/gradle}/dependency-locks/compatTestRuntimeClasspath.lockfile (100%) create mode 100644 grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile rename {gradle => grgit-gradle/gradle}/dependency-locks/default.lockfile (100%) rename {gradle => grgit-gradle/gradle}/dependency-locks/runtimeClasspath.lockfile (100%) create mode 100644 grgit-gradle/gradle/dependency-locks/testCompileClasspath.lockfile rename gradle/dependency-locks/compile.lockfile => grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile (100%) rename {src => grgit-gradle/src}/compatTest/groovy/org/ajoberstar/grgit/gradle/BaseCompatTest.groovy (100%) rename {src => grgit-gradle/src}/main/groovy/org/ajoberstar/grgit/gradle/GrgitPlugin.groovy (100%) rename {src => grgit-gradle/src}/main/resources/META-INF/gradle-plugins/org.ajoberstar.grgit.properties (100%) diff --git a/build.gradle b/build.gradle index bd5bcf69..03eb5f7b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,145 +1,20 @@ plugins { id 'org.ajoberstar.defaults' version '0.12.0' - id 'org.jbake.site' version '1.0.0' - id 'java-gradle-plugin' - id 'groovy' + id 'org.jbake.site' version '1.0.0' apply false } -group = 'org.ajoberstar' -description = 'The Groovy way to use Git.' +apply from: 'gradle/locking.gradle' +apply from: 'gradle/bintray.gradle' -sourceCompatibility = 8 +allprojects { + group = 'org.ajoberstar.grgit' + description = 'The Groovy way to use Git.' -// compat tests use grgit to set up and verify the tests -sourceSets { - compatTest { - compileClasspath += main.output - runtimeClasspath += main.output - } -} - -configurations.compatTestCompile.extendsFrom configurations.compile - -jbake { - srcDirName = 'docs' -} - -gitPublish { - contents { - from "${buildDir}/${jbake.destDirName}" - } -} - -gitPublishCopy.dependsOn bake - -repositories { - mavenCentral() -} - -// workaround for java-gradle-plugin adding gradleApi() to the compile classpath -configurations.compile.withDependencies { deps -> - deps.remove(dependencies.gradleApi()) -} - -// workaround for gradle-defaults excluding groovy from all configurations -configurations.all { - excludeRules = [] -} -configurations.compatTestCompile { - exclude group: 'org.codehaus.groovy' -} - -dependencyLocking { - lockAllConfigurations() -} - -dependencies { - // groovy - testCompile 'org.codehaus.groovy:groovy-all:[2.4.0, 3.0.0)' - - // gradle - compileOnly gradleApi() + plugins.withId('java') { + sourceCompatibility = 8 - // jgit - def jgitVersion = '4.11.0.201803080745-r' - compile "org.eclipse.jgit:org.eclipse.jgit:$jgitVersion" - compile "org.eclipse.jgit:org.eclipse.jgit.ui:$jgitVersion" - - // agentproxy - def agentProxyVersion = '[0.0.9,)' - compile "com.jcraft:jsch.agentproxy.core:$agentProxyVersion" - compile "com.jcraft:jsch.agentproxy.jsch:$agentProxyVersion" - compile "com.jcraft:jsch.agentproxy.pageant:$agentProxyVersion" - compile "com.jcraft:jsch.agentproxy.sshagent:$agentProxyVersion" - compile "com.jcraft:jsch.agentproxy.usocket-jna:$agentProxyVersion" - compile "com.jcraft:jsch.agentproxy.usocket-nc:$agentProxyVersion" - // agentproxy pulls this in, but we need to force a newer version - compile 'com.jcraft:jsch:[0.1.54,)' - - // logging - testCompile "org.slf4j:slf4j-api:[1.7.25,1.8.0-alpha)" // wait for final 1.8.0 to come out before letting it in - testRuntime "org.slf4j:slf4j-simple:[1.7.25,1.8.0-alpha)" - - // testing - testCompile "junit:junit:latest.release" - compatTestCompile "junit:junit:latest.release" - testCompile "org.spockframework:spock-core:1.1-groovy-2.4" - compatTestCompile "org.spockframework:spock-core:1.1-groovy-2.4" -} - -test { - useJUnit { - excludeCategories 'org.ajoberstar.grgit.fixtures.PlatformSpecific' - } -} - -['Windows', 'Linux'].each { platform -> - tasks.create("test${platform}", Test) { - useJUnit { - includeCategories "org.ajoberstar.grgit.fixtures.${platform}Specific" - } - systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', 'debug' - } -} - -stutter { - sparse = true - includeActiveRc = true - java(8) { - compatibleRange '3.0' - } - java(9) { - compatibleRange '4.2.1' - } -} - -publishing { - repositories { - maven { - name = 'bintray' - url = 'https://api.bintray.com/maven/ajoberstar/maven/grgit/;publish=1' - credentials { - username = System.env['BINTRAY_USER'] - password = System.env['BINTRAY_KEY'] - } + repositories { + mavenCentral() } } } - -pluginBundle { - website = 'https://github.com/ajoberstar/grgit' - vcsUrl = 'https://github.com/ajoberstar/grgit.git' - description = 'The Groovy way to use Git' - plugins { - publishPlugin { - id = 'org.ajoberstar.grgit' - displayName = 'The Groovy way to use Git' - tags = ['git', 'groovy'] - } - } - mavenCoordinates { - groupId = project.group - artifactId = project.name - version = project.version - } -} diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle new file mode 100644 index 00000000..effb1616 --- /dev/null +++ b/gradle/bintray.gradle @@ -0,0 +1,16 @@ +allprojects { + plugins.withId('maven-publish') { + publishing { + repositories { + maven { + name = 'bintray' + url = 'https://api.bintray.com/maven/ajoberstar/maven/grgit/;publish=1' + credentials { + username = System.env['BINTRAY_USER'] + password = System.env['BINTRAY_KEY'] + } + } + } + } + } +} diff --git a/gradle/dependency-locks/annotationProcessor.lockfile b/gradle/dependency-locks/annotationProcessor.lockfile deleted file mode 100644 index 656c5dbc..00000000 --- a/gradle/dependency-locks/annotationProcessor.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# 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. diff --git a/gradle/dependency-locks/archives.lockfile b/gradle/dependency-locks/archives.lockfile deleted file mode 100644 index 656c5dbc..00000000 --- a/gradle/dependency-locks/archives.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# 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. diff --git a/gradle/dependency-locks/compatTestAnnotationProcessor.lockfile b/gradle/dependency-locks/compatTestAnnotationProcessor.lockfile deleted file mode 100644 index 656c5dbc..00000000 --- a/gradle/dependency-locks/compatTestAnnotationProcessor.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# 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. diff --git a/gradle/dependency-locks/compatTestCompileOnly.lockfile b/gradle/dependency-locks/compatTestCompileOnly.lockfile deleted file mode 100644 index 656c5dbc..00000000 --- a/gradle/dependency-locks/compatTestCompileOnly.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# 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. diff --git a/gradle/dependency-locks/compileOnly.lockfile b/gradle/dependency-locks/compileOnly.lockfile deleted file mode 100644 index 656c5dbc..00000000 --- a/gradle/dependency-locks/compileOnly.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# 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. diff --git a/gradle/dependency-locks/jbake.lockfile b/gradle/dependency-locks/jbake.lockfile deleted file mode 100644 index 0e708d0d..00000000 --- a/gradle/dependency-locks/jbake.lockfile +++ /dev/null @@ -1,44 +0,0 @@ -# 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. -args4j:args4j:2.33 -com.beust:jcommander:1.35 -com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2 -com.googlecode.json-simple:json-simple:1.1.1 -com.orientechnologies:orient-commons:1.7.10 -com.orientechnologies:orientdb-core:1.7.10 -com.orientechnologies:orientdb-nativeos:1.7.10 -commons-collections:commons-collections:3.2.2 -commons-configuration:commons-configuration:1.10 -commons-io:commons-io:2.5 -commons-lang:commons-lang:2.6 -commons-logging:commons-logging:1.1.1 -de.neuland-bfi:jade4j:1.2.5 -junit:junit:4.10 -net.java.dev.jna:jna-platform:4.0.0 -net.java.dev.jna:jna:4.0.0 -ognl:ognl:3.1.12 -org.apache.commons:commons-jexl:2.1.1 -org.apache.commons:commons-lang3:3.4 -org.asciidoctor:asciidoctorj:1.5.4.1 -org.attoparser:attoparser:2.0.2.RELEASE -org.codehaus.groovy:groovy-templates:2.4.8 -org.codehaus.groovy:groovy-xml:2.4.8 -org.codehaus.groovy:groovy:2.4.8 -org.freemarker:freemarker:2.3.25-incubating -org.hamcrest:hamcrest-core:1.1 -org.javassist:javassist:3.20.0-GA -org.jbake:jbake-core:2.5.1 -org.jruby:jruby-complete:1.7.25 -org.ow2.asm:asm-analysis:5.0.3 -org.ow2.asm:asm-tree:5.0.3 -org.ow2.asm:asm-util:5.0.3 -org.ow2.asm:asm:5.0.3 -org.parboiled:parboiled-core:1.1.7 -org.parboiled:parboiled-java:1.1.7 -org.pegdown:pegdown:1.6.0 -org.slf4j:jul-to-slf4j:1.7.22 -org.slf4j:slf4j-api:1.7.22 -org.thymeleaf:thymeleaf:3.0.3.RELEASE -org.unbescape:unbescape:1.1.4.RELEASE -org.xerial.snappy:snappy-java:1.1.0.1 diff --git a/gradle/dependency-locks/testAnnotationProcessor.lockfile b/gradle/dependency-locks/testAnnotationProcessor.lockfile deleted file mode 100644 index 656c5dbc..00000000 --- a/gradle/dependency-locks/testAnnotationProcessor.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# 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. diff --git a/gradle/dependency-locks/testCompile.lockfile b/gradle/dependency-locks/testCompile.lockfile deleted file mode 100644 index 35e300c3..00000000 --- a/gradle/dependency-locks/testCompile.lockfile +++ /dev/null @@ -1,25 +0,0 @@ -# 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.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.apache.httpcomponents:httpclient:4.5.2 -org.apache.httpcomponents:httpcore:4.4.4 -org.codehaus.groovy:groovy-all:2.4.9 -org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r -org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r -org.hamcrest:hamcrest-core:1.3 -org.slf4j:slf4j-api:1.7.25 -org.spockframework:spock-core:1.1-groovy-2.4 diff --git a/gradle/dependency-locks/testCompileOnly.lockfile b/gradle/dependency-locks/testCompileOnly.lockfile deleted file mode 100644 index 656c5dbc..00000000 --- a/gradle/dependency-locks/testCompileOnly.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# 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. diff --git a/gradle/dependency-locks/testRuntime.lockfile b/gradle/dependency-locks/testRuntime.lockfile deleted file mode 100644 index 5b0dddba..00000000 --- a/gradle/dependency-locks/testRuntime.lockfile +++ /dev/null @@ -1,26 +0,0 @@ -# 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.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.apache.httpcomponents:httpclient:4.5.2 -org.apache.httpcomponents:httpcore:4.4.4 -org.codehaus.groovy:groovy-all:2.4.9 -org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r -org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r -org.hamcrest:hamcrest-core:1.3 -org.slf4j:slf4j-api:1.7.25 -org.slf4j:slf4j-simple:1.7.25 -org.spockframework:spock-core:1.1-groovy-2.4 diff --git a/gradle/locking.gradle b/gradle/locking.gradle new file mode 100644 index 00000000..8603d6a3 --- /dev/null +++ b/gradle/locking.gradle @@ -0,0 +1,20 @@ +allprojects { + plugins.withId('java-base') { + sourceSets.all { sourceSet -> + configurations[sourceSet.compileClasspathConfigurationName].resolutionStrategy.activateDependencyLocking() + configurations[sourceSet.runtimeClasspathConfigurationName].resolutionStrategy.activateDependencyLocking() + } + + task lock { + doFirst { + assert gradle.startParameter.writeDependencyLocks + } + doLast { + sourceSets.all { sourceSet -> + configurations[sourceSet.compileClasspathConfigurationName].resolve() + configurations[sourceSet.runtimeClasspathConfigurationName].resolve() + } + } + } + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1e713643223f69affdc73b4e99866c075e2715bf..eefdf4b2d3fb4813a6828d83aea2193667b23b23 100644 GIT binary patch delta 46 zcmbQVl6lff<_+A3h1eJZyxBPvFV9z$U|?Vn1LDbyM`Siz9_AHf0f|oby5a!yYkH~DcJj^S|0ur6 + tasks.create("test${platform}", Test) { + useJUnit { + includeCategories "org.ajoberstar.grgit.fixtures.${platform}Specific" + } + systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', 'debug' + } +} + +jbake { + srcDirName = 'docs' +} + +rootProject.gitPublish { + contents { + from "${buildDir}/${jbake.destDirName}" + } +} + +rootProject.gitPublishCopy.dependsOn bake diff --git a/gradle/dependency-locks/compatTestCompile.lockfile b/grgit-core/gradle/dependency-locks/compile.lockfile similarity index 57% rename from gradle/dependency-locks/compatTestCompile.lockfile rename to grgit-core/gradle/dependency-locks/compile.lockfile index e003d2f9..9e150b31 100644 --- a/gradle/dependency-locks/compatTestCompile.lockfile +++ b/grgit-core/gradle/dependency-locks/compile.lockfile @@ -2,23 +2,12 @@ # 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.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.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.7.2 -org.spockframework:spock-core:1.1-groovy-2.4 diff --git a/gradle/dependency-locks/compileClasspath.lockfile b/grgit-core/gradle/dependency-locks/compileClasspath.lockfile similarity index 95% rename from gradle/dependency-locks/compileClasspath.lockfile rename to grgit-core/gradle/dependency-locks/compileClasspath.lockfile index 59ddf740..e8b10562 100644 --- a/gradle/dependency-locks/compileClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/compileClasspath.lockfile @@ -16,6 +16,7 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.0 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.slf4j:slf4j-api:1.7.2 diff --git a/gradle/dependency-locks/runtime.lockfile b/grgit-core/gradle/dependency-locks/default.lockfile similarity index 95% rename from gradle/dependency-locks/runtime.lockfile rename to grgit-core/gradle/dependency-locks/default.lockfile index 59ddf740..e8b10562 100644 --- a/gradle/dependency-locks/runtime.lockfile +++ b/grgit-core/gradle/dependency-locks/default.lockfile @@ -16,6 +16,7 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.0 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.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/runtime.lockfile b/grgit-core/gradle/dependency-locks/runtime.lockfile new file mode 100644 index 00000000..9e150b31 --- /dev/null +++ b/grgit-core/gradle/dependency-locks/runtime.lockfile @@ -0,0 +1,13 @@ +# 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.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.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.slf4j:slf4j-api:1.7.2 diff --git a/gradle/dependency-locks/compatTestRuntime.lockfile b/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile similarity index 90% rename from gradle/dependency-locks/compatTestRuntime.lockfile rename to grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile index e003d2f9..e8b10562 100644 --- a/gradle/dependency-locks/compatTestRuntime.lockfile +++ b/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -12,13 +12,11 @@ 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.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.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.7.2 -org.spockframework:spock-core:1.1-groovy-2.4 diff --git a/grgit-core/gradle/dependency-locks/testCompile.lockfile b/grgit-core/gradle/dependency-locks/testCompile.lockfile new file mode 100644 index 00000000..9e150b31 --- /dev/null +++ b/grgit-core/gradle/dependency-locks/testCompile.lockfile @@ -0,0 +1,13 @@ +# 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.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.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.slf4j:slf4j-api:1.7.2 diff --git a/gradle/dependency-locks/testCompileClasspath.lockfile b/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile similarity index 92% rename from gradle/dependency-locks/testCompileClasspath.lockfile rename to grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile index 35e300c3..fc6fe891 100644 --- a/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -17,9 +17,9 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.codehaus.groovy:groovy-all:2.4.9 +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.hamcrest:hamcrest-core:1.3 -org.slf4j:slf4j-api:1.7.25 +org.slf4j:slf4j-api:1.8.0-beta2 org.spockframework:spock-core:1.1-groovy-2.4 diff --git a/grgit-core/gradle/dependency-locks/testRuntime.lockfile b/grgit-core/gradle/dependency-locks/testRuntime.lockfile new file mode 100644 index 00000000..5dace0ca --- /dev/null +++ b/grgit-core/gradle/dependency-locks/testRuntime.lockfile @@ -0,0 +1,14 @@ +# 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.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.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.slf4j:slf4j-api:1.8.0-beta2 +org.slf4j:slf4j-simple:1.8.0-beta2 diff --git a/gradle/dependency-locks/testRuntimeClasspath.lockfile b/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile similarity index 89% rename from gradle/dependency-locks/testRuntimeClasspath.lockfile rename to grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 5b0dddba..40f328e6 100644 --- a/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -17,10 +17,10 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.codehaus.groovy:groovy-all:2.4.9 +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.hamcrest:hamcrest-core:1.3 -org.slf4j:slf4j-api:1.7.25 -org.slf4j:slf4j-simple:1.7.25 +org.slf4j:slf4j-api:1.8.0-beta2 +org.slf4j:slf4j-simple:1.8.0-beta2 org.spockframework:spock-core:1.1-groovy-2.4 diff --git a/src/main/groovy/org/ajoberstar/grgit/Branch.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/Branch.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/Branch.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/Branch.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/BranchStatus.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/BranchStatus.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/BranchStatus.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/BranchStatus.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/Commit.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/Commit.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/Commit.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/Commit.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/CommitDiff.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/CommitDiff.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/CommitDiff.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/CommitDiff.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/Credentials.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/Credentials.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/Credentials.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/Credentials.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/Grgit.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/Grgit.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/Grgit.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/Grgit.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/Person.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/Person.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/Person.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/Person.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/PushException.java b/grgit-core/src/main/groovy/org/ajoberstar/grgit/PushException.java similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/PushException.java rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/PushException.java diff --git a/src/main/groovy/org/ajoberstar/grgit/Ref.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/Ref.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/Ref.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/Ref.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/Remote.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/Remote.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/Remote.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/Remote.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/Repository.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/Repository.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/Repository.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/Repository.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/Status.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/Status.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/Status.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/Status.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/Tag.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/Tag.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/Tag.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/Tag.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/auth/AuthConfig.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/AuthConfig.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/auth/AuthConfig.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/AuthConfig.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/auth/GrgitSystemReader.java b/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/GrgitSystemReader.java similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/auth/GrgitSystemReader.java rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/GrgitSystemReader.java diff --git a/src/main/groovy/org/ajoberstar/grgit/auth/JschAgentProxyConfigCallback.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/JschAgentProxyConfigCallback.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/auth/JschAgentProxyConfigCallback.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/JschAgentProxyConfigCallback.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/auth/JschAgentProxySessionFactory.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/JschAgentProxySessionFactory.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/auth/JschAgentProxySessionFactory.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/JschAgentProxySessionFactory.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/auth/TransportOpUtil.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/TransportOpUtil.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/auth/TransportOpUtil.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/TransportOpUtil.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/auth/package-info.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/package-info.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/auth/package-info.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/package-info.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/internal/OpSyntax.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/OpSyntax.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/internal/OpSyntax.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/OpSyntax.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/internal/Operation.java b/grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/Operation.java similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/internal/Operation.java rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/Operation.java diff --git a/src/main/groovy/org/ajoberstar/grgit/internal/WithOperations.java b/grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/WithOperations.java similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/internal/WithOperations.java rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/WithOperations.java diff --git a/src/main/groovy/org/ajoberstar/grgit/internal/WithOperationsASTTransformation.java b/grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/WithOperationsASTTransformation.java similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/internal/WithOperationsASTTransformation.java rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/WithOperationsASTTransformation.java diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/AddOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/AddOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/AddOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/AddOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/ApplyOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/ApplyOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/ApplyOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/ApplyOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/BranchAddOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/BranchAddOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/BranchAddOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/BranchAddOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/BranchChangeOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/BranchChangeOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/BranchChangeOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/BranchChangeOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/BranchListOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/BranchListOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/BranchListOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/BranchListOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/BranchRemoveOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/BranchRemoveOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/BranchRemoveOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/BranchRemoveOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/BranchStatusOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/BranchStatusOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/BranchStatusOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/BranchStatusOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/CheckoutOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/CheckoutOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/CheckoutOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/CheckoutOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/CleanOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/CleanOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/CleanOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/CleanOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/CloneOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/CloneOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/CloneOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/CloneOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/CommitOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/CommitOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/CommitOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/CommitOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/DescribeOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/DescribeOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/DescribeOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/DescribeOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/FetchOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/FetchOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/FetchOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/FetchOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/InitOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/InitOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/InitOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/InitOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/LogOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/LogOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/LogOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/LogOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/LsRemoteOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/LsRemoteOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/LsRemoteOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/LsRemoteOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/MergeOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/MergeOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/MergeOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/MergeOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/OpenOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/OpenOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/OpenOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/OpenOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/PullOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/PullOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/PullOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/PullOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/PushOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/PushOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/PushOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/PushOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/RemoteAddOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/RemoteAddOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/RemoteAddOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/RemoteAddOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/RemoteListOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/RemoteListOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/RemoteListOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/RemoteListOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/ResetOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/ResetOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/ResetOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/ResetOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/RevertOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/RevertOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/RevertOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/RevertOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/RmOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/RmOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/RmOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/RmOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/ShowOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/ShowOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/ShowOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/ShowOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/StatusOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/StatusOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/StatusOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/StatusOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/TagAddOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/TagAddOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/TagAddOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/TagAddOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/TagListOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/TagListOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/TagListOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/TagListOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/TagRemoveOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/TagRemoveOp.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/TagRemoveOp.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/TagRemoveOp.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/package-info.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/package-info.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/operation/package-info.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/package-info.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/package-info.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/package-info.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/package-info.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/package-info.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/service/BranchService.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/service/BranchService.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/service/BranchService.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/service/BranchService.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/service/RemoteService.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/service/RemoteService.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/service/RemoteService.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/service/RemoteService.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/service/ResolveService.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/service/ResolveService.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/service/ResolveService.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/service/ResolveService.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/service/TagService.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/service/TagService.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/service/TagService.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/service/TagService.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/service/package-info.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/service/package-info.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/service/package-info.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/service/package-info.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/util/CoercionUtil.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/util/CoercionUtil.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/util/CoercionUtil.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/util/CoercionUtil.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/util/JGitUtil.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/util/JGitUtil.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/util/JGitUtil.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/util/JGitUtil.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/util/package-info.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/util/package-info.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/util/package-info.groovy rename to grgit-core/src/main/groovy/org/ajoberstar/grgit/util/package-info.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/auth/AuthConfigSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/auth/AuthConfigSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/auth/AuthConfigSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/auth/AuthConfigSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/auth/LinuxAuthenticationSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/auth/LinuxAuthenticationSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/auth/LinuxAuthenticationSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/auth/LinuxAuthenticationSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/auth/WindowsAuthenticationSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/auth/WindowsAuthenticationSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/auth/WindowsAuthenticationSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/auth/WindowsAuthenticationSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/fixtures/Categories.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/fixtures/Categories.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/fixtures/Categories.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/fixtures/Categories.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/fixtures/GitTestUtil.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/fixtures/GitTestUtil.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/fixtures/GitTestUtil.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/fixtures/GitTestUtil.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/fixtures/MultiGitOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/fixtures/MultiGitOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/fixtures/MultiGitOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/fixtures/MultiGitOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/fixtures/SimpleGitOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/fixtures/SimpleGitOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/fixtures/SimpleGitOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/fixtures/SimpleGitOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/AddOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/AddOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/AddOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/AddOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/ApplyOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/ApplyOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/ApplyOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/ApplyOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/BranchAddOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/BranchAddOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/BranchAddOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/BranchAddOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/BranchChangeOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/BranchChangeOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/BranchChangeOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/BranchChangeOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/BranchListOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/BranchListOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/BranchListOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/BranchListOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/BranchRemoveOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/BranchRemoveOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/BranchRemoveOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/BranchRemoveOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/BranchStatusOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/BranchStatusOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/BranchStatusOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/BranchStatusOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/CheckoutOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/CheckoutOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/CheckoutOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/CheckoutOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/CleanOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/CleanOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/CleanOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/CleanOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/CloneOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/CloneOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/CloneOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/CloneOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/CommitOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/CommitOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/CommitOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/CommitOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/DescribeOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/DescribeOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/DescribeOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/DescribeOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/FetchOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/FetchOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/FetchOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/FetchOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/GenericOpTest.java b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/GenericOpTest.java similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/GenericOpTest.java rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/GenericOpTest.java diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/InitOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/InitOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/InitOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/InitOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/LogOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/LogOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/LogOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/LogOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/LsRemoteOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/LsRemoteOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/LsRemoteOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/LsRemoteOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/MergeOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/MergeOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/MergeOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/MergeOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/OpenOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/OpenOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/OpenOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/OpenOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/PullOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/PullOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/PullOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/PullOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/PushOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/PushOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/PushOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/PushOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/RemoteAddOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/RemoteAddOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/RemoteAddOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/RemoteAddOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/RemoteListOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/RemoteListOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/RemoteListOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/RemoteListOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/ResetOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/ResetOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/ResetOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/ResetOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/RevertOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/RevertOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/RevertOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/RevertOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/RmOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/RmOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/RmOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/RmOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/ShowOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/ShowOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/ShowOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/ShowOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/StatusOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/StatusOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/StatusOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/StatusOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/TagAddOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/TagAddOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/TagAddOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/TagAddOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/TagListOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/TagListOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/TagListOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/TagListOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/TagRemoveOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/TagRemoveOpSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/operation/TagRemoveOpSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/TagRemoveOpSpec.groovy diff --git a/src/test/groovy/org/ajoberstar/grgit/util/JGitUtilSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/util/JGitUtilSpec.groovy similarity index 100% rename from src/test/groovy/org/ajoberstar/grgit/util/JGitUtilSpec.groovy rename to grgit-core/src/test/groovy/org/ajoberstar/grgit/util/JGitUtilSpec.groovy diff --git a/src/test/resources/org/ajoberstar/grgit/operation/sample.patch b/grgit-core/src/test/resources/org/ajoberstar/grgit/operation/sample.patch similarity index 100% rename from src/test/resources/org/ajoberstar/grgit/operation/sample.patch rename to grgit-core/src/test/resources/org/ajoberstar/grgit/operation/sample.patch diff --git a/.stutter/java8.lock b/grgit-gradle/.stutter/java8.lock similarity index 86% rename from .stutter/java8.lock rename to grgit-gradle/.stutter/java8.lock index 441e286c..fa03940f 100644 --- a/.stutter/java8.lock +++ b/grgit-gradle/.stutter/java8.lock @@ -2,4 +2,4 @@ 3.0 3.5.1 4.0 -4.8-rc-3 +4.8.1 diff --git a/.stutter/java9.lock b/grgit-gradle/.stutter/java9.lock similarity index 85% rename from .stutter/java9.lock rename to grgit-gradle/.stutter/java9.lock index 3ce49c30..eda0013c 100644 --- a/.stutter/java9.lock +++ b/grgit-gradle/.stutter/java9.lock @@ -1,3 +1,3 @@ # DO NOT MODIFY: Generated by Stutter plugin. 4.2.1 -4.8-rc-3 +4.8.1 diff --git a/grgit-gradle/build.gradle b/grgit-gradle/build.gradle new file mode 100644 index 00000000..ad33b9af --- /dev/null +++ b/grgit-gradle/build.gradle @@ -0,0 +1,51 @@ +plugins { + id 'java-gradle-plugin' + id 'groovy' +} + +// compat tests use grgit to set up and verify the tests +sourceSets { + compatTest { + compileClasspath += main.output + runtimeClasspath += main.output + } +} + +dependencies { + compileOnly gradleApi() + + implementation project(':grgit-core') + compatTestImplementation project(':grgit-core') + + compatTestCompile 'junit:junit:latest.release' + compatTestCompile 'org.spockframework:spock-core:1.1-groovy-2.4' +} + +stutter { + sparse = true + includeActiveRc = true + java(8) { + compatibleRange '3.0' + } + java(9) { + compatibleRange '4.2.1' + } +} + +pluginBundle { + website = 'https://github.com/ajoberstar/grgit' + vcsUrl = 'https://github.com/ajoberstar/grgit.git' + description = 'The Groovy way to use Git' + plugins { + publishPlugin { + id = 'org.ajoberstar.grgit' + displayName = 'The Groovy way to use Git' + tags = ['git', 'groovy'] + } + } + mavenCoordinates { + groupId = project.group + artifactId = project.name + version = project.version + } +} diff --git a/gradle/dependency-locks/compatTestCompileClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile similarity index 67% rename from gradle/dependency-locks/compatTestCompileClasspath.lockfile rename to grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile index e003d2f9..8d6f41c9 100644 --- a/gradle/dependency-locks/compatTestCompileClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile @@ -2,19 +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.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 diff --git a/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile similarity index 100% rename from gradle/dependency-locks/compatTestRuntimeClasspath.lockfile rename to grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile diff --git a/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile new file mode 100644 index 00000000..9e150b31 --- /dev/null +++ b/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile @@ -0,0 +1,13 @@ +# 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.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.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.slf4j:slf4j-api:1.7.2 diff --git a/gradle/dependency-locks/default.lockfile b/grgit-gradle/gradle/dependency-locks/default.lockfile similarity index 100% rename from gradle/dependency-locks/default.lockfile rename to grgit-gradle/gradle/dependency-locks/default.lockfile diff --git a/gradle/dependency-locks/runtimeClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/runtimeClasspath.lockfile similarity index 100% rename from gradle/dependency-locks/runtimeClasspath.lockfile rename to grgit-gradle/gradle/dependency-locks/runtimeClasspath.lockfile diff --git a/grgit-gradle/gradle/dependency-locks/testCompileClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/testCompileClasspath.lockfile new file mode 100644 index 00000000..9e150b31 --- /dev/null +++ b/grgit-gradle/gradle/dependency-locks/testCompileClasspath.lockfile @@ -0,0 +1,13 @@ +# 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.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.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.slf4j:slf4j-api:1.7.2 diff --git a/gradle/dependency-locks/compile.lockfile b/grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile similarity index 100% rename from gradle/dependency-locks/compile.lockfile rename to grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile diff --git a/src/compatTest/groovy/org/ajoberstar/grgit/gradle/BaseCompatTest.groovy b/grgit-gradle/src/compatTest/groovy/org/ajoberstar/grgit/gradle/BaseCompatTest.groovy similarity index 100% rename from src/compatTest/groovy/org/ajoberstar/grgit/gradle/BaseCompatTest.groovy rename to grgit-gradle/src/compatTest/groovy/org/ajoberstar/grgit/gradle/BaseCompatTest.groovy diff --git a/src/main/groovy/org/ajoberstar/grgit/gradle/GrgitPlugin.groovy b/grgit-gradle/src/main/groovy/org/ajoberstar/grgit/gradle/GrgitPlugin.groovy similarity index 100% rename from src/main/groovy/org/ajoberstar/grgit/gradle/GrgitPlugin.groovy rename to grgit-gradle/src/main/groovy/org/ajoberstar/grgit/gradle/GrgitPlugin.groovy diff --git a/src/main/resources/META-INF/gradle-plugins/org.ajoberstar.grgit.properties b/grgit-gradle/src/main/resources/META-INF/gradle-plugins/org.ajoberstar.grgit.properties similarity index 100% rename from src/main/resources/META-INF/gradle-plugins/org.ajoberstar.grgit.properties rename to grgit-gradle/src/main/resources/META-INF/gradle-plugins/org.ajoberstar.grgit.properties diff --git a/settings.gradle b/settings.gradle index 8bd30da9..8935c8cd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,7 @@ rootProject.name = 'grgit' + +include 'grgit-core' +include 'grgit-gradle' + enableFeaturePreview('STABLE_PUBLISHING') enableFeaturePreview('IMPROVED_POM_SUPPORT') From 9313853863c7139f1f6f444f81ad3d0c4bb348d8 Mon Sep 17 00:00:00 2001 From: Andrew Oberstar Date: Mon, 2 Jul 2018 20:45:03 -0500 Subject: [PATCH 02/11] Upgrade to Groovy 2.5 Update the core lib's dependencies to Groovy 2.5. Gradle still seems to work fine with its 2.4 version. This fixes #237. --- grgit-core/build.gradle | 12 ++++++++++-- .../dependency-locks/compileClasspath.lockfile | 2 +- .../gradle/dependency-locks/default.lockfile | 2 +- .../dependency-locks/runtimeClasspath.lockfile | 2 +- .../testCompileClasspath.lockfile | 16 ++++++++++++++-- .../testRuntimeClasspath.lockfile | 16 ++++++++++++++-- 6 files changed, 41 insertions(+), 9 deletions(-) diff --git a/grgit-core/build.gradle b/grgit-core/build.gradle index c41dbf1e..69577045 100644 --- a/grgit-core/build.gradle +++ b/grgit-core/build.gradle @@ -3,9 +3,15 @@ plugins { id 'groovy' } +repositories { + maven { + url = 'https://oss.sonatype.org/content/repositories/snapshots/' + } +} + dependencies { // groovy - implementation 'org.codehaus.groovy:groovy-all:2.4.15' + implementation 'org.codehaus.groovy:groovy:[2.5.0, 2.6.0-alpha)' // jgit def jgitVersion = '4.11.0.201803080745-r' @@ -32,7 +38,9 @@ dependencies { // testing testImplementation 'junit:junit:latest.release' - testImplementation 'org.spockframework:spock-core:1.1-groovy-2.4' + testImplementation('org.spockframework:spock-core:1.2-groovy-2.5-SNAPSHOT') { + exclude group: 'org.codehaus.groovy', module: 'groovy-xml' + } } test { diff --git a/grgit-core/gradle/dependency-locks/compileClasspath.lockfile b/grgit-core/gradle/dependency-locks/compileClasspath.lockfile index e8b10562..25f6a27a 100644 --- a/grgit-core/gradle/dependency-locks/compileClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/compileClasspath.lockfile @@ -16,7 +16,7 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.codehaus.groovy:groovy-all:2.4.15 +org.codehaus.groovy:groovy:2.5.0 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.2 diff --git a/grgit-core/gradle/dependency-locks/default.lockfile b/grgit-core/gradle/dependency-locks/default.lockfile index e8b10562..25f6a27a 100644 --- a/grgit-core/gradle/dependency-locks/default.lockfile +++ b/grgit-core/gradle/dependency-locks/default.lockfile @@ -16,7 +16,7 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.codehaus.groovy:groovy-all:2.4.15 +org.codehaus.groovy:groovy:2.5.0 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.2 diff --git a/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile b/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile index e8b10562..25f6a27a 100644 --- a/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -16,7 +16,7 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.codehaus.groovy:groovy-all:2.4.15 +org.codehaus.groovy:groovy:2.5.0 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.2 diff --git a/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile b/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile index fc6fe891..38c53cd6 100644 --- a/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -12,14 +12,26 @@ com.jcraft:jsch:0.1.54 com.jcraft:jzlib:1.1.1 commons-codec:commons-codec:1.9 commons-logging:commons-logging:1.2 +info.picocli:picocli:3.0.2 +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.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.codehaus.groovy:groovy-all:2.4.15 +org.codehaus.groovy:groovy-cli-picocli:2.5.0 +org.codehaus.groovy:groovy-console:2.5.0 +org.codehaus.groovy:groovy-groovysh:2.5.0 +org.codehaus.groovy:groovy-json:2.5.0 +org.codehaus.groovy:groovy-macro:2.5.0 +org.codehaus.groovy:groovy-nio:2.5.0 +org.codehaus.groovy:groovy-sql:2.5.0 +org.codehaus.groovy:groovy-swing:2.5.0 +org.codehaus.groovy:groovy-templates:2.5.0 +org.codehaus.groovy:groovy-test:2.5.0 +org.codehaus.groovy:groovy:2.5.0 org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.8.0-beta2 -org.spockframework:spock-core:1.1-groovy-2.4 +org.spockframework:spock-core:1.2-groovy-2.5-SNAPSHOT diff --git a/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 40f328e6..84fcdeb6 100644 --- a/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -12,15 +12,27 @@ com.jcraft:jsch:0.1.54 com.jcraft:jzlib:1.1.1 commons-codec:commons-codec:1.9 commons-logging:commons-logging:1.2 +info.picocli:picocli:3.0.2 +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.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.codehaus.groovy:groovy-all:2.4.15 +org.codehaus.groovy:groovy-cli-picocli:2.5.0 +org.codehaus.groovy:groovy-console:2.5.0 +org.codehaus.groovy:groovy-groovysh:2.5.0 +org.codehaus.groovy:groovy-json:2.5.0 +org.codehaus.groovy:groovy-macro:2.5.0 +org.codehaus.groovy:groovy-nio:2.5.0 +org.codehaus.groovy:groovy-sql:2.5.0 +org.codehaus.groovy:groovy-swing:2.5.0 +org.codehaus.groovy:groovy-templates:2.5.0 +org.codehaus.groovy:groovy-test:2.5.0 +org.codehaus.groovy:groovy:2.5.0 org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.8.0-beta2 org.slf4j:slf4j-simple:1.8.0-beta2 -org.spockframework:spock-core:1.1-groovy-2.4 +org.spockframework:spock-core:1.2-groovy-2.5-SNAPSHOT From b176114e93a7ff512676b3170e5b601770e7bc9b Mon Sep 17 00:00:00 2001 From: Andrew Oberstar Date: Mon, 2 Jul 2018 20:52:14 -0500 Subject: [PATCH 03/11] Upgrade to JGit 5 This fixes #233. --- grgit-core/build.gradle | 5 ++--- grgit-core/gradle/dependency-locks/compile.lockfile | 4 ++-- grgit-core/gradle/dependency-locks/compileClasspath.lockfile | 4 ++-- grgit-core/gradle/dependency-locks/default.lockfile | 4 ++-- grgit-core/gradle/dependency-locks/runtime.lockfile | 4 ++-- grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile | 4 ++-- grgit-core/gradle/dependency-locks/testCompile.lockfile | 4 ++-- .../gradle/dependency-locks/testCompileClasspath.lockfile | 4 ++-- grgit-core/gradle/dependency-locks/testRuntime.lockfile | 4 ++-- .../gradle/dependency-locks/testRuntimeClasspath.lockfile | 4 ++-- .../groovy/org/ajoberstar/grgit/operation/MergeOp.groovy | 2 +- .../groovy/org/ajoberstar/grgit/service/BranchService.groovy | 2 +- .../org/ajoberstar/grgit/service/ResolveService.groovy | 2 +- .../main/groovy/org/ajoberstar/grgit/util/JGitUtil.groovy | 2 +- .../dependency-locks/compatTestCompileClasspath.lockfile | 4 ++-- .../dependency-locks/compatTestRuntimeClasspath.lockfile | 4 ++-- .../gradle/dependency-locks/compileClasspath.lockfile | 4 ++-- grgit-gradle/gradle/dependency-locks/default.lockfile | 4 ++-- .../gradle/dependency-locks/runtimeClasspath.lockfile | 4 ++-- .../gradle/dependency-locks/testCompileClasspath.lockfile | 4 ++-- .../gradle/dependency-locks/testRuntimeClasspath.lockfile | 4 ++-- 21 files changed, 38 insertions(+), 39 deletions(-) diff --git a/grgit-core/build.gradle b/grgit-core/build.gradle index 69577045..33913765 100644 --- a/grgit-core/build.gradle +++ b/grgit-core/build.gradle @@ -14,9 +14,8 @@ dependencies { implementation 'org.codehaus.groovy:groovy:[2.5.0, 2.6.0-alpha)' // jgit - def jgitVersion = '4.11.0.201803080745-r' - compile "org.eclipse.jgit:org.eclipse.jgit:$jgitVersion" - compile "org.eclipse.jgit:org.eclipse.jgit.ui:$jgitVersion" + compile 'org.eclipse.jgit:org.eclipse.jgit:latest.release' + compile 'org.eclipse.jgit:org.eclipse.jgit.ui:latest.release' // agentproxy implementation 'com.jcraft:jsch.agentproxy.core:latest.release' diff --git a/grgit-core/gradle/dependency-locks/compile.lockfile b/grgit-core/gradle/dependency-locks/compile.lockfile index 9e150b31..59a42306 100644 --- a/grgit-core/gradle/dependency-locks/compile.lockfile +++ b/grgit-core/gradle/dependency-locks/compile.lockfile @@ -8,6 +8,6 @@ commons-codec:commons-codec:1.9 commons-logging:commons-logging:1.2 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.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/compileClasspath.lockfile b/grgit-core/gradle/dependency-locks/compileClasspath.lockfile index 25f6a27a..300f6ce3 100644 --- a/grgit-core/gradle/dependency-locks/compileClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/compileClasspath.lockfile @@ -17,6 +17,6 @@ net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 org.codehaus.groovy:groovy:2.5.0 -org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r -org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r +org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/default.lockfile b/grgit-core/gradle/dependency-locks/default.lockfile index 25f6a27a..300f6ce3 100644 --- a/grgit-core/gradle/dependency-locks/default.lockfile +++ b/grgit-core/gradle/dependency-locks/default.lockfile @@ -17,6 +17,6 @@ net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 org.codehaus.groovy:groovy:2.5.0 -org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r -org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r +org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/runtime.lockfile b/grgit-core/gradle/dependency-locks/runtime.lockfile index 9e150b31..59a42306 100644 --- a/grgit-core/gradle/dependency-locks/runtime.lockfile +++ b/grgit-core/gradle/dependency-locks/runtime.lockfile @@ -8,6 +8,6 @@ commons-codec:commons-codec:1.9 commons-logging:commons-logging:1.2 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.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-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 25f6a27a..300f6ce3 100644 --- a/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -17,6 +17,6 @@ net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 org.codehaus.groovy:groovy:2.5.0 -org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r -org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r +org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/testCompile.lockfile b/grgit-core/gradle/dependency-locks/testCompile.lockfile index 9e150b31..59a42306 100644 --- a/grgit-core/gradle/dependency-locks/testCompile.lockfile +++ b/grgit-core/gradle/dependency-locks/testCompile.lockfile @@ -8,6 +8,6 @@ commons-codec:commons-codec:1.9 commons-logging:commons-logging:1.2 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.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-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 38c53cd6..9a13f042 100644 --- a/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -30,8 +30,8 @@ org.codehaus.groovy:groovy-swing:2.5.0 org.codehaus.groovy:groovy-templates:2.5.0 org.codehaus.groovy:groovy-test:2.5.0 org.codehaus.groovy:groovy:2.5.0 -org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r -org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r +org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.8.0-beta2 org.spockframework:spock-core:1.2-groovy-2.5-SNAPSHOT diff --git a/grgit-core/gradle/dependency-locks/testRuntime.lockfile b/grgit-core/gradle/dependency-locks/testRuntime.lockfile index 5dace0ca..ae9110c5 100644 --- a/grgit-core/gradle/dependency-locks/testRuntime.lockfile +++ b/grgit-core/gradle/dependency-locks/testRuntime.lockfile @@ -8,7 +8,7 @@ commons-codec:commons-codec:1.9 commons-logging:commons-logging:1.2 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.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.slf4j:slf4j-api:1.8.0-beta2 org.slf4j:slf4j-simple:1.8.0-beta2 diff --git a/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 84fcdeb6..3f0ac7b5 100644 --- a/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -30,8 +30,8 @@ org.codehaus.groovy:groovy-swing:2.5.0 org.codehaus.groovy:groovy-templates:2.5.0 org.codehaus.groovy:groovy-test:2.5.0 org.codehaus.groovy:groovy:2.5.0 -org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r -org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r +org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.8.0-beta2 org.slf4j:slf4j-simple:1.8.0-beta2 diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/MergeOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/MergeOp.groovy index f3d0208d..6b46d786 100644 --- a/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/MergeOp.groovy +++ b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/MergeOp.groovy @@ -67,7 +67,7 @@ class MergeOp implements Callable { * we want to preserve ref name in merge commit msg. if it's a ref, don't * resolve down to commit id */ - def ref = repo.jgit.repository.getRef(head) + def ref = repo.jgit.repository.findRef(head) if (ref == null) { def revstr = new ResolveService(repo).toRevisionString(head) cmd.include(JGitUtil.resolveObject(repo, revstr)) diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/service/BranchService.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/service/BranchService.groovy index e9ecf1cf..cb3749bc 100644 --- a/grgit-core/src/main/groovy/org/ajoberstar/grgit/service/BranchService.groovy +++ b/grgit-core/src/main/groovy/org/ajoberstar/grgit/service/BranchService.groovy @@ -41,7 +41,7 @@ class BranchService { * @return the branch or {@code null} if the HEAD is detached */ Branch current() { - Ref ref = repository.jgit.repository.getRef('HEAD')?.target + Ref ref = repository.jgit.repository.exactRef('HEAD')?.target return ref ? JGitUtil.resolveBranch(repository, ref) : null } diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/service/ResolveService.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/service/ResolveService.groovy index 29b64c60..57f24fd5 100644 --- a/grgit-core/src/main/groovy/org/ajoberstar/grgit/service/ResolveService.groovy +++ b/grgit-core/src/main/groovy/org/ajoberstar/grgit/service/ResolveService.groovy @@ -40,7 +40,7 @@ class ResolveService { } else if (object instanceof Commit) { return object.id } else if (object instanceof Branch || object instanceof Tag || object instanceof Ref) { - return ObjectId.toString(repository.jgit.repository.getRef(object.fullName).objectId) + return ObjectId.toString(repository.jgit.repository.exactRef(object.fullName).objectId) } else { throwIllegalArgument(object) } diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/util/JGitUtil.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/util/JGitUtil.groovy index 69113cfa..22d3f7c6 100644 --- a/grgit-core/src/main/groovy/org/ajoberstar/grgit/util/JGitUtil.groovy +++ b/grgit-core/src/main/groovy/org/ajoberstar/grgit/util/JGitUtil.groovy @@ -169,7 +169,7 @@ class JGitUtil { * @return the resolved branch */ static Branch resolveBranch(Repository repo, String name) { - Ref ref = repo.jgit.repository.getRef(name) + Ref ref = repo.jgit.repository.findRef(name) return resolveBranch(repo, ref) } diff --git a/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile index 8d6f41c9..d9f11745 100644 --- a/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile @@ -9,8 +9,8 @@ commons-logging:commons-logging:1.2 junit:junit:4.12 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.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.7.2 org.spockframework:spock-core:1.1-groovy-2.4 diff --git a/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile index e003d2f9..d0d93274 100644 --- a/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile @@ -17,8 +17,8 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.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.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.7.2 org.spockframework:spock-core:1.1-groovy-2.4 diff --git a/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile index 9e150b31..59a42306 100644 --- a/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile @@ -8,6 +8,6 @@ commons-codec:commons-codec:1.9 commons-logging:commons-logging:1.2 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.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-gradle/gradle/dependency-locks/default.lockfile b/grgit-gradle/gradle/dependency-locks/default.lockfile index 59ddf740..e9d04824 100644 --- a/grgit-gradle/gradle/dependency-locks/default.lockfile +++ b/grgit-gradle/gradle/dependency-locks/default.lockfile @@ -16,6 +16,6 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.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.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-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 59ddf740..e9d04824 100644 --- a/grgit-gradle/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/runtimeClasspath.lockfile @@ -16,6 +16,6 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.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.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-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 9e150b31..59a42306 100644 --- a/grgit-gradle/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/testCompileClasspath.lockfile @@ -8,6 +8,6 @@ commons-codec:commons-codec:1.9 commons-logging:commons-logging:1.2 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.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-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 59ddf740..e9d04824 100644 --- a/grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -16,6 +16,6 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.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.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r +org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.slf4j:slf4j-api:1.7.2 From 006b4a0ddbcd9d46b0de3c4f3bdf08d6885b158b Mon Sep 17 00:00:00 2001 From: Andrew Oberstar Date: Tue, 3 Jul 2018 20:01:55 -0500 Subject: [PATCH 04/11] Support new describe --tags option in JGit 5 Since JGit 5 changed behavior to match C Git, this allows people to revert to the previous behavior. --- docs/content/grgit-describe.ad | 4 +- .../grgit/operation/DescribeOp.groovy | 6 +++ .../grgit/operation/DescribeOpSpec.groovy | 42 ++++++++++++------- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/docs/content/grgit-describe.ad b/docs/content/grgit-describe.ad index 55f580b9..9b6d75d9 100644 --- a/docs/content/grgit-describe.ad +++ b/docs/content/grgit-describe.ad @@ -16,7 +16,7 @@ grgit.describe() [source, groovy] ---- -grgit.describe(commit: , longDescr: , match: []) +grgit.describe(commit: , longDescr: , tags: , match: []) ---- [source, groovy] @@ -24,6 +24,7 @@ grgit.describe(commit: , longDescr: , match: []) grgit.describe { commit = longDescr = + tags = match = [] } ---- @@ -38,6 +39,7 @@ Describe only shows annotated tags. For more information about creating annotate commit:: (`Object`, default `null`) Commit-ish object names to describe. Defaults to HEAD if omitted. For a more complete list of ways to spell commit names, see link:grgit-resolve.html[grgit-resolve] (specifically the `toCommit` method). longDescr:: (`boolean`, default `false`) Always output the long format (the tag, the number of commits and the abbreviated commit name) even when it matches a tag. This is useful when you want to see parts of the commit object name in "describe" output, even when the commit in question happens to be a tagged version. Instead of just emitting the tag name, it will describe such a commit as v1.2-0-gdeadbee (0th commit since tag v1.2 that points at object deadbee…​.). +tags:: (`boolean`, default `false`) Instead of using only the annotated tags, use any tag found in `refs/tags` namespace. This option enables matching a lightweight (non-annotated) tag. match:: (`List`, default `[]`) Only consider tags matching the given glob(7) pattern, excluding the "refs/tags/" prefix. This can be used to avoid leaking private tags from the repository. If multiple patterns are given they will be accumulated, and tags matching any of the patterns will be considered. == Examples diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/DescribeOp.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/DescribeOp.groovy index baff60ae..c5b0d261 100644 --- a/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/DescribeOp.groovy +++ b/grgit-core/src/main/groovy/org/ajoberstar/grgit/operation/DescribeOp.groovy @@ -31,6 +31,11 @@ class DescribeOp implements Callable { */ boolean longDescr + /** + * Include non-annotated tags when determining nearest tag. + */ + boolean tags + /** * glob patterns to match tags against before they are considered */ @@ -42,6 +47,7 @@ class DescribeOp implements Callable { cmd.setTarget(new ResolveService(repo).toRevisionString(commit)) } cmd.setLong(longDescr) + cmd.setTags(tags) if (match) { cmd.setMatch(match as String[]) } diff --git a/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/DescribeOpSpec.groovy b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/DescribeOpSpec.groovy index b2945015..6d9f2b7f 100644 --- a/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/DescribeOpSpec.groovy +++ b/grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/DescribeOpSpec.groovy @@ -4,42 +4,52 @@ import org.ajoberstar.grgit.fixtures.SimpleGitOpSpec class DescribeOpSpec extends SimpleGitOpSpec { def setup() { - grgit.commit(message:"initial commit") - grgit.tag.add(name:"initial") - grgit.commit(message:"another commit") - grgit.tag.add(name:"another") + grgit.commit(message:'initial commit') + grgit.tag.add(name:'initial') + grgit.commit(message:'another commit') + grgit.tag.add(name:'another') + grgit.commit(message:'other commit') + grgit.tag.add(name:'other', annotate: false) + } def 'with tag'() { + given: + grgit.reset(commit: 'HEAD~1', mode: 'hard') expect: - grgit.describe() == "another" + grgit.describe() == 'another' } def 'with additional commit'(){ - when: + given: repoFile('1.txt') << '1' grgit.add(patterns:['1.txt']) - grgit.commit(message: "another commit") - then: - grgit.describe().startsWith("another-1-") + grgit.commit(message: 'another commit') + expect: + grgit.describe().startsWith('another-2-') } - def 'from differnt commit'(){ - when: + def 'from different commit'(){ + given: repoFile('1.txt') << '1' grgit.add(patterns:['1.txt']) - grgit.commit(message: "another commit") - then: - grgit.describe(commit: 'HEAD~2') == "initial" + grgit.commit(message: 'another commit') + expect: + grgit.describe(commit: 'HEAD~3') == 'initial' } def 'with long description'() { expect: - grgit.describe(longDescr: true).startsWith("another-0-") + grgit.describe(longDescr: true).startsWith('another-1-') + } + + def 'with un-annotated tags'() { + expect: + grgit.describe(tags: true) == 'other' } def 'with match'() { expect: - grgit.describe(match: ['initial*']).startsWith("initial-1-") + grgit.describe(match: ['initial*']).startsWith('initial-2-') } } From 092e59328021c01d8831db25c04c82cde54c5fa8 Mon Sep 17 00:00:00 2001 From: Andrew Oberstar Date: Mon, 2 Jul 2018 20:57:56 -0500 Subject: [PATCH 05/11] Add Automatic-Module-Name in manifest To be more compatible with Java 9+. This fixes #241. --- grgit-core/build.gradle | 6 ++++++ grgit-gradle/build.gradle | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/grgit-core/build.gradle b/grgit-core/build.gradle index 33913765..188407bb 100644 --- a/grgit-core/build.gradle +++ b/grgit-core/build.gradle @@ -42,6 +42,12 @@ dependencies { } } +jar { + manifest { + attributes 'Automatic-Module-Name': 'org.ajoberstar.grgit' + } +} + test { useJUnit { excludeCategories 'org.ajoberstar.grgit.fixtures.PlatformSpecific' diff --git a/grgit-gradle/build.gradle b/grgit-gradle/build.gradle index ad33b9af..e8d183a2 100644 --- a/grgit-gradle/build.gradle +++ b/grgit-gradle/build.gradle @@ -21,6 +21,12 @@ dependencies { compatTestCompile 'org.spockframework:spock-core:1.1-groovy-2.4' } +jar { + manifest { + attributes 'Automatic-Module-Name': 'org.ajoberstar.grgit.gradle' + } +} + stutter { sparse = true includeActiveRc = true From 82ca1bdd593e98b2e7f4dc156260f7ae14581fd3 Mon Sep 17 00:00:00 2001 From: Andrew Oberstar Date: Mon, 2 Jul 2018 21:29:03 -0500 Subject: [PATCH 06/11] Remove AWT interactive creds support This adds an extra dependency for a potentially dubious use case, so seems worth dropping. This fixes #244 --- grgit-core/build.gradle | 1 - grgit-core/gradle/dependency-locks/compile.lockfile | 1 - grgit-core/gradle/dependency-locks/compileClasspath.lockfile | 1 - grgit-core/gradle/dependency-locks/default.lockfile | 1 - grgit-core/gradle/dependency-locks/runtime.lockfile | 1 - grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile | 1 - grgit-core/gradle/dependency-locks/testCompile.lockfile | 1 - .../gradle/dependency-locks/testCompileClasspath.lockfile | 1 - grgit-core/gradle/dependency-locks/testRuntime.lockfile | 1 - .../gradle/dependency-locks/testRuntimeClasspath.lockfile | 1 - .../main/groovy/org/ajoberstar/grgit/auth/AuthConfig.groovy | 5 ----- .../groovy/org/ajoberstar/grgit/auth/TransportOpUtil.groovy | 3 --- .../dependency-locks/compatTestCompileClasspath.lockfile | 1 - .../dependency-locks/compatTestRuntimeClasspath.lockfile | 1 - .../gradle/dependency-locks/compileClasspath.lockfile | 1 - grgit-gradle/gradle/dependency-locks/default.lockfile | 1 - .../gradle/dependency-locks/runtimeClasspath.lockfile | 1 - .../gradle/dependency-locks/testCompileClasspath.lockfile | 1 - .../gradle/dependency-locks/testRuntimeClasspath.lockfile | 1 - 19 files changed, 25 deletions(-) diff --git a/grgit-core/build.gradle b/grgit-core/build.gradle index 188407bb..760393bf 100644 --- a/grgit-core/build.gradle +++ b/grgit-core/build.gradle @@ -15,7 +15,6 @@ dependencies { // jgit compile 'org.eclipse.jgit:org.eclipse.jgit:latest.release' - compile 'org.eclipse.jgit:org.eclipse.jgit.ui:latest.release' // agentproxy implementation 'com.jcraft:jsch.agentproxy.core:latest.release' diff --git a/grgit-core/gradle/dependency-locks/compile.lockfile b/grgit-core/gradle/dependency-locks/compile.lockfile index 59a42306..b76f2468 100644 --- a/grgit-core/gradle/dependency-locks/compile.lockfile +++ b/grgit-core/gradle/dependency-locks/compile.lockfile @@ -8,6 +8,5 @@ commons-codec:commons-codec:1.9 commons-logging:commons-logging:1.2 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/compileClasspath.lockfile b/grgit-core/gradle/dependency-locks/compileClasspath.lockfile index 300f6ce3..a4c9ee32 100644 --- a/grgit-core/gradle/dependency-locks/compileClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/compileClasspath.lockfile @@ -17,6 +17,5 @@ net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 org.codehaus.groovy:groovy:2.5.0 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/default.lockfile b/grgit-core/gradle/dependency-locks/default.lockfile index 300f6ce3..a4c9ee32 100644 --- a/grgit-core/gradle/dependency-locks/default.lockfile +++ b/grgit-core/gradle/dependency-locks/default.lockfile @@ -17,6 +17,5 @@ net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 org.codehaus.groovy:groovy:2.5.0 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/runtime.lockfile b/grgit-core/gradle/dependency-locks/runtime.lockfile index 59a42306..b76f2468 100644 --- a/grgit-core/gradle/dependency-locks/runtime.lockfile +++ b/grgit-core/gradle/dependency-locks/runtime.lockfile @@ -8,6 +8,5 @@ commons-codec:commons-codec:1.9 commons-logging:commons-logging:1.2 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-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 300f6ce3..a4c9ee32 100644 --- a/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -17,6 +17,5 @@ net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 org.codehaus.groovy:groovy:2.5.0 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-core/gradle/dependency-locks/testCompile.lockfile b/grgit-core/gradle/dependency-locks/testCompile.lockfile index 59a42306..b76f2468 100644 --- a/grgit-core/gradle/dependency-locks/testCompile.lockfile +++ b/grgit-core/gradle/dependency-locks/testCompile.lockfile @@ -8,6 +8,5 @@ commons-codec:commons-codec:1.9 commons-logging:commons-logging:1.2 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-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 9a13f042..af0215c4 100644 --- a/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -30,7 +30,6 @@ org.codehaus.groovy:groovy-swing:2.5.0 org.codehaus.groovy:groovy-templates:2.5.0 org.codehaus.groovy:groovy-test:2.5.0 org.codehaus.groovy:groovy:2.5.0 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.8.0-beta2 diff --git a/grgit-core/gradle/dependency-locks/testRuntime.lockfile b/grgit-core/gradle/dependency-locks/testRuntime.lockfile index ae9110c5..dfc6faff 100644 --- a/grgit-core/gradle/dependency-locks/testRuntime.lockfile +++ b/grgit-core/gradle/dependency-locks/testRuntime.lockfile @@ -8,7 +8,6 @@ commons-codec:commons-codec:1.9 commons-logging:commons-logging:1.2 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.slf4j:slf4j-api:1.8.0-beta2 org.slf4j:slf4j-simple:1.8.0-beta2 diff --git a/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 3f0ac7b5..96e0e608 100644 --- a/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -30,7 +30,6 @@ org.codehaus.groovy:groovy-swing:2.5.0 org.codehaus.groovy:groovy-templates:2.5.0 org.codehaus.groovy:groovy-test:2.5.0 org.codehaus.groovy:groovy:2.5.0 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.8.0-beta2 diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/AuthConfig.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/AuthConfig.groovy index ef459e45..e8b3b972 100644 --- a/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/AuthConfig.groovy +++ b/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/AuthConfig.groovy @@ -149,11 +149,6 @@ class AuthConfig { */ HARDCODED(true), - /** - * Will prompt for credentials using an AWT window, if needed. - */ - INTERACTIVE(true), - /** * Use SSH keys in the system's sshagent process. */ diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/TransportOpUtil.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/TransportOpUtil.groovy index 640be547..af6ed6c7 100644 --- a/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/TransportOpUtil.groovy +++ b/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/TransportOpUtil.groovy @@ -43,9 +43,6 @@ final class TransportOpUtil { } else if (config.allows(AuthConfig.Option.HARDCODED) && systemCreds?.populated) { logger.info('using hardcoded credentials from system properties') return new UsernamePasswordCredentialsProvider(systemCreds.username, systemCreds.password) - } else if (config.allows(AuthConfig.Option.INTERACTIVE) && !GraphicsEnvironment.isHeadless()) { - logger.info('using interactive credentials, if needed') - return new AwtCredentialsProvider() } else { return null } diff --git a/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile index d9f11745..c3bc4db3 100644 --- a/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/compatTestCompileClasspath.lockfile @@ -9,7 +9,6 @@ commons-logging:commons-logging:1.2 junit:junit:4.12 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile index d0d93274..bf712849 100644 --- a/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/compatTestRuntimeClasspath.lockfile @@ -17,7 +17,6 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.hamcrest:hamcrest-core:1.3 org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile b/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile index 59a42306..b76f2468 100644 --- a/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/compileClasspath.lockfile @@ -8,6 +8,5 @@ commons-codec:commons-codec:1.9 commons-logging:commons-logging:1.2 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.slf4j:slf4j-api:1.7.2 diff --git a/grgit-gradle/gradle/dependency-locks/default.lockfile b/grgit-gradle/gradle/dependency-locks/default.lockfile index e9d04824..f758d822 100644 --- a/grgit-gradle/gradle/dependency-locks/default.lockfile +++ b/grgit-gradle/gradle/dependency-locks/default.lockfile @@ -16,6 +16,5 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-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 e9d04824..f758d822 100644 --- a/grgit-gradle/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/runtimeClasspath.lockfile @@ -16,6 +16,5 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-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 59a42306..b76f2468 100644 --- a/grgit-gradle/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/testCompileClasspath.lockfile @@ -8,6 +8,5 @@ commons-codec:commons-codec:1.9 commons-logging:commons-logging:1.2 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-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 e9d04824..f758d822 100644 --- a/grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/grgit-gradle/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -16,6 +16,5 @@ net.java.dev.jna:jna-platform:4.1.0 net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 -org.eclipse.jgit:org.eclipse.jgit.ui:5.0.1.201806211838-r org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r org.slf4j:slf4j-api:1.7.2 From 4cee043d6b2110281b8f6e7c2363a86fe6832707 Mon Sep 17 00:00:00 2001 From: Andrew Oberstar Date: Mon, 2 Jul 2018 22:27:31 -0500 Subject: [PATCH 07/11] Remove JSch agent support The jsch-agent project hasn't been maintained in 4 years and its been the source of many issues on the Grgit repo. We'll now leverage system SSH instead. This fixes #245. --- grgit-core/build.gradle | 29 ---- .../compileClasspath.lockfile | 8 - .../gradle/dependency-locks/default.lockfile | 8 - .../runtimeClasspath.lockfile | 8 - .../testCompileClasspath.lockfile | 8 - .../testRuntimeClasspath.lockfile | 8 - .../ajoberstar/grgit/auth/AuthConfig.groovy | 128 +------------- .../auth/JschAgentProxyConfigCallback.groovy | 33 ---- .../auth/JschAgentProxySessionFactory.groovy | 164 ------------------ .../grgit/auth/TransportOpUtil.groovy | 12 +- .../grgit/auth/AuthConfigSpec.groovy | 37 ---- .../grgit/auth/LinuxAuthenticationSpec.groovy | 74 -------- .../auth/WindowsAuthenticationSpec.groovy | 78 --------- .../compatTestRuntimeClasspath.lockfile | 8 - .../gradle/dependency-locks/default.lockfile | 8 - .../runtimeClasspath.lockfile | 8 - .../testRuntimeClasspath.lockfile | 8 - 17 files changed, 10 insertions(+), 617 deletions(-) delete mode 100644 grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/JschAgentProxyConfigCallback.groovy delete mode 100644 grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/JschAgentProxySessionFactory.groovy delete mode 100644 grgit-core/src/test/groovy/org/ajoberstar/grgit/auth/LinuxAuthenticationSpec.groovy delete mode 100644 grgit-core/src/test/groovy/org/ajoberstar/grgit/auth/WindowsAuthenticationSpec.groovy diff --git a/grgit-core/build.gradle b/grgit-core/build.gradle index 760393bf..e4388faa 100644 --- a/grgit-core/build.gradle +++ b/grgit-core/build.gradle @@ -16,20 +16,6 @@ dependencies { // jgit compile 'org.eclipse.jgit:org.eclipse.jgit:latest.release' - // agentproxy - implementation 'com.jcraft:jsch.agentproxy.core:latest.release' - implementation 'com.jcraft:jsch.agentproxy.jsch:latest.release' - implementation 'com.jcraft:jsch.agentproxy.pageant:latest.release' - implementation 'com.jcraft:jsch.agentproxy.sshagent:latest.release' - implementation 'com.jcraft:jsch.agentproxy.usocket-jna:latest.release' - implementation 'com.jcraft:jsch.agentproxy.usocket-nc:latest.release' - - constraints { - implementation('com.jcraft:jsch:[0.1.54,)') { - because 'agentproxy pulls this in, but we need fixes from a newer version' - } - } - // logging testImplementation 'org.slf4j:slf4j-api:latest.release' testRuntime 'org.slf4j:slf4j-simple:latest.release' @@ -47,21 +33,6 @@ jar { } } -test { - useJUnit { - excludeCategories 'org.ajoberstar.grgit.fixtures.PlatformSpecific' - } -} - -['Windows', 'Linux'].each { platform -> - tasks.create("test${platform}", Test) { - useJUnit { - includeCategories "org.ajoberstar.grgit.fixtures.${platform}Specific" - } - systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', 'debug' - } -} - jbake { srcDirName = 'docs' } diff --git a/grgit-core/gradle/dependency-locks/compileClasspath.lockfile b/grgit-core/gradle/dependency-locks/compileClasspath.lockfile index a4c9ee32..070fec01 100644 --- a/grgit-core/gradle/dependency-locks/compileClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/compileClasspath.lockfile @@ -2,18 +2,10 @@ # 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 -net.java.dev.jna:jna-platform:4.1.0 -net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 org.codehaus.groovy:groovy:2.5.0 diff --git a/grgit-core/gradle/dependency-locks/default.lockfile b/grgit-core/gradle/dependency-locks/default.lockfile index a4c9ee32..070fec01 100644 --- a/grgit-core/gradle/dependency-locks/default.lockfile +++ b/grgit-core/gradle/dependency-locks/default.lockfile @@ -2,18 +2,10 @@ # 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 -net.java.dev.jna:jna-platform:4.1.0 -net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 org.codehaus.groovy:groovy:2.5.0 diff --git a/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile b/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile index a4c9ee32..070fec01 100644 --- a/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -2,18 +2,10 @@ # 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 -net.java.dev.jna:jna-platform:4.1.0 -net.java.dev.jna:jna:4.1.0 org.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 org.codehaus.groovy:groovy:2.5.0 diff --git a/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile b/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile index af0215c4..a000d471 100644 --- a/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -2,12 +2,6 @@ # 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 @@ -15,8 +9,6 @@ commons-logging:commons-logging:1.2 info.picocli:picocli:3.0.2 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.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 org.codehaus.groovy:groovy-cli-picocli:2.5.0 diff --git a/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 96e0e608..3e0b0b60 100644 --- a/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/grgit-core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -2,12 +2,6 @@ # 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 @@ -15,8 +9,6 @@ commons-logging:commons-logging:1.2 info.picocli:picocli:3.0.2 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.apache.httpcomponents:httpclient:4.5.2 org.apache.httpcomponents:httpcore:4.4.4 org.codehaus.groovy:groovy-cli-picocli:2.5.0 diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/AuthConfig.groovy b/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/AuthConfig.groovy index e8b3b972..ab7804df 100644 --- a/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/AuthConfig.groovy +++ b/grgit-core/src/main/groovy/org/ajoberstar/grgit/auth/AuthConfig.groovy @@ -14,15 +14,8 @@ import org.slf4j.LoggerFactory class AuthConfig { private static final Logger logger = LoggerFactory.getLogger(AuthConfig) - /** - * System property name used to force a specific authentication option. - */ - static final String FORCE_OPTION = 'org.ajoberstar.grgit.auth.force' static final String USERNAME_OPTION = 'org.ajoberstar.grgit.auth.username' static final String PASSWORD_OPTION = 'org.ajoberstar.grgit.auth.password' - static final String SSH_PRIVATE_KEY_OPTION = 'org.ajoberstar.grgit.auth.ssh.private' - static final String SSH_PASSPHRASE_OPTION = 'org.ajoberstar.grgit.auth.ssh.passphrase' - static final String SSH_SESSION_CONFIG_OPTION_PREFIX = 'org.ajoberstar.grgit.auth.session.config.' static final String USERNAME_ENV_VAR = 'GRGIT_USER' static final String PASSWORD_ENV_VAR = 'GRGIT_PASS' @@ -34,44 +27,8 @@ class AuthConfig { this.props = props this.env = env - if (allows(Option.COMMAND)) { - GrgitSystemReader.install() - logger.info('If SSH is used, the following external command (if non-null) will be used instead of JSch: {}', SystemReader.instance.getenv('GIT_SSH')) - } else { - // TODO raise this to a warning if COMMAND seems to work well - logger.debug('JSch being used for SSH commands. Try org.ajoberstar.grgit.auth.force=command to use ssh or plink directly.') - } - } - - /** - * Set of all authentication options that are allowed in this - * configuration. - */ - Set