-
Notifications
You must be signed in to change notification settings - Fork 61
Update plugin to use Apache Grails maven coordinates + other updates #244
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
4bd4b4c
remove flake config since we are not using flake
jamesfredley 9abcc5b
Update authors
jamesfredley 84730cb
Fix left over javax references
jamesfredley fbcb297
Apache Grails coordinate updates plus add Apache snapshot repository
jamesfredley ff340a7
Add ehcache dependency config to prevent hibernate-core non-jakarta d…
jamesfredley efd9b6c
Fix second datasource config
jamesfredley 869e213
Update develocity config
jamesfredley 7bed31d
Gradle 8.14
jamesfredley 958f88d
syntax cleanup
jamesfredley 7892e9c
Update java version in .sdkman
jamesfredley File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
# Enable auto-env through the sdkman_auto_env config - https://sdkman.io/usage#env | ||
java=17.0.12-librca | ||
java=17.0.15-librca |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,39 +1,42 @@ | ||
buildscript { | ||
repositories { | ||
maven { url "https://plugins.gradle.org/m2/" } | ||
maven { url "https://repo.grails.org/grails/core" } | ||
maven { url = "https://repository.apache.org/content/groups/snapshots/" } | ||
maven { url = "https://repo.grails.org/grails/core" } | ||
} | ||
dependencies { | ||
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" | ||
classpath platform("org.apache.grails:grails-bom:$grailsVersion") | ||
classpath "org.apache.grails:grails-gradle-plugins" | ||
classpath "com.bertramlabs.plugins:asset-pipeline-gradle" | ||
} | ||
} | ||
|
||
allprojects { | ||
repositories { | ||
maven { url "https://repo.grails.org/grails/core" } | ||
mavenCentral() | ||
repositories { | ||
mavenCentral() | ||
maven { url = "https://repository.apache.org/content/groups/snapshots/" } | ||
maven { url = 'https://repo.grails.org/grails/core' } | ||
// mavenLocal() // for local testing, do not commit uncommented | ||
} | ||
} | ||
} | ||
|
||
version project.projectVersion | ||
group "org.grails.plugins" | ||
version = project.projectVersion | ||
group = "org.grails.plugins" | ||
|
||
subprojects { Project project -> | ||
project.version project.projectVersion | ||
project.group "org.grails.plugins" | ||
project.version = project.projectVersion | ||
project.group = "org.grails.plugins" | ||
|
||
if(project.name.endsWith('audit-logging')) { | ||
apply plugin: "org.grails.grails-publish" | ||
apply plugin: "org.apache.grails.gradle.grails-publish" | ||
grailsPublish { | ||
githubSlug = 'grails-plugins/grails-audit-logging-plugin' | ||
license { | ||
name = 'Apache-2.0' | ||
} | ||
title = "Grails Audit-Logging Plugin" | ||
desc = "Grails Audit-Logging Plugin for Grails 7+" | ||
developers = [robertoschwald:"Robert Oschwald", longwa:"Aaron Long", elkr:"Elmar Kretzer"] | ||
developers = [robertoschwald:"Robert Oschwald", longwa:"Aaron Long", elkr:"Elmar Kretzer", | ||
jamesfredley:"James Fredley", jdaugherty:"James Daugherty"] | ||
} | ||
} | ||
} | ||
|
||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,12 @@ | ||
buildscript { | ||
repositories { | ||
maven { url "https://repo.grails.org/grails/core" } | ||
} | ||
dependencies { | ||
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" | ||
} | ||
} | ||
|
||
plugins { | ||
id "com.bertramlabs.asset-pipeline" version "$assetPipelineVersion" | ||
} | ||
version = project.projectVersion | ||
group = 'audit.test' | ||
|
||
version project.projectVersion | ||
group "audit.test" | ||
|
||
apply plugin: "war" | ||
apply plugin: 'war' | ||
apply plugin: 'eclipse' | ||
apply plugin: 'idea' | ||
apply plugin: "org.grails.grails-web" | ||
apply plugin: "org.grails.grails-gsp" | ||
apply plugin: 'org.apache.grails.gradle.grails-web' | ||
apply plugin: 'org.apache.grails.gradle.grails-gsp' | ||
apply plugin: 'asset-pipeline' | ||
|
||
assets { | ||
minifyJs = true | ||
|
@@ -34,39 +22,48 @@ configurations { | |
|
||
dependencies { | ||
|
||
implementation platform("org.grails:grails-bom:$grailsVersion") | ||
implementation platform("org.apache.grails:grails-bom:$grailsVersion") | ||
|
||
developmentOnly "org.springframework.boot:spring-boot-devtools" | ||
implementation "org.grails:grails-core" | ||
implementation "org.grails:grails-logging" | ||
implementation "org.grails:grails-plugin-databinding" | ||
implementation "org.grails:grails-plugin-i18n" | ||
implementation "org.grails:grails-plugin-interceptors" | ||
implementation "org.grails:grails-plugin-rest" | ||
implementation "org.grails:grails-plugin-services" | ||
implementation "org.grails:grails-plugin-url-mappings" | ||
implementation "org.grails:grails-web-boot" | ||
implementation "org.grails.plugins:gsp" | ||
implementation "org.grails.plugins:hibernate5" | ||
implementation "org.grails.plugins:scaffolding" | ||
implementation "org.apache.grails:grails-core" | ||
implementation "org.apache.grails:grails-logging" | ||
implementation "org.apache.grails:grails-databinding" | ||
implementation "org.apache.grails:grails-i18n" | ||
implementation "org.apache.grails:grails-interceptors" | ||
implementation "org.apache.grails:grails-rest-transforms" | ||
implementation "org.apache.grails:grails-services" | ||
implementation "org.apache.grails:grails-url-mappings" | ||
implementation "org.apache.grails:grails-web-boot" | ||
implementation "org.apache.grails:grails-gsp" | ||
implementation "org.apache.grails:grails-data-hibernate5" | ||
|
||
implementation "org.hibernate:hibernate-ehcache:$hibernate5Version", { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
// exclude javax variant of hibernate-core | ||
exclude group: 'org.hibernate', module: 'hibernate-core' | ||
} | ||
implementation "org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:$jbossTransactionApiVersion", { | ||
// required for hibernate-ehcache to work with javax variant of hibernate-core excluded | ||
} | ||
|
||
implementation "org.apache.grails:grails-scaffolding" | ||
implementation "org.springframework.boot:spring-boot-autoconfigure" | ||
implementation "org.springframework.boot:spring-boot-starter" | ||
implementation "org.springframework.boot:spring-boot-starter-actuator" | ||
implementation "org.springframework.boot:spring-boot-starter-logging" | ||
implementation "org.springframework.boot:spring-boot-starter-tomcat" | ||
implementation "org.springframework.boot:spring-boot-starter-validation" | ||
console "org.grails:grails-console" | ||
console "org.apache.grails:grails-console" | ||
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails" | ||
runtimeOnly "com.h2database:h2" | ||
runtimeOnly "org.apache.tomcat:tomcat-jdbc" | ||
runtimeOnly "org.fusesource.jansi:jansi" | ||
integrationTestImplementation testFixtures("org.grails.plugins:geb") | ||
testImplementation "org.grails:grails-gorm-testing-support" | ||
testImplementation "org.grails:grails-web-testing-support" | ||
integrationTestImplementation testFixtures("org.apache.grails:grails-geb") | ||
testImplementation "org.apache.grails:grails-testing-support-datamapping" | ||
testImplementation "org.apache.grails:grails-testing-support-web" | ||
testImplementation "org.spockframework:spock-core" | ||
|
||
implementation project(":audit-logging") | ||
profile "org.grails.profiles:web" | ||
profile "org.apache.grails.profiles:web" | ||
} | ||
|
||
tasks.withType(Test).configureEach { Task it -> | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/apache/grails-core/blob/7.0.x/UPGRADE7.md#common-70-upgrade-gotchas---draft--
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we used to recommend ehcache by default; is this actually used in the project?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The dependency was not listed in the
build.gradle
files, but was being loaded based on: https://github.com/grails-plugins/grails-audit-logging-plugin/blob/apache-coordinate-updates/examples/audit-test-allow-update-outside-transaction/grails-app/conf/application.yml#L80 which was putting the non-jakarta version of hibernate5 on the classpath and causing method not found errors.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
apache/grails-core#14721