Skip to content

Commit 6b2d765

Browse files
jamesfredleyjamesfredley
authored
Merge pull request #244 from grails-plugins/apache-coordinate-updates
Update plugin to use Apache Grails maven coordinates + other updates
2 parents 575b532 + 7892e9c commit 6b2d765

File tree

17 files changed

+135
-233
lines changed

17 files changed

+135
-233
lines changed

‎.envrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.sdkmanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Enable auto-env through the sdkman_auto_env config - https://sdkman.io/usage#env
2-
java=17.0.12-librca
2+
java=17.0.15-librca

‎build.gradle

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,42 @@
11
buildscript {
22
repositories {
3-
maven { url "https://plugins.gradle.org/m2/" }
4-
maven { url "https://repo.grails.org/grails/core" }
3+
maven { url = "https://repository.apache.org/content/groups/snapshots/" }
4+
maven { url = "https://repo.grails.org/grails/core" }
55
}
66
dependencies {
7-
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
7+
classpath platform("org.apache.grails:grails-bom:$grailsVersion")
8+
classpath "org.apache.grails:grails-gradle-plugins"
9+
classpath "com.bertramlabs.plugins:asset-pipeline-gradle"
810
}
911
}
1012

1113
allprojects {
12-
repositories {
13-
maven { url "https://repo.grails.org/grails/core" }
14-
mavenCentral()
14+
repositories {
15+
mavenCentral()
16+
maven { url = "https://repository.apache.org/content/groups/snapshots/" }
17+
maven { url = 'https://repo.grails.org/grails/core' }
1518
// mavenLocal() // for local testing, do not commit uncommented
16-
}
19+
}
1720
}
1821

19-
version project.projectVersion
20-
group "org.grails.plugins"
22+
version = project.projectVersion
23+
group = "org.grails.plugins"
2124

2225
subprojects { Project project ->
23-
project.version project.projectVersion
24-
project.group "org.grails.plugins"
26+
project.version = project.projectVersion
27+
project.group = "org.grails.plugins"
2528

2629
if(project.name.endsWith('audit-logging')) {
27-
apply plugin: "org.grails.grails-publish"
30+
apply plugin: "org.apache.grails.gradle.grails-publish"
2831
grailsPublish {
2932
githubSlug = 'grails-plugins/grails-audit-logging-plugin'
3033
license {
3134
name = 'Apache-2.0'
3235
}
3336
title = "Grails Audit-Logging Plugin"
3437
desc = "Grails Audit-Logging Plugin for Grails 7+"
35-
developers = [robertoschwald:"Robert Oschwald", longwa:"Aaron Long", elkr:"Elmar Kretzer"]
38+
developers = [robertoschwald:"Robert Oschwald", longwa:"Aaron Long", elkr:"Elmar Kretzer",
39+
jamesfredley:"James Fredley", jdaugherty:"James Daugherty"]
3640
}
3741
}
38-
}
39-
42+
}

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

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
1-
buildscript {
2-
repositories {
3-
maven { url "https://repo.grails.org/grails/core" }
4-
}
5-
dependencies {
6-
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
7-
}
8-
}
9-
10-
plugins {
11-
id "com.bertramlabs.asset-pipeline" version "$assetPipelineVersion"
12-
}
1+
version = project.projectVersion
2+
group = 'audit.test'
133

14-
version project.projectVersion
15-
group "audit.test"
16-
17-
apply plugin: "war"
4+
apply plugin: 'war'
185
apply plugin: 'eclipse'
196
apply plugin: 'idea'
20-
apply plugin: "org.grails.grails-web"
21-
apply plugin: "org.grails.grails-gsp"
7+
apply plugin: 'org.apache.grails.gradle.grails-web'
8+
apply plugin: 'org.apache.grails.gradle.grails-gsp'
9+
apply plugin: 'asset-pipeline'
2210

