Merge remote-tracking branch 'origin/7.0.x'

.github/workflows/gradle.yml

@@ -3,11 +3,11 @@ on:
   push:
     branches:
       - master
-      - '[7-9]+.[1-9]+.x'
+      - '[7-9]+.[0-9]+.x'
   pull_request:
     branches:
       - master
-      - '[7-9]+.[1-9]+.x'
+      - '[7-9]+.[0-9]+.x'
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -46,14 +46,10 @@ jobs:
       - name: Publish to repo.grails.org
         if: success() && github.event_name == 'push' && matrix.java == '8'
         env:
-          SECRING_FILE: ${{ secrets.SECRING_FILE }}
-          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
-          SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
           GRAILS_CENTRAL_USERNAME: ${{ secrets.GRAILS_CENTRAL_USERNAME }}
           GRAILS_CENTRAL_PASSWORD: ${{ secrets.GRAILS_CENTRAL_PASSWORD }}
         run: |
-          echo $SECRING_FILE | base64 -d > secring.gpg
-          ./gradlew -Dorg.gradle.internal.publish.checksums.insecure=true -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="secring.gpg" publish
+          ./gradlew -Dorg.gradle.internal.publish.checksums.insecure=true publish
       - name: Extract branch name
         if: success() && github.event_name == 'push' && matrix.java == '8'
         id: extract_branch

.github/workflows/release-notes.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches:
       - master
-      - '[7-9]+.[1-9]+.x'
+      - '[7-9]+.[0-9]+.x'
 jobs:
   release_notes:
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -35,18 +35,18 @@ jobs:
         uses: micronaut-projects/github-actions/pre-release@master
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Publish, Upload to Bintray
+      - name: Publish to Sonatype OSSRH
         env:
-          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
-          BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
+          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
           SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
+          SECRING_FILE: ${{ secrets.SECRING_FILE }}
         run: |
+          echo $SECRING_FILE | base64 -d > secring.gpg
           echo "Publishing Artifacts"
-          (set -x; ./gradlew bintrayUpload --no-daemon)
+          (set -x; ./gradlew -Psigning.secretKeyRingFile="${GITHUB_WORKSPACE}/secring.gpg" publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon)
           (set -x; ./gradlew assemble --no-daemon)
       - name: Export Gradle Properties
         uses: micronaut-projects/github-actions/export-gradle-properties@master
@@ -74,18 +74,3 @@ jobs:
           ref: ${{ steps.extract_branch.outputs.value }}
           token: ${{ secrets.GH_TOKEN }}
           inputs: ${{ steps.gorm_docs_release_message.outputs.value }}
-      - name: Create Message for the Maven Central Sync
-        if: success()
-        id: maven_sync_message
-        run: |
-          echo ::set-output name=value::{\"release_version\":\"$RELEASE_VERSION\"}
-        env:
-          RELEASE_VERSION: ${{ steps.release_version.outputs.release_version }}
-      - name: Invoke the Maven Central Sync workflow
-        if: success()
-        uses: benc-uk/workflow-dispatch@v1.1
-        with:
-          workflow: Maven Central Sync
-          ref: ${{ steps.extract_branch.outputs.value }}
-          token: ${{ secrets.GH_TOKEN }}
-          inputs: ${{ steps.maven_sync_message.outputs.value }}

.travis.yml

@@ -8,7 +8,6 @@ cache:
 language: groovy
 branches:
   only:
-    - 7.0.x
     - 6.1.x
 jdk:
 - openjdk8

build.gradle

@@ -1,20 +1,21 @@
 buildscript {
     repositories {
         maven { url "https://repo.grails.org/grails/core" }
-        jcenter()
+        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5"
+        classpath "com.netflix.nebula:gradle-extra-configurations-plugin:2.2.0"
+        classpath "io.github.gradle-nexus:publish-plugin:1.0.0"
         classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
-        classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.22.0"
+        classpath "io.github.groovylang.groovydoc:groovydoc-gradle-plugin:1.0.1"
     }
 }
 
 project.ext {
     isTravisBuild = System.getenv().get("TRAVIS") == 'true'
-
+    // overall project version
     isCiBuild = project.hasProperty("isCiBuild")
-    isBuildSnapshot = project.projectVersion.endsWith("BUILD-SNAPSHOT")
+    isBuildSnapshot = version.endsWith("-SNAPSHOT")
 
     nexusUsername = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : ''
     nexusPassword = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : ''
@@ -35,7 +36,6 @@ group = "org.grails"
 
 apply plugin: 'idea'
 apply plugin: 'project-report'
-apply plugin: 'io.codearte.nexus-staging'
 
 ext {
     isCiBuild = project.hasProperty("isCiBuild")
@@ -80,7 +80,7 @@ subprojects {
         if (isGroovyProject(project)) {
             def hasSnapshotVersion = project.version.endsWith("-SNAPSHOT")
             if(isBuildSnapshot != hasSnapshotVersion) {
-                throw new StopExecutionException("${project.name} has version \"${project.version}\" which is${isBuildSnapshot ? 'n\'t' : ''} a snapshot version. Current release type is ${project.projectVersion.tokenize('.').last()}")
+                throw new StopExecutionException("${project.name} has version \"${project.version}\" which is${isBuildSnapshot ? 'n\'t' : ''} a snapshot version.")
             }
         }
     }
@@ -91,7 +91,6 @@ subprojects {
     if (isStandardGroovyMavenProject) {
         apply plugin: 'groovy'
         apply plugin: 'eclipse'
-        apply from:"${rootProject.rootDir}/gradle/publishing.gradle"
         apply plugin: 'idea'
         apply plugin: 'java-library'
         sourceCompatibility = "1.8"
@@ -246,6 +245,7 @@ dependencies {
 
 task install(dependsOn: subprojects*.tasks*.withType(PublishToMavenLocal))
 
+apply from: 'https://raw.githubusercontent.com/grails/grails-common-build/1.0.x/common-publishing.gradle'
 
 task test(dependsOn: getTasksByName("test", true)) {
      doLast {