Upgrade Gradle wrapper to version 7.6.4.

Author: blackwinter

.github/workflows/publish.yml

@@ -12,7 +12,7 @@ jobs:
         with:
           java-version: 1.8
       - name: Publish package
-        run: ./gradlew publish
+        run: ./gradlew publishAllPublicationsToGitHubPackagesRepository
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

CONTRIBUTING.md

@@ -217,6 +217,6 @@ Upload archives to sonatype (where they can be released to Maven Central)
    ```
 1. Let the release be built, signed and uploaded:
    ```
-   ./gradlew uploadArchives
+   ./gradlew publishAllPublicationsToMavenRepository
    ```
 1. Finally, go to oss.sonatype.org , check the `Staging Repositories` when it's finished, and release it by clicking `close`

README.md

@@ -77,10 +77,10 @@ $ git clone https://github.com/metafacture/metafacture-core.git
 $ cd metafacture-core
 ```
 
-2. Invoke the Gradle wrapper to download Gradle and build metafacture-core (on Windows call `gradlew.bat install` instead):
+2. Invoke the Gradle wrapper to download Gradle and build metafacture-core (on Windows call `gradlew.bat publishToMavenLocal` instead):
 
 ```bash
-$ ./gradlew install
+$ ./gradlew publishToMavenLocal
 ```
 
 Besides the resulting distribution in `metafacture-core/metafacture-runner/build/distributions/` this also provides builds in your local maven repository.

build.gradle

@@ -20,7 +20,7 @@ plugins {
   id 'org.ajoberstar.grgit' version '2.3.0'
   id 'org.ec4j.editorconfig' version '0.0.3'
   id 'org.sonarqube' version '2.6.2'
-  id 'io.codearte.nexus-staging' version '0.11.0'
+  id 'io.codearte.nexus-staging' version '0.30.0'
 }
 
 subprojects {
@@ -68,69 +68,8 @@ editorconfig {
   ]
 }
 
-def mavenProjectDescription = { proj ->
-  { it ->
-    name = proj.mavenName ?: proj.name
-    if (proj.description) {
-      description = proj.description
-    }
-    url = 'https://github.com/metafacture/metafacture-core'
-    inceptionYear = '2011'
-    developers {
-      developer {
-        id = 'mgeipel'
-        name = 'Markus M. Geipel'
-        email = '[email protected]'
-        url = 'https://github.com/mgeipel'
-        roles = ['architect', 'developer']
-      }
-      developer {
-        id = 'cboehme'
-        name = 'Christoph Böhme'
-        email = '[email protected]'
-        url = 'https://github.com/cboehme'
-        roles = ['architect', 'developer']
-      }
-    }
-    organization {
-      name = 'Metafacture'
-      url = 'https://github.com/metafacture'
-    }
-    licenses {
-      license {
-        name = 'The Apache License, Version 2.0'
-        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-      }
-    }
-    mailingLists {
-      mailingList {
-        name = 'Metafacture Mailing List'
-        post = '[email protected]'
-        subscribe = '[email protected]'
-        unsubscribe = '[email protected]'
-        archive = 'http://lists.dnb.de/pipermail/metafacture/'
-      }
-    }
-    scm {
-      connection = 'scm:git:https://github.com/metafacture/metafacture-core.git'
-      developerConnection = 'scm:git:https://github.com/metafacture/metafacture-core.git'
-      url = 'https://github.com/metafacture/metafacture-core'
-      tag = rootProject.scmInfo.tag ?: 'HEAD'
-    }
-    issueManagement {
-      system = 'Github'
-      url = 'https://github.com/metafacture/metafacture-core/issues'
-    }
-    ciManagement {
-      system = 'Github Actions'
-      url = 'https://github.com/metafacture/metafacture-core/actions'
-    }
-  }
-}
-
 subprojects {
   apply plugin: 'signing'
-  apply plugin: 'maven'
   apply plugin: 'jacoco'
   apply plugin: 'checkstyle'
   apply plugin: 'maven-publish'
@@ -193,13 +132,6 @@ subprojects {
     }
   }
 
-  signing {
-    required {
-      scmInfo.isRelease() && gradle.taskGraph.hasTask(tasks.uploadArchives)
-    }
-    sign configurations.archives
-  }
-
   repositories {
     mavenLocal()
     mavenCentral()
@@ -209,18 +141,74 @@ subprojects {
     publications {
       mavenArtifacts(MavenPublication) {
         from components.java
+
         afterEvaluate {
-          pom mavenProjectDescription(project)
           groupId = project.group
           artifactId = project.name
+
+          pom {
+            name = project.mavenName ?: project.name
+            description = project.description ?: project.name
+            url = 'https://github.com/metafacture/metafacture-core'
+            inceptionYear = '2011'
+            developers {
+              developer {
+                id = 'mgeipel'
+                name = 'Markus M. Geipel'
+                email = '[email protected]'
+                url = 'https://github.com/mgeipel'
+                roles = ['architect', 'developer']
+              }
+              developer {
+                id = 'cboehme'
+                name = 'Christoph Böhme'
+                email = '[email protected]'
+                url = 'https://github.com/cboehme'
+                roles = ['architect', 'developer']
+              }
+            }
+            organization {
+              name = 'Metafacture'
+              url = 'https://github.com/metafacture'
+            }
+            licenses {
+              license {
+                name = 'The Apache License, Version 2.0'
+                url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+              }
+            }
+            mailingLists {
+              mailingList {
+                name = 'Metafacture Mailing List'
+                post = '[email protected]'
+                subscribe = '[email protected]'
+                unsubscribe = '[email protected]'
+                archive = 'http://lists.dnb.de/pipermail/metafacture/'
+              }
+            }
+            scm {
+              connection = 'scm:git:https://github.com/metafacture/metafacture-core.git'
+              developerConnection = 'scm:git:https://github.com/metafacture/metafacture-core.git'
+              url = 'https://github.com/metafacture/metafacture-core'
+              tag = rootProject.scmInfo.tag ?: 'HEAD'
+            }
+            issueManagement {
+              system = 'Github'
+              url = 'https://github.com/metafacture/metafacture-core/issues'
+            }
+            ciManagement {
+              system = 'Github Actions'
+              url = 'https://github.com/metafacture/metafacture-core/actions'
+            }
+          }
         }
       }
     }
     repositories {
       maven {
         name = 'localEmbedded'
         // run generated gradle task `./gradlew
-        // publishMavenArtifactsPublicationToLocalEmbeddedRepository`
+        // publishAllPublicationsToLocalEmbeddedRepository`
         // to publish all subprojects into the same local embedded repo:
         url = "file://${rootDir}/build/repo"
       }
@@ -232,59 +220,38 @@ subprojects {
           password = System.getenv("GITHUB_TOKEN")
         }
       }
-    }
-  }
-}
-
-gradle.projectsEvaluated {
-  subprojects {
-    configurations {
-      mavenDeploySupport
-    }
-
-    dependencies {
-      mavenDeploySupport "org.apache.maven.wagon:wagon-http:2.2"
-    }
-
-    install {
-      repositories {
-        mavenInstaller {
-          pom.project mavenProjectDescription(project)
-          beforeDeployment {
-            MavenDeployment deployment -> signing.signPom(deployment)
+      if (scmInfo.isRelease() && project.hasProperty('releaseRepositoryUrl')) {
+        maven {
+          url = releaseRepositoryUrl
+          credentials {
+            username = releaseRepositoryUser
+            password = releaseRepositoryPassword
           }
         }
       }
-    }
-
-    uploadArchives {
-      repositories {
-        mavenDeployer {
-          configuration = configurations.mavenDeploySupport
-          if (project.hasProperty('releaseRepositoryUrl')) {
-            repository(url: releaseRepositoryUrl) {
-              if (project.hasProperty('releaseRepositoryUser')) {
-                authentication(userName: releaseRepositoryUser,
-                               password: releaseRepositoryPassword)
-              }
-            }
-          }
-          if (project.hasProperty('snapshotRepositoryUrl')) {
-            snapshotRepository(url: snapshotRepositoryUrl) {
-              if (project.hasProperty('snapshotRepositoryUser')) {
-                authentication(userName: snapshotRepositoryUser,
-                               password: snapshotRepositoryPassword)
-              }
-            }
-          }
-          pom.project mavenProjectDescription(project)
-          beforeDeployment {
-            MavenDeployment deployment -> signing.signPom(deployment)
+      else if (project.hasProperty('snapshotRepositoryUrl')) {
+        maven {
+          url = snapshotRepositoryUrl
+          credentials {
+            username = snapshotRepositoryUser
+            password = snapshotRepositoryPassword
           }
         }
       }
     }
   }
+
+  signing {
+    required {
+      scmInfo.isRelease()
+    }
+    sign publishing.publications.mavenArtifacts
+  }
+
+  task install(dependsOn: publishToMavenLocal,
+      description: "Installs the 'archives' artifacts into the local Maven repository. [deprecated]") {
+    doFirst { println "This task is deprecated; use 'publishToMavenLocal' instead." }
+  }
 }
 
 sonarqube {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=3e240228538de9f18772a574e99a0ba959e83d6ef351014381acd9631781389a
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
+distributionSha256Sum=bed1da33cca0f557ab13691c77f38bb67388119e4794d113e051039b80af9bb1
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists