From 8e5f971062efef433aa8e23251cf938ffb7bf189 Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Thu, 12 Jun 2025 09:11:45 +0200 Subject: [PATCH 1/9] build: prevent unnecessary exclusions in the pom --- gradle.properties | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gradle.properties b/gradle.properties index d90795d..a8a4216 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,6 +5,11 @@ asciidoctorGradlePluginVersion=4.0.4 grailsGradlePluginVersion=6.2.4 version=0.1 + +# This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs +# https://github.com/grails/grails-gradle-plugin/issues/222 +slf4jPreventExclusion=true + org.gradle.caching=true org.gradle.daemon=true org.gradle.parallel=true From a95c344e45ace9374b02fd9144d84e77d77f6d2e Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Thu, 12 Jun 2025 09:12:14 +0200 Subject: [PATCH 2/9] build: update develocity plugins --- settings.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.gradle b/settings.gradle index 213ff21..72f52e2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,6 @@ plugins { - id 'com.gradle.develocity' version '3.17.1' - id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0' + id 'com.gradle.develocity' version '4.0.2' + id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.3' } def isCI = System.getenv('CI') == 'true' From dfc56fbaf0a2ebb49aecce519548b55cf4605aba Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Thu, 12 Jun 2025 09:12:53 +0200 Subject: [PATCH 3/9] build: update develocity build scan and cache settings --- settings.gradle | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/settings.gradle b/settings.gradle index 72f52e2..3b54063 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,21 +3,24 @@ plugins { id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.3' } -def isCI = System.getenv('CI') == 'true' +def isCI = System.getenv().containsKey('CI') +def isLocal = !isCI develocity { server = 'https://ge.grails.org' buildScan { - publishing.onlyIf { isCI } - uploadInBackground = !isCI + tag('grails-plugins') + tag('grails-cache-redis') + publishing.onlyIf { it.authenticated } + uploadInBackground = isLocal } } buildCache { - local { enabled = !isCI } + local { enabled = isLocal } remote(develocity.buildCache) { enabled = true - push = isCI && System.getenv('DEVELOCITY_ACCESS_KEY') + push = isCI } } From 02279faa453d39890202906eb30121e5ddf39acd Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Thu, 12 Jun 2025 09:14:15 +0200 Subject: [PATCH 4/9] build: update project name This will render an artifact name and jar file starting with `grails-`. --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 3b54063..61b83f9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -24,5 +24,5 @@ buildCache { } } -rootProject.name = "cache-redis" +rootProject.name = 'grails-cache-redis' include 'functional-tests' \ No newline at end of file From ee89a3af899ed849a3e37531cee1f1692802dc2a Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Thu, 12 Jun 2025 09:14:40 +0200 Subject: [PATCH 5/9] ci: use correct signing key id env var --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 254bf96..9aa1619 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,7 +39,7 @@ jobs: NEXUS_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PUBLISH_PASSWORD }} NEXUS_PUBLISH_URL: ${{ secrets.NEXUS_PUBLISH_RELEASE_URL }} NEXUS_PUBLISH_STAGING_PROFILE_ID: ${{ secrets.NEXUS_PUBLISH_STAGING_PROFILE_ID }} - SIGNING_KEY: ${{ secrets.SIGNING_KEY_ID }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} run: > ./gradlew From 2f10e6b49a2edb8a80f0785258585cb4b6aa8b0b Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Thu, 12 Jun 2025 09:15:43 +0200 Subject: [PATCH 6/9] build: use env vars for publish credentials --- gradle/publishing.gradle | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle index 71cdfee..c5a1b94 100644 --- a/gradle/publishing.gradle +++ b/gradle/publishing.gradle @@ -6,7 +6,7 @@ ext.set('signing.password', findProperty('signing.password') ?: System.getenv('S def javaComponent = components.named('java') publishing { publications { - register('grailsMailPlugin', MavenPublication) { + register('grailsPlugin', MavenPublication) { from javaComponent.get() versionMapping { usage('java-api') { fromResolutionOf('runtimeClasspath') } @@ -89,16 +89,16 @@ publishing { repositories { maven { credentials { - username = findProperty('artifactoryPublishUsername') ?: '' - password = findProperty('artifactoryPublishPassword') ?: '' + username = System.getenv('MAVEN_PUBLISH_USERNAME') + password = System.getenv('MAVEN_PUBLISH_PASSWORD') } - url = uri('https://repo.grails.org/grails/plugins3-snapshots-local') + url = uri(System.getenv('MAVEN_PUBLISH_URL') ?: '') } } } } -def mavenPublication = extensions.findByType(PublishingExtension).publications.named('grailsMailPlugin') +def mavenPublication = extensions.findByType(PublishingExtension).publications.named('grailsPlugin') tasks.withType(Sign).configureEach { onlyIf { isReleaseVersion } } @@ -111,15 +111,12 @@ afterEvaluate { if (isReleaseVersion) { nexusPublishing { - String sonatypeUsername = findProperty('sonatypeUsername') ?: '' - String sonatypePassword = findProperty('sonatypePassword') ?: '' - String sonatypeStagingProfileId = findProperty('sonatypeStagingProfileId') ?: '' repositories { sonatype { - nexusUrl = uri('https://s01.oss.sonatype.org/service/local/') - username = sonatypeUsername - password = sonatypePassword - stagingProfileId = sonatypeStagingProfileId + nexusUrl = uri(System.getenv('NEXUS_PUBLISH_URL')) + username = System.getenv('NEXUS_PUBLISH_USERNAME') + password = System.getenv('NEXUS_PUBLISH_PASSWORD') + stagingProfileId = System.getenv('NEXUS_PUBLISH_STAGING_PROFILE_ID') } } } From 59e431ea542e16acb3730ff950d3bb6480973acf Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Thu, 12 Jun 2025 09:24:47 +0200 Subject: [PATCH 7/9] build: prevent `null` to `Project.uri()` --- gradle/publishing.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle index c5a1b94..6ad2854 100644 --- a/gradle/publishing.gradle +++ b/gradle/publishing.gradle @@ -113,7 +113,7 @@ if (isReleaseVersion) { nexusPublishing { repositories { sonatype { - nexusUrl = uri(System.getenv('NEXUS_PUBLISH_URL')) + nexusUrl = uri(System.getenv('NEXUS_PUBLISH_URL') ?: '') username = System.getenv('NEXUS_PUBLISH_USERNAME') password = System.getenv('NEXUS_PUBLISH_PASSWORD') stagingProfileId = System.getenv('NEXUS_PUBLISH_STAGING_PROFILE_ID') From 92394acaaad7ae7b36abb047ea42f453e50a86c2 Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Thu, 12 Jun 2025 09:29:05 +0200 Subject: [PATCH 8/9] ci: set ci branch triggers --- .github/workflows/gradle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 50ffab4..7452aa4 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -2,10 +2,10 @@ name: "Java CI" on: push: branches: - - '[4-9]+(\.[0-9]+)?\.x' + - '[6-9]+.[0-9]+.x' pull_request: branches: - - '[4-9]+(\.[0-9]+)?\.x' + - '[6-9]+.[0-9]+.x' workflow_dispatch: jobs: test_project: From cd40d681939e943bef8dede131a3fdb23a2374c7 Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Thu, 12 Jun 2025 09:33:23 +0200 Subject: [PATCH 9/9] ci: set ci branch triggers --- .github/workflows/gradle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 7452aa4..9b46a5f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -2,10 +2,10 @@ name: "Java CI" on: push: branches: - - '[6-9]+.[0-9]+.x' + - '[6-9]+.x' pull_request: branches: - - '[6-9]+.[0-9]+.x' + - '[6-9]+.x' workflow_dispatch: jobs: test_project: pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy