From 1f87d94531987d4dcce6ef5af7a1061cae0a6d5d Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Tue, 3 Dec 2024 21:18:21 +0100 Subject: [PATCH 01/11] fix: Make `SecurityFilterPosition` a public class (#1037) This class was converted to Java from Groovy in 6ac0d9986be1594fc6a47cfa9e1e46b37adaa01a, and it was probably missed to add the `public` access modifier. This caused a problem for the javadoc generation. --- .../plugin/springsecurity/SecurityFilterPosition.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/src/main/groovy/grails/plugin/springsecurity/SecurityFilterPosition.java b/plugin/src/main/groovy/grails/plugin/springsecurity/SecurityFilterPosition.java index 06f1a187..3eb04ad8 100644 --- a/plugin/src/main/groovy/grails/plugin/springsecurity/SecurityFilterPosition.java +++ b/plugin/src/main/groovy/grails/plugin/springsecurity/SecurityFilterPosition.java @@ -1,4 +1,4 @@ -/* Copyright 2006-2016 the original author or authors. +/* Copyright 2006-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ /** * Stores the default order numbers of all Spring Security filters for use in configuration. - * + *

* Equivalent to org.springframework.security.config.http.SecurityFilters which * unfortunately is package-default. * * @author Burt Beckwith */ -enum SecurityFilterPosition { +public enum SecurityFilterPosition { FIRST(Integer.MIN_VALUE), From 165551f5ea163fccc13362e669375915e3ba9af8 Mon Sep 17 00:00:00 2001 From: puneetbehl Date: Wed, 4 Dec 2024 23:35:25 +0000 Subject: [PATCH 02/11] [skip ci] Release v6.1.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 16e1b5b2..de895da3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=6.1.2-SNAPSHOT +projectVersion=6.1.2 # This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs # https://github.com/grails/grails-gradle-plugin/issues/222 From 9f69106606247d3045ccdfef4896eee41e0eee34 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Wed, 4 Dec 2024 19:05:37 -0500 Subject: [PATCH 03/11] set nexusUrl directly like in grails-core --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7107a581..3b9a88b7 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ if (isReleaseVersion) { String nexusUser = findProperty('sonatypeUsername') String nexusPass = findProperty('sonatypePassword') String nexusStagingProfileId = findProperty('sonatypeStagingProfileId') - String nexusUrl = findProperty('sonatypeNexusUrl') ?: 'https://s01.oss.sonatype.org/service/local/' + String nexusUrl = uri("https://s01.oss.sonatype.org/service/local/") repositories { sonatype { nexusUrl = uri(nexusUrl) From 44e316c9f3aeb391273bb17252af9046a6921902 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Fri, 6 Dec 2024 10:24:13 -0500 Subject: [PATCH 04/11] set nexusURL to string which is later converted to URI --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3b9a88b7..678845ed 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ if (isReleaseVersion) { String nexusUser = findProperty('sonatypeUsername') String nexusPass = findProperty('sonatypePassword') String nexusStagingProfileId = findProperty('sonatypeStagingProfileId') - String nexusUrl = uri("https://s01.oss.sonatype.org/service/local/") + String nexusUrl = "https://s01.oss.sonatype.org/service/local/" repositories { sonatype { nexusUrl = uri(nexusUrl) @@ -42,4 +42,4 @@ subprojects { // Do not generate extra load on Nexus with new staging repository if signing fails tasks.withType(InitializeNexusStagingRepository).configureEach { shouldRunAfter tasks.withType(Sign) -} \ No newline at end of file +} From c00cc04a92745f7d866d4c51a25402c584adc2ac Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Fri, 6 Dec 2024 20:06:28 +0100 Subject: [PATCH 05/11] chore: back to snapshot version after failed release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index de895da3..16e1b5b2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=6.1.2 +projectVersion=6.1.2-SNAPSHOT # This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs # https://github.com/grails/grails-gradle-plugin/issues/222 From f8c732a7a0798e6ece0ba0679a462ce14e99cd69 Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Fri, 6 Dec 2024 20:10:43 +0100 Subject: [PATCH 06/11] ci: change github account in workflow --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1eae5d53..324cc25b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,14 +3,14 @@ on: release: types: [published] env: - GIT_USER_NAME: puneetbehl - GIT_USER_EMAIL: behlp@unityfoundation.io + GIT_USER_NAME: 'grails-build' + GIT_USER_EMAIL: 'grails-build@users.noreply.github.com' jobs: release: runs-on: ubuntu-latest env: - GIT_USER_NAME: puneetbehl - GIT_USER_EMAIL: behlp@unityfoundation.io + GIT_USER_NAME: 'grails-build' + GIT_USER_EMAIL: 'grails-build@users.noreply.github.com' steps: - uses: actions/checkout@v4 - uses: gradle/wrapper-validation-action@v2 From 8ed9c61a89d579d4d58d24b107930cc3211c48f7 Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Fri, 6 Dec 2024 20:45:33 +0100 Subject: [PATCH 07/11] fix(deps): update dependencies for release --- gradle/buildsrc.libs.versions.toml | 4 ++-- gradle/libs.versions.toml | 30 ++++++++++++++++-------------- plugin/build.gradle | 1 + 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/gradle/buildsrc.libs.versions.toml b/gradle/buildsrc.libs.versions.toml index 3177c3c6..5d28bc93 100644 --- a/gradle/buildsrc.libs.versions.toml +++ b/gradle/buildsrc.libs.versions.toml @@ -1,7 +1,7 @@ [versions] asciidoctorj = '4.0.2' -asset-pipeline-gradle = '4.4.0' -grails-gradle-plugin = '6.1.2' +asset-pipeline-gradle = '4.5.2' +grails-gradle-plugin = '6.2.3' webdriver-binaries = '3.2' spock = '2.3-groovy-3.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 97670006..f9864aeb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,30 +1,32 @@ [versions] -asset-pipeline = '4.3.0' +asset-pipeline = '4.5.2' +bytebuddy = '1.15.10' commons-lang = '2.6' ehcache = '2.10.9.2' geb = '6.0' -gorm-hibernate5 = '8.0.3' -grails = '6.1.2' +gorm-hibernate5 = '8.1.1' +grails = '6.2.2' grails-async-and-events = '5.0.2' -grails-datamapping = '8.0.3' -grails-gsp = '6.2.0' -grails-converters = '4.0.1' -grails-testing-support = '3.1.2' -groovy = '3.0.21' +grails-datamapping = '8.1.2' +grails-gsp = '6.2.4' +grails-converters = '5.0.0' +grails-testing-support = '3.2.2' +groovy = '3.0.23' h2database = '2.2.224' javax-annotation-api = '1.3.2' javax-servlet-api = '4.0.1' micronaut = '3.10.4' -selenium = '4.18.1' -selenium-safari = '4.18.1' +selenium = '4.27.0' +selenium-safari = '4.27.0' slf4j = '1.7.36' -spock = '2.0-groovy-3.0' -spring = '5.3.33' +spock = '2.3-groovy-3.0' +spring = '5.3.39' springboot = '2.7.18' -spring-security = '5.8.11' -tomcat = '9.0.87' +spring-security = '5.8.16' +tomcat = '9.0.97' [libraries] +bytebuddy = { module = 'net.bytebuddy:byte-buddy', version.ref = 'bytebuddy' } commons-lang = { module = 'commons-lang:commons-lang', version.ref = 'commons-lang' } ehcache = { module = 'net.sf.ehcache:ehcache', version.ref = 'ehcache' } geb-core = { module = 'org.gebish:geb-core', version.ref = 'geb' } diff --git a/plugin/build.gradle b/plugin/build.gradle index ceaecf0f..86a5e3f4 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -46,6 +46,7 @@ dependencies { testImplementation libs.spring.test testImplementation libs.spring.security.config + testRuntimeOnly libs.bytebuddy testRuntimeOnly libs.slf4j.nop // Prevents warnings about missing slf4j implementation during tests } From b6011d111245dce1f5b9bfdb32f52cb6b72986b0 Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Fri, 6 Dec 2024 22:26:53 +0100 Subject: [PATCH 08/11] build: fix sonatype nexusUrl problem (#1042) --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 678845ed..e6461238 100644 --- a/build.gradle +++ b/build.gradle @@ -14,10 +14,9 @@ if (isReleaseVersion) { String nexusUser = findProperty('sonatypeUsername') String nexusPass = findProperty('sonatypePassword') String nexusStagingProfileId = findProperty('sonatypeStagingProfileId') - String nexusUrl = "https://s01.oss.sonatype.org/service/local/" repositories { sonatype { - nexusUrl = uri(nexusUrl) + nexusUrl = uri('https://s01.oss.sonatype.org/service/local/') username = nexusUser password = nexusPass stagingProfileId = nexusStagingProfileId From c5be7940a2d1602d4b8a1d016255ecba57738731 Mon Sep 17 00:00:00 2001 From: grails-build Date: Fri, 6 Dec 2024 22:07:52 +0000 Subject: [PATCH 09/11] [skip ci] Release v6.1.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 16e1b5b2..de895da3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=6.1.2-SNAPSHOT +projectVersion=6.1.2 # This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs # https://github.com/grails/grails-gradle-plugin/issues/222 From efd1e6048569dc089c46893942bbfde71a97966e Mon Sep 17 00:00:00 2001 From: grails-build Date: Fri, 6 Dec 2024 22:10:47 +0000 Subject: [PATCH 10/11] chore: Bump version to 6.1.3-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index de895da3..5647bd94 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -projectVersion=6.1.2 +projectVersion=6.1.3-SNAPSHOT # This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs # https://github.com/grails/grails-gradle-plugin/issues/222 From 7d6cfc531fa97f37f8d6b25f1041716fc2afd4d7 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Fri, 6 Dec 2024 17:30:56 -0500 Subject: [PATCH 11/11] add bytebuddy version --- gradle/libs.versions.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3f078b42..aafd31f4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] asset-pipeline = '5.0.1' +bytebuddy = '1.15.10' commons-text = '1.12.0' ehcache = '3.10.8' geb = '7.0'