joerg/groovy-extensions
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to Gradle 8.1.1, Groovy 4.0.12

Browse source
This commit is contained in:
Jörg Prante 2023-05-21 12:46:58 +02:00
parent 4886f894f6
commit 8d82acba36
56 changed files with 163 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build.gradle
View file

@ -1,6 +1,13 @@
plugins {
id "de.marcphilipp.nexus-publish" version "0.4.0"
id "io.codearte.nexus-staging" version "0.21.1"
id "checkstyle"
id "pmd"
id 'maven-publish'
id 'signing'
id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
id "com.github.spotbugs" version "5.0.14"
id "org.cyclonedx.bom" version "1.7.2"
id "org.xbib.gradle.plugin.asciidoctor" version "2.5.2.2"
}
wrapper {
@ -24,11 +31,10 @@ ext {
}
subprojects {
apply plugin: 'java-library'
apply from: rootProject.file('gradle/ide/idea.gradle')
apply from: rootProject.file('gradle/compile/java.gradle')
apply from: rootProject.file('gradle/test/junit5.gradle')
apply from: rootProject.file('gradle/repositories/maven.gradle')
apply from: rootProject.file('gradle/publishing/publication.gradle')
apply from: rootProject.file('gradle/publish/maven.gradle')
}
apply from: rootProject.file('gradle/publishing/sonatype.gradle')
apply from: rootProject.file('gradle/publish/sonatype.gradle')

11
gradle.properties
View file

@ -1,14 +1,5 @@
group = org.xbib.groovy
name = groovy-extensions
version = 4.0.3.0
version = 4.0.12.0
org.gradle.warning.mode = ALL
groovy.version = 2.5.12
gradle.wrapper.version = 7.3
files.version = 3.0.0
ftp.version = 2.6.0
mail.version = 1.6.2
sshd.version = 2.6.0.0
junit4.version = 4.13.2
jgit.version = 5.13.0.202109080827-r
spock.version = 2.0-groovy-2.5

7
gradle/compile/groovy-dynamic-tests.gradle
View file

@ -27,3 +27,10 @@ task groovydocJar(type: Jar, dependsOn: 'groovydoc') {
from groovydoc.destinationDir
archiveClassifier.set('javadoc')
}
sourceSets {
main {
java { srcDirs = [] }
groovy { srcDirs += ['src/main/java'] }
}
}

7
gradle/compile/groovy.gradle
View file

@ -34,3 +34,10 @@ tasks.assemble.dependsOn(tasks.groovydocJar)
artifacts {
archives groovydocJar
}
sourceSets {
main {
java { srcDirs = [] }
groovy { srcDirs += ['src/main/java'] }
}
}

18
gradle/compile/java.gradle
View file

@ -3,6 +3,8 @@ apply plugin: 'java-library'
java {
modularity.inferModulePath.set(true)
withSourcesJar()
withJavadocJar()
}
compileJava {
@ -21,22 +23,6 @@ jar {
}
}
task sourcesJar(type: Jar) {
dependsOn classes
classifier 'sources'
from sourceSets.main.allSource
}
task javadocJar(type: Jar) {
dependsOn javadoc
classifier 'javadoc'
from javadoc.destinationDir
}
artifacts {
archives sourcesJar, javadocJar
}
tasks.withType(JavaCompile) {
options.compilerArgs << '-Xlint:all,-fallthrough'
}

27
gradle/publish/ivy.gradle Normal file
View file

@ -0,0 +1,27 @@
apply plugin: 'ivy-publish'
publishing {
repositories {
ivy {
url = "https://xbib.org/repo"
}
}
publications {
ivy(IvyPublication) {
from components.java
descriptor {
license {
name = 'The Apache License, Version 2.0'
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
}
author {
name = 'Jörg Prante'
url = 'http://example.com/users/jane'
}
descriptor.description {
text = rootProject.ext.description
}
}
}
}
}

21
gradle/publishing/publication.gradle → gradle/publish/maven.gradle
View file

@ -1,13 +1,10 @@
apply plugin: "de.marcphilipp.nexus-publish"
publishing {
publications {
mavenJava(MavenPublication) {
"${project.name}"(MavenPublication) {
from components.java
artifact sourcesJar
artifact javadocJar
pom {
artifactId = project.name
name = project.name
description = rootProject.ext.description
url = rootProject.ext.url
@ -49,18 +46,6 @@ publishing {
if (project.hasProperty("signing.keyId")) {
apply plugin: 'signing'
signing {
sign publishing.publications.mavenJava
}
}
if (project.hasProperty("ossrhUsername")) {
nexusPublishing {
repositories {
sonatype {
username = project.property('ossrhUsername')
password = project.property('ossrhPassword')
packageGroup = "org.xbib"
}
}
sign publishing.publications."${project.name}"
}
}

11
gradle/publish/sonatype.gradle Normal file
View file

@ -0,0 +1,11 @@
if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
nexusPublishing {
repositories {
sonatype {
username = project.property('ossrhUsername')
password = project.property('ossrhPassword')
packageGroup = "org.xbib"
}
}
}
}

11
gradle/publishing/sonatype.gradle
View file

@ -1,11 +0,0 @@
if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
apply plugin: 'io.codearte.nexus-staging'
nexusStaging {
username = project.property('ossrhUsername')
password = project.property('ossrhPassword')
packageGroup = "org.xbib"
}
}

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
groovy-git-annotations/build.gradle Normal file
View file

@ -0,0 +1,2 @@
apply from: rootProject.file('gradle/compile/groovy-dynamic-tests.gradle')

4
groovy-git/src/main/groovy/org/xbib/groovy/git/internal/AnnotateAtRuntime.java → groovy-git-annotations/src/main/groovy/org/xbib/groovy/git/annotations/AnnotateAtRuntime.java
View file

@ -1,4 +1,4 @@
package org.xbib.groovy.git.internal;
package org.xbib.groovy.git.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@ -9,7 +9,7 @@ import org.codehaus.groovy.transform.GroovyASTTransformationClass;
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.TYPE)
@GroovyASTTransformationClass("org.xbib.groovy.git.internal.AnnotateAtRuntimeASTTransformation")
@GroovyASTTransformationClass(classes = {AnnotateAtRuntimeASTTransformation.class})
public @interface AnnotateAtRuntime {
String[] annotations() default {};
}

32
groovy-git-annotations/src/main/groovy/org/xbib/groovy/git/annotations/AnnotateAtRuntimeASTTransformation.java Normal file
View file

@ -0,0 +1,32 @@
package org.xbib.groovy.git.annotations;
import java.util.List;
import org.codehaus.groovy.ast.ASTNode;
import org.codehaus.groovy.ast.AnnotatedNode;
import org.codehaus.groovy.ast.AnnotationNode;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.control.SourceUnit;
import org.codehaus.groovy.transform.AbstractASTTransformation;
import org.codehaus.groovy.transform.GroovyASTTransformation;
@GroovyASTTransformation
public final class AnnotateAtRuntimeASTTransformation extends AbstractASTTransformation {
@Override
public void visit(ASTNode[] nodes, SourceUnit source) {
AnnotationNode annotation = (AnnotationNode) nodes[0];
AnnotatedNode parent = (AnnotatedNode) nodes[1];
ClassNode clazz = (ClassNode) parent;
List<String> annotations = getMemberStringList(annotation, "annotations");
for (String name : annotations) {
// !!! UGLY HACK !!!
// Groovy won't think the class is an annotation when creating a ClassNode just based on the name.
// Instead, we create a node based on an interface and then overwrite the name to get the interface
// we actually want.
ClassNode base = new ClassNode(FunctionalInterface.class);
base.setName(name);
clazz.addAnnotation(new AnnotationNode(base));
}
}
}

7
groovy-git-annotations/src/main/groovy/org/xbib/groovy/git/annotations/Configurable.java Normal file
View file

@ -0,0 +1,7 @@
package org.xbib.groovy.git.annotations;
@FunctionalInterface
@AnnotateAtRuntime(annotations = "org.gradle.api.HasImplicitReceiver")
public interface Configurable<T> {
void configure(T t);
}

4
groovy-git/src/main/groovy/org/xbib/groovy/git/internal/OpSyntax.groovy → groovy-git-annotations/src/main/groovy/org/xbib/groovy/git/annotations/OpSyntax.groovy
View file

@ -1,9 +1,7 @@
package org.xbib.groovy.git.internal
package org.xbib.groovy.git.annotations;
import java.util.concurrent.Callable
import org.xbib.groovy.git.Configurable
class OpSyntax {
static def noArgOperation(Class<Callable> opClass, Object[] classArgs) {
def op = opClass.newInstance(classArgs)

2
groovy-git/src/main/groovy/org/xbib/groovy/git/internal/Operation.java → groovy-git-annotations/src/main/groovy/org/xbib/groovy/git/annotations/Operation.java
View file

@ -1,4 +1,4 @@
package org.xbib.groovy.git.internal;
package org.xbib.groovy.git.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

4
groovy-git/src/main/groovy/org/xbib/groovy/git/internal/WithOperations.java → groovy-git-annotations/src/main/groovy/org/xbib/groovy/git/annotations/WithOperations.java
View file

@ -1,4 +1,4 @@
package org.xbib.groovy.git.internal;
package org.xbib.groovy.git.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@ -10,7 +10,7 @@ import org.codehaus.groovy.transform.GroovyASTTransformationClass;
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.TYPE)
@GroovyASTTransformationClass("org.xbib.groovy.git.internal.WithOperationsASTTransformation")
@GroovyASTTransformationClass(classes = {WithOperationsASTTransformation.class})
public @interface WithOperations {
Class<? extends Callable<?>>[] staticOperations() default {};

9
groovy-git/src/main/groovy/org/xbib/groovy/git/internal/WithOperationsASTTransformation.java → groovy-git-annotations/src/main/groovy/org/xbib/groovy/git/annotations/WithOperationsASTTransformation.java
View file

@ -1,4 +1,4 @@
package org.xbib.groovy.git.internal;
package org.xbib.groovy.git.annotations;
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
@ -9,12 +9,12 @@ import java.util.List;
import java.util.Map;
import groovy.lang.Closure;
import org.xbib.groovy.git.Configurable;
import org.codehaus.groovy.ast.ASTNode;
import org.codehaus.groovy.ast.AnnotatedNode;
import org.codehaus.groovy.ast.AnnotationNode;
import org.codehaus.groovy.ast.ClassHelper;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.FieldNode;
import org.codehaus.groovy.ast.GenericsType;
import org.codehaus.groovy.ast.MethodNode;
import org.codehaus.groovy.ast.Parameter;
@ -163,14 +163,15 @@ public class WithOperationsASTTransformation extends AbstractASTTransformation {
return Arrays.stream(types)
.map(this::classFromType)
.map(GenericsType::new)
.toArray(GenericsType[]::new);
.toArray(size -> new GenericsType[size]);
}
public List<Expression> opConstructorParms(ClassNode targetClass, boolean isStatic) {
if (isStatic) {
return Collections.emptyList();
} else {
return Collections.singletonList(new FieldExpression(targetClass.getField("repository")));
FieldNode repo = targetClass.getField("repository");
return Arrays.asList(new FieldExpression(repo));
}
}

1
groovy-git/build.gradle
View file

@ -1,6 +1,7 @@
apply from: rootProject.file('gradle/compile/groovy-dynamic-tests.gradle')
dependencies {
api project(':groovy-git-annotations')
api libs.jgit
testImplementation libs.spock.core
testImplementation libs.spock.junit4

9
groovy-git/src/main/groovy/org/xbib/groovy/git/Configurable.groovy
View file

@ -1,9 +0,0 @@
package org.xbib.groovy.git
import org.xbib.groovy.git.internal.AnnotateAtRuntime
@FunctionalInterface
@AnnotateAtRuntime(annotations = "org.gradle.api.HasImplicitReceiver")
interface Configurable<T> {
void configure(T t)
}

2
groovy-git/src/main/groovy/org/xbib/groovy/git/Git.groovy
View file

@ -1,6 +1,6 @@
package org.xbib.groovy.git
import org.xbib.groovy.git.internal.WithOperations
import org.xbib.groovy.git.annotations.WithOperations
import org.xbib.groovy.git.operation.AddOp
import org.xbib.groovy.git.operation.ApplyOp
import org.xbib.groovy.git.operation.CheckoutOp

34
groovy-git/src/main/groovy/org/xbib/groovy/git/internal/AnnotateAtRuntimeASTTransformation.java
View file

@ -1,34 +0,0 @@
package org.xbib.groovy.git.internal;
import java.util.List;
import org.codehaus.groovy.ast.ASTNode;
import org.codehaus.groovy.ast.AnnotatedNode;
import org.codehaus.groovy.ast.AnnotationNode;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.control.SourceUnit;
import org.codehaus.groovy.transform.AbstractASTTransformation;
import org.codehaus.groovy.transform.GroovyASTTransformation;
@GroovyASTTransformation
public final class AnnotateAtRuntimeASTTransformation extends AbstractASTTransformation {
@Override
public void visit(ASTNode[] nodes, SourceUnit source) {
AnnotationNode annotation = (AnnotationNode) nodes[0];
AnnotatedNode parent = (AnnotatedNode) nodes[1];
ClassNode clazz = (ClassNode) parent;
List<String> annotations = getMemberStringList(annotation, "annotations");
for (String name : annotations) {
// !!! UGLY HACK !!!
// Groovy won't think the class is an annotation when creating a ClassNode just based on the name.
// Instead, we create a node based on an interface and then overwrite the name to get the interface
// we actually want.
ClassNode base = new ClassNode(FunctionalInterface.class);
base.setName(name);
clazz.addAnnotation(new AnnotationNode(base));
}
}
}

3
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/AddOp.groovy
View file

@ -1,9 +1,10 @@
package org.xbib.groovy.git.operation
import org.xbib.groovy.git.annotations.Operation
import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.eclipse.jgit.api.AddCommand
/**

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/ApplyOp.groovy
View file

@ -3,7 +3,7 @@ package org.xbib.groovy.git.operation
import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.util.CoercionUtil
import org.eclipse.jgit.api.ApplyCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/BranchAddOp.groovy
View file

@ -5,7 +5,7 @@ import org.eclipse.jgit.api.CreateBranchCommand.SetupUpstreamMode
import org.eclipse.jgit.lib.Ref
import org.xbib.groovy.git.Branch
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.service.ResolveService
import org.xbib.groovy.git.util.GitUtil

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/BranchChangeOp.groovy
View file

@ -4,7 +4,7 @@ import java.util.concurrent.Callable
import org.xbib.groovy.git.Branch
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.service.ResolveService
import org.xbib.groovy.git.util.GitUtil
import org.eclipse.jgit.api.CreateBranchCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/BranchListOp.groovy
View file

@ -4,7 +4,7 @@ import java.util.concurrent.Callable
import org.xbib.groovy.git.Branch
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.service.ResolveService
import org.xbib.groovy.git.util.GitUtil
import org.eclipse.jgit.api.ListBranchCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/BranchRemoveOp.groovy
View file

@ -3,7 +3,7 @@ package org.xbib.groovy.git.operation
import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.service.ResolveService
import org.eclipse.jgit.api.DeleteBranchCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/BranchStatusOp.groovy
View file

@ -5,7 +5,7 @@ import java.util.concurrent.Callable
import org.xbib.groovy.git.Branch
import org.xbib.groovy.git.BranchStatus
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.service.ResolveService
import org.eclipse.jgit.lib.BranchTrackingStatus

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/CheckoutOp.groovy
View file

@ -3,7 +3,7 @@ package org.xbib.groovy.git.operation
import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.service.ResolveService
import org.eclipse.jgit.api.CheckoutCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/CleanOp.groovy
View file

@ -3,7 +3,7 @@ package org.xbib.groovy.git.operation
import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.eclipse.jgit.api.CleanCommand
/**

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/CloneOp.groovy
View file

@ -7,7 +7,7 @@ import java.util.concurrent.Callable
import org.xbib.groovy.git.Credentials
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.auth.TransportOpUtil
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.util.CoercionUtil
import org.eclipse.jgit.api.CloneCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/CommitOp.groovy
View file

@ -5,7 +5,7 @@ import java.util.concurrent.Callable
import org.xbib.groovy.git.Commit
import org.xbib.groovy.git.Person
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.util.GitUtil
import org.eclipse.jgit.api.CommitCommand
import org.eclipse.jgit.lib.PersonIdent

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/DescribeOp.groovy
View file

@ -3,7 +3,7 @@ package org.xbib.groovy.git.operation
import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.service.ResolveService
import org.eclipse.jgit.api.DescribeCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/FetchOp.groovy
View file

@ -4,7 +4,7 @@ import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.auth.TransportOpUtil
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.eclipse.jgit.api.FetchCommand
import org.eclipse.jgit.transport.RefSpec
import org.eclipse.jgit.transport.TagOpt

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/InitOp.groovy
View file

@ -3,7 +3,7 @@ package org.xbib.groovy.git.operation
import org.xbib.groovy.git.Git
import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.util.CoercionUtil
import org.eclipse.jgit.api.InitCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/LogOp.groovy
View file

@ -3,7 +3,7 @@ package org.xbib.groovy.git.operation
import java.util.concurrent.Callable
import org.xbib.groovy.git.Commit
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.service.ResolveService
import org.xbib.groovy.git.util.GitUtil
import org.eclipse.jgit.api.LogCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/LsRemoteOp.groovy
View file

@ -4,7 +4,7 @@ import java.util.concurrent.Callable
import org.xbib.groovy.git.Ref
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.auth.TransportOpUtil
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.eclipse.jgit.api.LsRemoteCommand
import org.eclipse.jgit.lib.ObjectId

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/MergeOp.groovy
View file

@ -4,7 +4,7 @@ import org.eclipse.jgit.lib.Ref
import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.service.ResolveService
import org.xbib.groovy.git.util.GitUtil
import org.eclipse.jgit.api.MergeCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/OpenOp.groovy
View file

@ -4,7 +4,7 @@ import org.xbib.groovy.git.Git
import java.util.concurrent.Callable
import org.xbib.groovy.git.Credentials
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.util.CoercionUtil
import org.eclipse.jgit.storage.file.FileRepositoryBuilder

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/PullOp.groovy
View file

@ -4,7 +4,7 @@ import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.auth.TransportOpUtil
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.eclipse.jgit.api.PullCommand
import org.eclipse.jgit.api.PullResult

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/PushOp.groovy
View file

@ -6,7 +6,7 @@ import java.util.concurrent.Callable
import org.xbib.groovy.git.PushException
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.auth.TransportOpUtil
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.eclipse.jgit.api.PushCommand
import org.eclipse.jgit.transport.RemoteRefUpdate

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/RemoteAddOp.groovy
View file

@ -3,7 +3,7 @@ package org.xbib.groovy.git.operation
import java.util.concurrent.Callable
import org.xbib.groovy.git.Remote
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.util.GitUtil
import org.eclipse.jgit.lib.Config
import org.eclipse.jgit.transport.RefSpec

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/RemoteListOp.groovy
View file

@ -4,7 +4,7 @@ import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.Remote
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.util.GitUtil
import org.eclipse.jgit.transport.RemoteConfig

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/ResetOp.groovy
View file

@ -3,7 +3,7 @@ package org.xbib.groovy.git.operation
import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.service.ResolveService
import org.eclipse.jgit.api.ResetCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/RevertOp.groovy
View file

@ -4,7 +4,7 @@ import java.util.concurrent.Callable
import org.xbib.groovy.git.Commit
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.service.ResolveService
import org.xbib.groovy.git.util.GitUtil
import org.eclipse.jgit.api.RevertCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/RmOp.groovy
View file

@ -3,7 +3,7 @@ package org.xbib.groovy.git.operation
import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.eclipse.jgit.api.RmCommand
/**

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/ShowOp.groovy
View file

@ -6,7 +6,7 @@ import java.util.concurrent.Callable
import org.xbib.groovy.git.CommitDiff
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.service.ResolveService
import org.xbib.groovy.git.util.GitUtil
import org.eclipse.jgit.diff.DiffEntry

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/StatusOp.groovy
View file

@ -4,7 +4,7 @@ import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.Status
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.util.GitUtil
import org.eclipse.jgit.api.StatusCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/TagAddOp.groovy
View file

@ -4,7 +4,7 @@ import java.util.concurrent.Callable
import org.xbib.groovy.git.Person
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.Tag
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.service.ResolveService
import org.xbib.groovy.git.util.GitUtil
import org.eclipse.jgit.api.TagCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/TagListOp.groovy
View file

@ -3,7 +3,7 @@ package org.xbib.groovy.git.operation
import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.Tag
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.util.GitUtil
import org.eclipse.jgit.api.ListTagCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/operation/TagRemoveOp.groovy
View file

@ -2,7 +2,7 @@ package org.xbib.groovy.git.operation
import java.util.concurrent.Callable
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.Operation
import org.xbib.groovy.git.annotations.Operation
import org.xbib.groovy.git.service.ResolveService
import org.eclipse.jgit.api.DeleteTagCommand

2
groovy-git/src/main/groovy/org/xbib/groovy/git/service/BranchService.groovy
View file

@ -2,7 +2,7 @@ package org.xbib.groovy.git.service
import org.xbib.groovy.git.Branch
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.WithOperations
import org.xbib.groovy.git.annotations.WithOperations
import org.xbib.groovy.git.operation.BranchAddOp
import org.xbib.groovy.git.operation.BranchChangeOp
import org.xbib.groovy.git.operation.BranchListOp

2
groovy-git/src/main/groovy/org/xbib/groovy/git/service/RemoteService.groovy
View file

@ -1,7 +1,7 @@
package org.xbib.groovy.git.service
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.WithOperations
import org.xbib.groovy.git.annotations.WithOperations
import org.xbib.groovy.git.operation.RemoteAddOp
import org.xbib.groovy.git.operation.RemoteListOp

2
groovy-git/src/main/groovy/org/xbib/groovy/git/service/TagService.groovy
View file

@ -1,7 +1,7 @@
package org.xbib.groovy.git.service
import org.xbib.groovy.git.Repository
import org.xbib.groovy.git.internal.WithOperations
import org.xbib.groovy.git.annotations.WithOperations
import org.xbib.groovy.git.operation.TagAddOp
import org.xbib.groovy.git.operation.TagListOp
import org.xbib.groovy.git.operation.TagRemoveOp

7
settings.gradle
View file

@ -2,10 +2,10 @@
dependencyResolutionManagement {
versionCatalogs {
libs {
version('gradle', '7.4.2')
version('groovy', '4.0.3')
version('gradle', '8.1.1')
version('groovy', '4.0.12')
version('spock', '2.2-M1-groovy-4.0')
version('junit', '5.8.2')
version('junit', '5.9.3')
library('groovy-core', 'org.apache.groovy', 'groovy').versionRef('groovy')
library('spock-core', 'org.spockframework', 'spock-core').versionRef('spock')
library('spock-junit4', 'org.spockframework', 'spock-junit4').versionRef('spock')
@ -25,6 +25,7 @@ dependencyResolutionManagement {
include 'groovy-crypt'
include 'groovy-ftp'
include 'groovy-ftps'
include 'groovy-git-annotations'
include 'groovy-git'
include 'groovy-ldap'
include 'groovy-mail'