2311
assets {
2412
minifyJs = true
@@ -33,38 +21,47 @@ configurations {
3321
}
3422

3523
dependencies {
36-
implementation platform("org.grails:grails-bom:$grailsVersion")
24+
implementation platform("org.apache.grails:grails-bom:$grailsVersion")
25+
26+
implementation "org.apache.grails:grails-core"
27+
implementation "org.apache.grails:grails-logging"
28+
implementation "org.apache.grails:grails-databinding"
29+
implementation "org.apache.grails:grails-i18n"
30+
implementation "org.apache.grails:grails-interceptors"
31+
implementation "org.apache.grails:grails-rest-transforms"
32+
implementation "org.apache.grails:grails-services"
33+
implementation "org.apache.grails:grails-url-mappings"
34+
implementation "org.apache.grails:grails-web-boot"
35+
implementation "org.apache.grails:grails-gsp"
36+
implementation "org.apache.grails:grails-data-hibernate5"
37+
38+
implementation "org.hibernate:hibernate-ehcache:$hibernate5Version", {
39+
// exclude javax variant of hibernate-core
40+
exclude group: 'org.hibernate', module: 'hibernate-core'
41+
}
42+
implementation "org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:$jbossTransactionApiVersion", {
43+
// required for hibernate-ehcache to work with javax variant of hibernate-core excluded
44+
}
3745

38-
implementation "org.grails:grails-core"
39-
implementation "org.grails:grails-logging"
40-
implementation "org.grails:grails-plugin-databinding"
41-
implementation "org.grails:grails-plugin-i18n"
42-
implementation "org.grails:grails-plugin-interceptors"
43-
implementation "org.grails:grails-plugin-rest"
44-
implementation "org.grails:grails-plugin-services"
45-
implementation "org.grails:grails-plugin-url-mappings"
46-
implementation "org.grails:grails-web-boot"
47-
implementation "org.grails.plugins:gsp"
48-
implementation "org.grails.plugins:hibernate5"
49-
implementation "org.grails.plugins:scaffolding"
46+
implementation "org.apache.grails:grails-scaffolding"
5047
implementation "org.springframework.boot:spring-boot-autoconfigure"
5148
implementation "org.springframework.boot:spring-boot-starter"
5249
implementation "org.springframework.boot:spring-boot-starter-actuator"
5350
implementation "org.springframework.boot:spring-boot-starter-logging"
5451
implementation "org.springframework.boot:spring-boot-starter-tomcat"
5552
implementation "org.springframework.boot:spring-boot-starter-validation"
56-
console "org.grails:grails-console"
53+
console "org.apache.grails:grails-console"
5754
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
5855
runtimeOnly "com.h2database:h2"
5956
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
6057
runtimeOnly "org.fusesource.jansi:jansi"
61-
integrationTestImplementation testFixtures("org.grails.plugins:geb")
62-
testImplementation "org.grails:grails-gorm-testing-support"
63-
testImplementation "org.grails:grails-web-testing-support"
58+
integrationTestImplementation testFixtures("org.apache.grails:grails-geb")
59+
testImplementation "org.apache.grails:grails-testing-support-datamapping"
60+
testImplementation "org.apache.grails:grails-testing-support-web"
6461
testImplementation "org.spockframework:spock-core"
6562

6663
implementation project(":audit-logging")
67-
profile "org.grails.profiles:web"
64+
profile "org.apache.grails.profiles:web"
6865
}
6966

7067
test {

‎examples/audit-test-allow-update-outside-transaction/grails-app/conf/application.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ environments:
8484
dataSource:
8585
dbCreate: "create-drop"
8686
url: "jdbc:h2:mem:devDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE"
87+
dataSources:
88+
second:
89+
dbCreate: "update"
90+
url: "jdbc:h2:mem:testDb2;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE"
8791
test:
8892
dataSource:
8993
dbCreate: "update"

‎examples/audit-test/build.gradle

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
1-
buildscript {
2-
repositories {
3-
maven { url "https://repo.grails.org/grails/core" }
4-
}
5-
dependencies {
6-
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
7-
}
8-
}
9-
10-
plugins {
11-
id "com.bertramlabs.asset-pipeline" version "$assetPipelineVersion"
12-
}
1+
version = project.projectVersion
2+
group = 'audit.test'
133

14-
version project.projectVersion
15-
group "audit.test"
16-
17-
apply plugin: "war"
4+
apply plugin: 'war'
185
apply plugin: 'eclipse'
196
apply plugin: 'idea'
20-
apply plugin: "org.grails.grails-web"
21-
apply plugin: "org.grails.grails-gsp"
7+
apply plugin: 'org.apache.grails.gradle.grails-web'
8+
apply plugin: 'org.apache.grails.gradle.grails-gsp'
9+
apply plugin: 'asset-pipeline'
2210

2311
assets {
2412
minifyJs = true
@@ -34,39 +22,48 @@ configurations {
3422

3523
dependencies {
3624

37-
implementation platform("org.grails:grails-bom:$grailsVersion")
25+
implementation platform("org.apache.grails:grails-bom:$grailsVersion")
3826

3927
developmentOnly "org.springframework.boot:spring-boot-devtools"
40-
implementation "org.grails:grails-core"
41-
implementation "org.grails:grails-logging"
42-
implementation "org.grails:grails-plugin-databinding"
43-
implementation "org.grails:grails-plugin-i18n"
44-
implementation "org.grails:grails-plugin-interceptors"
45-
implementation "org.grails:grails-plugin-rest"
46-
implementation "org.grails:grails-plugin-services"
47-
implementation "org.grails:grails-plugin-url-mappings"
48-
implementation "org.grails:grails-web-boot"
49-
implementation "org.grails.plugins:gsp"
50-
implementation "org.grails.plugins:hibernate5"
51-
implementation "org.grails.plugins:scaffolding"
28+
implementation "org.apache.grails:grails-core"
29+
implementation "org.apache.grails:grails-logging"
30+
implementation "org.apache.grails:grails-databinding"
31+
implementation "org.apache.grails:grails-i18n"
32+
implementation "org.apache.grails:grails-interceptors"
33+
implementation "org.apache.grails:grails-rest-transforms"
34+
implementation "org.apache.grails:grails-services"
35+
implementation "org.apache.grails:grails-url-mappings"
36+
implementation "org.apache.grails:grails-web-boot"
37+
implementation "org.apache.grails:grails-gsp"
38+
implementation "org.apache.grails:grails-data-hibernate5"
39+
40+
implementation "org.hibernate:hibernate-ehcache:$hibernate5Version", {
41+
// exclude javax variant of hibernate-core
42+
exclude group: 'org.hibernate', module: 'hibernate-core'
43+
}
44+
implementation "org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:$jbossTransactionApiVersion", {
45+
// required for hibernate-ehcache to work with javax variant of hibernate-core excluded
46+
}
47+
48+
implementation "org.apache.grails:grails-scaffolding"
5249
implementation "org.springframework.boot:spring-boot-autoconfigure"
5350
implementation "org.springframework.boot:spring-boot-starter"
5451
implementation "org.springframework.boot:spring-boot-starter-actuator"
5552
implementation "org.springframework.boot:spring-boot-starter-logging"
5653
implementation "org.springframework.boot:spring-boot-starter-tomcat"
5754
implementation "org.springframework.boot:spring-boot-starter-validation"
58-
console "org.grails:grails-console"
55+
console "org.apache.grails:grails-console"
5956
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
6057
runtimeOnly "com.h2database:h2"
6158
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
6259
runtimeOnly "org.fusesource.jansi:jansi"
63-
integrationTestImplementation testFixtures("org.grails.plugins:geb")
64-
testImplementation "org.grails:grails-gorm-testing-support"
65-
testImplementation "org.grails:grails-web-testing-support"
60+
integrationTestImplementation testFixtures("org.apache.grails:grails-geb")
61+
testImplementation "org.apache.grails:grails-testing-support-datamapping"
62+
testImplementation "org.apache.grails:grails-testing-support-web"
6663
testImplementation "org.spockframework:spock-core"
6764

6865
implementation project(":audit-logging")
69-
profile "org.grails.profiles:web"
66+
profile "org.apache.grails.profiles:web"
7067
}
7168

7269
tasks.withType(Test).configureEach { Task it ->

‎examples/audit-test/grails-app/views/error.gsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<g:if test="${Throwable.isInstance(exception)}">
1111
<g:renderException exception="${exception}" />
1212
</g:if>
13-
<g:elseif test="${request.getAttribute('javax.servlet.error.exception')}">
14-
<g:renderException exception="${request.getAttribute('javax.servlet.error.exception')}" />
13+
<g:elseif test="${request.getAttribute('jakarta.servlet.error.exception')}">
14+
<g:renderException exception="${request.getAttribute('jakarta.servlet.error.exception')}" />
1515
</g:elseif>
1616
<g:else>
1717
<ul class="errors">

‎flake.lock

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎flake.nix

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎gradle.properties

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
projectVersion=6.0.0-SNAPSHOT
22

33
asciidoctorJvmVersion=4.0.3
4-
assetPipelineVersion=5.0.5
5-
grailsVersion=7.0.0-M1
6-
grailsGradlePluginVersion=7.0.0-SNAPSHOT
4+
customUserDataVersion=2.2.1
5+
develocityVersion=4.0
6+
grailsVersion=7.0.0-SNAPSHOT
7+
8+
#For tests only
9+
hibernate5Version=5.6.15.Final
10+
jbossTransactionApiVersion=2.0.0.Final
711

812
org.gradle.daemon=true
913
org.gradle.parallel=true

‎gradle/wrapper/gradle-wrapper.jar

181 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)