Skip to content

Commit 5bda9c4

Browse files
jdaughertyjdaugherty
committed
Merge remote-tracking branch 'codeconsole/7.0.x-grails-bom' into 7.0.x
2 parents d586c81 + 7b39b36 commit 5bda9c4

File tree

5 files changed

+64
-72
lines changed

5 files changed

+64
-72
lines changed

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ on:
33
release:
44
types: [published]
55
env:
6-
GIT_USER_NAME: puneetbehl
7-
GIT_USER_EMAIL: behlp@unityfoundation.io
6+
GIT_USER_NAME: 'grails-build'
7+
GIT_USER_EMAIL: 'grails-build@users.noreply.github.com'
88
jobs:
99
release:
1010
runs-on: ubuntu-latest
1111
env:
12-
GIT_USER_NAME: puneetbehl
13-
GIT_USER_EMAIL: behlp@unityfoundation.io
12+
GIT_USER_NAME: 'grails-build'
13+
GIT_USER_EMAIL: 'grails-build@users.noreply.github.com'
1414
steps:
1515
- uses: actions/checkout@v4
1616
- uses: gradle/wrapper-validation-action@v2

‎build.gradle‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ if (isReleaseVersion) {
1414
String nexusUser = findProperty('sonatypeUsername')
1515
String nexusPass = findProperty('sonatypePassword')
1616
String nexusStagingProfileId = findProperty('sonatypeStagingProfileId')
17-
String nexusUrl = findProperty('sonatypeNexusUrl') ?: 'https://s01.oss.sonatype.org/service/local/'
1817
repositories {
1918
sonatype {
20-
nexusUrl = uri(nexusUrl)
19+
nexusUrl = uri('https://s01.oss.sonatype.org/service/local/')
2120
username = nexusUser
2221
password = nexusPass
2322
stagingProfileId = nexusStagingProfileId
@@ -26,6 +25,8 @@ if (isReleaseVersion) {
2625
}
2726
}
2827
subprojects {
28+
apply plugin: 'groovy'
29+
2930
version = rootProject.version
3031
repositories {
3132
mavenCentral()
@@ -37,6 +38,9 @@ subprojects {
3738
}
3839
}
3940
}
41+
dependencies {
42+
implementation platform(libs.grails.bom)
43+
}
4044
}
4145

4246
// Do not generate extra load on Nexus with new staging repository if signing fails

‎gradle/libs.versions.toml‎

Lines changed: 48 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,46 @@
11
[versions]
22
asset-pipeline = '5.0.1'
3-
commons-text = '1.12.0'
43
ehcache = '3.10.8'
5-
geb = '7.0'
6-
gorm-hibernate5 = '9.0.0-SNAPSHOT'
74
grails = '7.0.0-SNAPSHOT'
85
grails-async-and-events = '7.0.0-SNAPSHOT'
9-
grails-datamapping = '9.0.0-SNAPSHOT'
10-
grails-gsp = '7.0.0-SNAPSHOT'
11-
grails-converters = '6.0.0-SNAPSHOT'
12-
grails-testing-support = '4.0.0-SNAPSHOT'
136
groovy = '4.0.22'
14-
h2database = '2.3.232'
15-
jakarta-annotation-api = '3.0.0'
16-
jakarta-servlet-api = '6.0.0'
177
micronaut = '4.5.3'
188
selenium = '4.19.1'
199
selenium-safari = '4.19.1'
20-
slf4j = '2.0.16'
21-
spock = '2.3-groovy-4.0'
22-
spring = '6.1.12'
23-
springboot = '3.3.3'
24-
spring-security = '6.3.3'
25-
tomcat = '10.1.29'
2610

2711
[libraries]
28-
commons-text = { module = 'org.apache.commons:commons-text', version.ref = 'commons-text' }
12+
commons-text = { module = 'org.apache.commons:commons-text' }
2913
ehcache = { module = 'org.ehcache:ehcache', version.ref = 'ehcache' }
30-
geb-core = { module = 'org.gebish:geb-core', version.ref = 'geb' }
31-
geb-spock = { module = 'org.gebish:geb-spock', version.ref = 'geb' }
32-
gorm-hibernate5 = { module = 'org.grails.plugins:hibernate5', version.ref = 'gorm-hibernate5' }
14+
bytebuddy = { module = 'net.bytebuddy:byte-buddy' }
15+
geb-core = { module = 'org.gebish:geb-core' }
16+
geb-spock = { module = 'org.gebish:geb-spock' }
17+
gorm-hibernate5 = { module = 'org.grails.plugins:hibernate5' }
3318
grails-asset-pipeline = { module = 'com.bertramlabs.plugins:asset-pipeline-grails', version.ref = 'asset-pipeline' }
34-
grails-core = { module = 'org.grails:grails-core', version.ref = 'grails' }
35-
grails-bootstrap = { module = 'org.grails:grails-bootstrap', version.ref = 'grails' }
36-
grails-converters = { module = 'org.grails.plugins:converters', version.ref = 'grails-converters' }
37-
grails-datastore-core = { module = 'org.grails:grails-datastore-core', version.ref = 'grails-datamapping' }
38-
grails-datastore-gorm = { module = 'org.grails:grails-datastore-gorm', version.ref = 'grails-datamapping' }
39-
grails-domain = { module = 'org.grails:grails-plugin-domain-class', version.ref = 'grails' }
19+
grails-bom = { module = 'org.grails:grails-bom', version.ref = 'grails' }
20+
grails-core = { module = 'org.grails:grails-core' }
21+
grails-bootstrap = { module = 'org.grails:grails-bootstrap' }
22+
grails-converters = { module = 'org.grails.plugins:converters' }
23+
grails-datastore-core = { module = 'org.grails:grails-datastore-core'}
24+
grails-datastore-gorm = { module = 'org.grails:grails-datastore-gorm'}
25+
grails-domain = { module = 'org.grails:grails-plugin-domain-class' }
4026
grails-events-transform = { module = 'org.grails:grails-events-transform', version.ref = 'grails-async-and-events' }
41-
grails-gsp = { module = 'org.grails.plugins:gsp', version.ref = 'grails-gsp' }
42-
grails-i18n = { module = 'org.grails:grails-plugin-i18n', version.ref = 'grails' }
43-
grails-interceptors = { module = 'org.grails:grails-plugin-interceptors', version.ref = 'grails' }
44-
grails-mimetypes = { module = 'org.grails:grails-plugin-mimetypes', version.ref = 'grails' }
27+
grails-gsp = { module = 'org.grails.plugins:gsp' }
28+
grails-i18n = { module = 'org.grails:grails-plugin-i18n' }
29+
grails-interceptors = { module = 'org.grails:grails-plugin-interceptors' }
30+
grails-mimetypes = { module = 'org.grails:grails-plugin-mimetypes' }
4531
grails-plugin-async = { module = 'org.grails.plugins:async', version.ref = 'grails-async-and-events' }
46-
grails-rest = { module = 'org.grails:grails-plugin-rest', version.ref = 'grails' }
47-
grails-services = { module = 'org.grails:grails-plugin-services', version.ref = 'grails' }
48-
grails-testing-support-gorm = { module = 'org.grails:grails-gorm-testing-support', version.ref = 'grails-testing-support' }
49-
grails-testing-support-web = { module = 'org.grails:grails-web-testing-support', version.ref = 'grails-testing-support' }
50-
grails-urlmappings = { module = 'org.grails:grails-plugin-url-mappings', version.ref = 'grails' }
51-
grails-validation = { module = 'org.grails:grails-plugin-validation', version.ref = 'grails' }
52-
grails-web-common = { module = 'org.grails:grails-web-common', version.ref = 'grails' }
53-
grails-web-urlmappings = { module = 'org.grails:grails-web-url-mappings', version.ref = 'grails' }
54-
groovy-core = { module = 'org.apache.groovy:groovy', version.ref = 'groovy' }
55-
jakarta-annotation-api = { module = 'jakarta.annotation:jakarta.annotation-api', version.ref = 'jakarta-annotation-api' }
56-
jakarta-servlet-api = { module = 'jakarta.servlet:jakarta.servlet-api', version.ref = 'jakarta-servlet-api' }
57-
h2database = { module = 'com.h2database:h2', version.ref = 'h2database' }
32+
grails-rest = { module = 'org.grails:grails-plugin-rest' }
33+
grails-services = { module = 'org.grails:grails-plugin-services' }
34+
grails-testing-support-gorm = { module = 'org.grails:grails-gorm-testing-support' }
35+
grails-testing-support-web = { module = 'org.grails:grails-web-testing-support' }
36+
grails-urlmappings = { module = 'org.grails:grails-plugin-url-mappings' }
37+
grails-validation = { module = 'org.grails:grails-plugin-validation' }
38+
grails-web-common = { module = 'org.grails:grails-web-common' }
39+
grails-web-urlmappings = { module = 'org.grails:grails-web-url-mappings' }
40+
groovy-core = { module = 'org.apache.groovy:groovy' }
41+
jakarta-annotation-api = { module = 'jakarta.annotation:jakarta.annotation-api' }
42+
jakarta-servlet-api = { module = 'jakarta.servlet:jakarta.servlet-api' }
43+
h2database = { module = 'com.h2database:h2' }
5844
micronaut-httpclient = { module = 'io.micronaut:micronaut-http-client', version.ref = 'micronaut' }
5945
micronaut-inject-groovy = { module = 'io.micronaut:micronaut-inject-groovy', version.ref = 'micronaut' }
6046
micronaut-jackson-databind = { module = 'io.micronaut:micronaut-jackson-databind', version.ref = 'micronaut' }
@@ -68,26 +54,26 @@ selenium-json = { module = 'org.seleniumhq.selenium:selenium-json', version.ref
6854
selenium-remote-driver = { module = 'org.seleniumhq.selenium:selenium-remote-driver', version.ref = 'selenium' }
6955
selenium-safari-driver = { module = 'org.seleniumhq.selenium:selenium-safari-driver', version.ref = 'selenium-safari' }
7056
selenium-support = { module = 'org.seleniumhq.selenium:selenium-support', version.ref = 'selenium' }
71-
slf4j-nop = { module = 'org.slf4j:slf4j-nop', version.ref = 'slf4j' }
72-
spock-core = { module = 'org.spockframework:spock-core', version.ref = 'spock' }
73-
spring-beans = { module = 'org.springframework:spring-beans', version.ref = 'spring' }
74-
spring-core = { module = 'org.springframework:spring-core', version.ref = 'spring' }
75-
spring-context-core = { module = 'org.springframework:spring-context', version.ref = 'spring' }
76-
spring-context-support = { module = 'org.springframework:spring-context-support', version.ref = 'spring' }
77-
spring-expression = { module = 'org.springframework:spring-expression', version.ref = 'spring' }
78-
spring-security-core = { module = 'org.springframework.security:spring-security-core', version.ref = 'spring-security' }
79-
spring-security-config = { module = 'org.springframework.security:spring-security-config', version.ref = 'spring-security' }
80-
spring-security-crypto = { module = 'org.springframework.security:spring-security-crypto', version.ref = 'spring-security' }
81-
spring-security-web = { module = 'org.springframework.security:spring-security-web', version.ref = 'spring-security' }
82-
spring-test = { module = 'org.springframework:spring-test', version.ref = 'spring' }
83-
spring-tx = { module = 'org.springframework:spring-tx', version.ref = 'spring' }
84-
spring-web = { module = 'org.springframework:spring-web', version.ref = 'spring' }
85-
springboot-autoconfigure = { module = 'org.springframework.boot:spring-boot-autoconfigure', version.ref = 'springboot' }
86-
springboot-core = { module = 'org.springframework.boot:spring-boot', version.ref = 'springboot' }
87-
springboot-starter-logging = { module = 'org.springframework.boot:spring-boot-starter-logging', version.ref = 'springboot' }
88-
springboot-starter-test = { module = 'org.springframework.boot:spring-boot-starter-test', version.ref = 'springboot' }
89-
springboot-starter-tomcat = { module = 'org.springframework.boot:spring-boot-starter-tomcat', version.ref = 'springboot' }
90-
tomcat-jdbc = { module = 'org.apache.tomcat:tomcat-jdbc', version.ref = 'tomcat' }
57+
slf4j-nop = { module = 'org.slf4j:slf4j-nop' }
58+
spock-core = { module = 'org.spockframework:spock-core' }
59+
spring-beans = { module = 'org.springframework:spring-beans' }
60+
spring-core = { module = 'org.springframework:spring-core' }
61+
spring-context-core = { module = 'org.springframework:spring-context' }
62+
spring-context-support = { module = 'org.springframework:spring-context-support' }
63+
spring-expression = { module = 'org.springframework:spring-expression' }
64+
spring-security-core = { module = 'org.springframework.security:spring-security-core' }
65+
spring-security-config = { module = 'org.springframework.security:spring-security-config' }
66+
spring-security-crypto = { module = 'org.springframework.security:spring-security-crypto' }
67+
spring-security-web = { module = 'org.springframework.security:spring-security-web' }
68+
spring-test = { module = 'org.springframework:spring-test' }
69+
spring-tx = { module = 'org.springframework:spring-tx' }
70+
spring-web = { module = 'org.springframework:spring-web' }
71+
springboot-autoconfigure = { module = 'org.springframework.boot:spring-boot-autoconfigure' }
72+
springboot-core = { module = 'org.springframework.boot:spring-boot' }
73+
springboot-starter-logging = { module = 'org.springframework.boot:spring-boot-starter-logging' }
74+
springboot-starter-test = { module = 'org.springframework.boot:spring-boot-starter-test' }
75+
springboot-starter-tomcat = { module = 'org.springframework.boot:spring-boot-starter-tomcat' }
76+
tomcat-jdbc = { module = 'org.apache.tomcat:tomcat-jdbc' }
9177

9278
[bundles]
9379
geb = ['geb-core', 'geb-spock']

‎plugin/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ dependencies {
4747
testImplementation libs.spring.test
4848
testImplementation libs.spring.security.config
4949

50+
testRuntimeOnly libs.bytebuddy
5051
testRuntimeOnly libs.slf4j.nop // Prevents warnings about missing slf4j implementation during tests
5152
}
5253

‎plugin/src/main/groovy/grails/plugin/springsecurity/SecurityFilterPosition.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2006-2016 the original author or authors.
1+
/* Copyright 2006-2024 the original author or authors.
22
*
33
* Licensed under the Apache License, Version 2.0 (the "License");
44
* you may not use this file except in compliance with the License.
@@ -16,13 +16,12 @@
1616

1717
/**
1818
* Stores the default order numbers of all Spring Security filters for use in configuration.
19-
*
19+
* <p>
2020
* Equivalent to <code>org.springframework.security.config.http.SecurityFilters</code> which
2121
* unfortunately is package-default.
2222
*
23-
* @author Burt Beckwith
2423
*/
25-
enum SecurityFilterPosition {
24+
public enum SecurityFilterPosition {
2625

2726
FIRST(Integer.MIN_VALUE),
2827

@@ -68,6 +67,8 @@ enum SecurityFilterPosition {
6867

6968
FORM_LOGIN_FILTER,
7069

70+
DEFAULT_RESOURCES_FILTER,
71+
7172
LOGIN_PAGE_FILTER,
7273

7374
LOGOUT_PAGE_FILTER,

0 commit comments

Comments
 (0)