Skip to content

Commit c403aff

Browse files
jamesfredleyjamesfredley
committed
initial updates for Grails 7
1 parent 10ef6ae commit c403aff

File tree

12 files changed

+362
-282
lines changed

12 files changed

+362
-282
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
java: [8, 11]
12+
java: [17, 21]
1313
steps:
1414
- uses: actions/checkout@v2
1515
- run: cd $GITHUB_WORKSPACE

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ This repositories new artifacts are currently moved to Maven Central, sind Bintr
2020
* For 2.x documentation, see [2.x User Guide](https://gpc.github.io/grails-audit-logging-plugin/2.0.x/plugin.html)
2121

2222
## Grails versions
23-
* Grails 4.0.x: [master branch (5.0.x version)](https://github.com/gpc/grails-audit-logging-plugin/tree/master) Alternatively up to Grails 4.0.9: [4.x_maintenance branch](https://github.com/gpc/grails-audit-logging-plugin/tree/4.x_maintenance)
23+
* Grails 7.0.x: [6.0.x branch (6.0.x version)](https://github.com/gpc/grails-audit-logging-plugin/tree/6.0.x)
24+
* Grails 4.0.10+: [5.0.x branch (5.0.x version)](https://github.com/gpc/grails-audit-logging-plugin/tree/5.0.x)
25+
* Grails up to 4.0.9: [4.x_maintenance branch](https://github.com/gpc/grails-audit-logging-plugin/tree/4.x_maintenance)
2426
* Grails 3.3.x: [3.x_maintenance branch](https://github.com/gpc/grails-audit-logging-plugin/tree/3.x_maintenance)
2527
* Grails 3.0.x-3.2.x: [2.x_maintenance branch](https://github.com/gpc/grails-audit-logging-plugin/tree/2.x_maintenance)
2628
* Grails 2.x: [1.x_maintenance branch](https://github.com/gpc/grails-audit-logging-plugin/tree/1.x_maintenance)

‎examples/audit-test-allow-update-outside-transaction/build.gradle‎

Lines changed: 41 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,22 @@ buildscript {
33
grailsVersion = project.grailsVersion
44
}
55
repositories {
6-
mavenLocal()
76
maven { url "https://repo.grails.org/grails/core" }
87
}
98
dependencies {
10-
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
11-
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.0.7"
9+
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
1210
}
1311
}
1412

15-
version file("$rootDir/version.txt").text.trim()
13+
plugins {
14+
id "com.bertramlabs.asset-pipeline" version "$assetPipelineVersion"
15+
}
16+
17+
18+
version project.projectVersion
1619
group "audit.test"
1720

1821
apply plugin: "war"
19-
apply plugin: "asset-pipeline"
2022
apply plugin: 'eclipse'
2123
apply plugin: 'idea'
2224
apply plugin: "org.grails.grails-web"
@@ -37,58 +39,50 @@ repositories {
3739
maven { url "https://repo.grails.org/grails/core" }
3840
}
3941

40-
grails {
41-
plugins {
42-
compile project(":audit-logging")
43-
}
44-
}
45-
4642
configurations {
4743
developmentOnly
48-
runtimeClasspath {
44+
runtimeOnlyClasspath {
4945
extendsFrom developmentOnly
5046
}
5147
}
5248

5349
dependencies {
5450
developmentOnly("org.springframework.boot:spring-boot-devtools")
55-
compile "org.springframework.boot:spring-boot-starter-logging"
56-
compile "org.springframework.boot:spring-boot-autoconfigure"
57-
compile "org.grails:grails-core"
58-
compile "org.springframework.boot:spring-boot-starter-actuator"
59-
compile "org.springframework.boot:spring-boot-starter-tomcat"
60-
compile "org.grails:grails-web-boot"
61-
compile "org.grails:grails-logging"
62-
compile "org.grails:grails-plugin-rest"
63-
compile "org.grails:grails-plugin-databinding"
64-
compile "org.grails:grails-plugin-i18n"
65-
compile "org.grails:grails-plugin-services"
66-
compile "org.grails:grails-plugin-url-mappings"
67-
compile "org.grails:grails-plugin-interceptors"
68-
compile "org.grails.plugins:cache"
69-
compile "org.grails.plugins:async"
70-
compile "org.grails.plugins:scaffolding"
71-
compile "org.grails.plugins:events"
72-
compile "org.grails.plugins:hibernate5"
73-
compile "org.hibernate:hibernate-core:5.4.0.Final"
74-
compile "org.hibernate:hibernate-ehcache:5.4.0.Final"
75-
compile "org.grails.plugins:gsp"
51+
compileOnly "org.springframework.boot:spring-boot-starter-logging"
52+
compileOnly "org.springframework.boot:spring-boot-autoconfigure"
53+
compileOnly "org.grails:grails-core"
54+
compileOnly "org.springframework.boot:spring-boot-starter-actuator"
55+
compileOnly "org.springframework.boot:spring-boot-starter-tomcat"
56+
compileOnly "org.grails:grails-web-boot"
57+
compileOnly "org.grails:grails-logging"
58+
compileOnly "org.grails:grails-plugin-rest"
59+
compileOnly "org.grails:grails-plugin-databinding"
60+
compileOnly "org.grails:grails-plugin-i18n"
61+
compileOnly "org.grails:grails-plugin-services"
62+
compileOnly "org.grails:grails-plugin-url-mappings"
63+
compileOnly "org.grails:grails-plugin-interceptors"
64+
compileOnly "org.grails.plugins:cache"
65+
compileOnly "org.grails.plugins:async"
66+
compileOnly "org.grails.plugins:scaffolding"
67+
compileOnly "org.grails.plugins:events"
68+
compileOnly "org.grails.plugins:hibernate5"
69+
compileOnly "org.grails.plugins:gsp"
70+
implementation project(":audit-logging")
71+
implementation "org.apache.groovy:groovy"
7672
console "org.grails:grails-console"
7773
profile "org.grails.profiles:web"
78-
runtime "org.glassfish.web:el-impl:2.1.2-b03"
79-
runtime "com.h2database:h2"
80-
runtime "org.apache.tomcat:tomcat-jdbc"
81-
runtime "javax.xml.bind:jaxb-api:2.3.0"
82-
runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.0.7"
83-
testCompile "org.grails:grails-gorm-testing-support"
84-
testCompile "org.mockito:mockito-core"
85-
testCompile "org.grails:grails-web-testing-support"
86-
testCompile "org.grails.plugins:geb"
87-
testCompile "org.seleniumhq.selenium:selenium-remote-driver:3.14.0"
88-
testCompile "org.seleniumhq.selenium:selenium-api:3.14.0"
89-
testCompile "org.seleniumhq.selenium:selenium-support:3.14.0"
90-
testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0"
91-
testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0"
74+
runtimeOnly "com.h2database:h2"
75+
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
76+
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
77+
testCompileOnly "org.grails:grails-gorm-testing-support"
78+
testCompileOnly "org.mockito:mockito-core"
79+
testImplementation "org.grails:grails-web-testing-support"
80+
testCompileOnly "org.grails.plugins:geb"
81+
testCompileOnly "org.seleniumhq.selenium:selenium-remote-driver:3.14.0"
82+
testCompileOnly "org.seleniumhq.selenium:selenium-api:3.14.0"
83+
testCompileOnly "org.seleniumhq.selenium:selenium-support:3.14.0"
84+
testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0"
85+
testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0"
9286
}
9387

9488
task wrapper(type: Wrapper) {

‎examples/audit-test-allow-update-outside-transaction/grails-app/assets/.gitkeep‎

Whitespace-only changes.

‎examples/audit-test/build.gradle‎

Lines changed: 41 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@ buildscript {
33
grailsVersion = project.grailsVersion
44
}
55
repositories {
6-
mavenLocal()
76
maven { url "https://repo.grails.org/grails/core" }
87
}
98
dependencies {
10-
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
11-
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.0.7"
9+
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
1210
}
1311
}
1412

15-
version file("$rootDir/version.txt").text.trim()
13+
plugins {
14+
id "com.bertramlabs.asset-pipeline" version "$assetPipelineVersion"
15+
}
16+
17+
version project.projectVersion
1618
group "audit.test"
1719

1820
apply plugin: "war"
19-
apply plugin: "asset-pipeline"
2021
apply plugin: 'eclipse'
2122
apply plugin: 'idea'
2223
apply plugin: "org.grails.grails-web"
@@ -37,58 +38,50 @@ repositories {
3738
maven { url "https://repo.grails.org/grails/core" }
3839
}
3940

40-
grails {
41-
plugins {
42-
compile project(":audit-logging")
43-
}
44-
}
45-
4641
configurations {
4742
developmentOnly
48-
runtimeClasspath {
43+
runtimeOnlyClasspath {
4944
extendsFrom developmentOnly
5045
}
5146
}
5247

5348
dependencies {
54-
developmentOnly("org.springframework.boot:spring-boot-devtools")
55-
compile "org.springframework.boot:spring-boot-starter-logging"
56-
compile "org.springframework.boot:spring-boot-autoconfigure"
57-
compile "org.grails:grails-core"
58-
compile "org.springframework.boot:spring-boot-starter-actuator"
59-
compile "org.springframework.boot:spring-boot-starter-tomcat"
60-
compile "org.grails:grails-web-boot"
61-
compile "org.grails:grails-logging"
62-
compile "org.grails:grails-plugin-rest"
63-
compile "org.grails:grails-plugin-databinding"
64-
compile "org.grails:grails-plugin-i18n"
65-
compile "org.grails:grails-plugin-services"
66-
compile "org.grails:grails-plugin-url-mappings"
67-
compile "org.grails:grails-plugin-interceptors"
68-
compile "org.grails.plugins:cache"
69-
compile "org.grails.plugins:async"
70-
compile "org.grails.plugins:scaffolding"
71-
compile "org.grails.plugins:events"
72-
compile "org.grails.plugins:hibernate5"
73-
compile "org.hibernate:hibernate-core:5.4.0.Final"
74-
compile "org.hibernate:hibernate-ehcache:5.4.0.Final"
75-
compile "org.grails.plugins:gsp"
49+
developmentOnly "org.springframework.boot:spring-boot-devtools"
50+
compileOnly "org.springframework.boot:spring-boot-starter-logging"
51+
compileOnly "org.springframework.boot:spring-boot-autoconfigure"
52+
compileOnly "org.springframework.boot:spring-boot-starter-actuator"
53+
compileOnly "org.springframework.boot:spring-boot-starter-tomcat"
54+
compileOnly "org.grails:grails-web-boot"
55+
compileOnly "org.grails:grails-logging"
56+
compileOnly "org.grails:grails-plugin-rest"
57+
compileOnly "org.grails:grails-plugin-databinding"
58+
compileOnly "org.grails:grails-plugin-i18n"
59+
compileOnly "org.grails:grails-plugin-services"
60+
compileOnly "org.grails:grails-plugin-url-mappings"
61+
compileOnly "org.grails:grails-plugin-interceptors"
62+
compileOnly "org.grails.plugins:cache"
63+
compileOnly "org.grails.plugins:async"
64+
compileOnly "org.grails.plugins:scaffolding"
65+
compileOnly "org.grails.plugins:events"
66+
compileOnly "org.grails.plugins:gsp"
67+
implementation "org.grails:grails-core"
68+
implementation project(":audit-logging")
69+
implementation "org.apache.groovy:groovy"
70+
implementation "org.grails.plugins:hibernate5"
7671
console "org.grails:grails-console"
7772
profile "org.grails.profiles:web"
78-
runtime "org.glassfish.web:el-impl:2.1.2-b03"
79-
runtime "com.h2database:h2"
80-
runtime "org.apache.tomcat:tomcat-jdbc"
81-
runtime "javax.xml.bind:jaxb-api:2.3.0"
82-
runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.0.7"
83-
testCompile "org.grails:grails-gorm-testing-support"
84-
testCompile "org.mockito:mockito-core"
85-
testCompile "org.grails:grails-web-testing-support"
86-
testCompile "org.grails.plugins:geb"
87-
testCompile "org.seleniumhq.selenium:selenium-remote-driver:3.14.0"
88-
testCompile "org.seleniumhq.selenium:selenium-api:3.14.0"
89-
testCompile "org.seleniumhq.selenium:selenium-support:3.14.0"
90-
testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0"
91-
testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0"
73+
runtimeOnly "com.h2database:h2"
74+
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
75+
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
76+
testImplementation "org.grails:grails-gorm-testing-support"
77+
testImplementation "org.grails:grails-web-testing-support"
78+
testCompileOnly "org.mockito:mockito-core"
79+
testCompileOnly "org.grails.plugins:geb"
80+
testCompileOnly "org.seleniumhq.selenium:selenium-remote-driver:3.14.0"
81+
testCompileOnly "org.seleniumhq.selenium:selenium-api:3.14.0"
82+
testCompileOnly "org.seleniumhq.selenium:selenium-support:3.14.0"
83+
testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0"
84+
testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0"
9285
}
9386

9487
task wrapper(type: Wrapper) {

‎gradle.properties‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1-
grailsVersion=4.0.3
2-
gormVersion=7.0.4.RELEASE
3-
gradleWrapperVersion=5.6.4
1+
projectVersion=5.0.0-SNAPSHOT
2+
3+
artifactoryVersion=5.2.5
4+
asciidoctorJvmVersion=4.0.3
5+
assetPipelineVersion=5.0.1
6+
grailsVersion=7.0.0-SNAPSHOT
7+
grailsGradlePluginVersion=7.0.0-SNAPSHOT
8+
gormVersion=9.0.0-SNAPSHOT
9+
groovyVersion=4.0.24
10+
gradleWrapperVersion=8.11
411
org.gradle.daemon=true
512
org.gradle.parallel=true
613
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M

‎gradle/wrapper/gradle-wrapper.jar‎

-11.3 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)