Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 38 additions & 35 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ permissions:
packages: read
jobs:
datastore-build:
if: false # remove after publishing
name: "Build Datastore Project"
runs-on: ubuntu-24.04
strategy:
Expand All @@ -35,38 +34,42 @@ jobs:
env:
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
run: ./gradlew cleanTest build --continue -PonlyDatastoreTests
# mongodb-build:
# if: false # TODO: Remove once we can run mongo
# name: "Build Mongodb Project"
# runs-on: ubuntu-24.04
# strategy:
# fail-fast: false
# matrix:
# java: [ 17, 21 ]
# mongodb-version: [ '4', '5', '6', '7', '8' ]
# steps:
# - name: "📥 Checkout the repository"
# uses: actions/checkout@v4
# - name: "☕️ Setup JDK"
# uses: actions/setup-java@v4
# with:
# java-version: ${{ matrix.java }}
# distribution: liberica
# - name: "🐘 Setup Gradle"
# uses: gradle/actions/setup-gradle@v4
# with:
# develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
# - name: "▶️ Start MongoDB (needed for some tests)"
# uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d # v1.12.0 (Use commit sha as this is a 3rd party action)
# with:
# mongodb-version: ${{ matrix.mongodb-version }}
# - name: "🔨 Run Build"
# id: build
# env:
# GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
# run: ./gradlew cleanTest build --continue -PonlyMongodbTests
mongodb-build:
name: "Build Mongodb Project"
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
java: [ 17, 21 ]
mongodb-version: [ '5', '6', '7', '8' ]
services:
mongodb:
image: mongo:${{ matrix.mongodb-version }}
ports:
- 27017:27017
options: >-
--health-cmd "mongosh --eval 'db.adminCommand(\"ping\")'"
--health-interval 10s
--health-timeout 5s
--health-retries 5
steps:
- name: "📥 Checkout the repository"
uses: actions/checkout@v4
- name: "☕️ Setup JDK"
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: liberica
- name: "🐘 Setup Gradle"
uses: gradle/actions/setup-gradle@v4
with:
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
- name: "🔨 Run Build"
id: build
env:
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
run: ./gradlew cleanTest build --continue -PonlyMongodbTests
hibernate5-build:
if: false # TODO: Remove after publishing to core
name: "Build Hibernate5 Project"
runs-on: ubuntu-24.04
strategy:
Expand All @@ -93,7 +96,7 @@ jobs:
publish:
if: github.event_name == 'push'
name: "Publish Snapshot"
#needs: [datastore-build, hibernate5-build, mongodb-build] # Fix once mongo db action is added
needs: [datastore-build, hibernate5-build, mongodb-build]
runs-on: ubuntu-24.04
steps:
- name: "📥 Checkout the repository"
Expand All @@ -107,10 +110,10 @@ jobs:
uses: gradle/actions/setup-gradle@v4
with:
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
- name: "📤 Publish Snapshot to repo.grails.org"
- name: "📤 Publish Snapshot artifacts"
env:
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
GRADLE_PUBLISH_RELEASE: 'false'
GRAILS_PUBLISH_RELEASE: 'false'
MAVEN_PUBLISH_URL: ${{ secrets.GRAILS_NEXUS_PUBLISH_SNAPSHOT_URL }}
MAVEN_PUBLISH_USERNAME: ${{ secrets.NEXUS_USER }}
MAVEN_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PW }}
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/groovy-joint-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,16 @@ jobs:
name: "Build Project"
needs: build_groovy
runs-on: ubuntu-latest
services:
mongodb:
image: mongo:8
ports:
- 27017:27017
options: >-
--health-cmd "mongosh --eval 'db.adminCommand(\"ping\")'"
--health-interval 10s
--health-timeout 5s
--health-retries 5
steps:
- name: "📥 Checkout project"
uses: actions/checkout@v4
Expand All @@ -127,10 +137,6 @@ jobs:
key: cache-local-maven-${{ github.sha }}
- name: "🪶 Add mavenLocal repository to build"
run: sed -i 's|// mavenLocal() // Keep|mavenLocal() // Keep|' build.gradle
- name: "▶️ Start MongoDB (needed for some tests)"
uses: supercharge/mongodb-github-action@90004df786821b6308fb02299e5835d0dae05d0d # v1.12.0 (Use commit sha as this is a 3rd party action)
with:
mongodb-version: '8'
- name: "🔨 Build and test the project using the locally built Groovy snapshot"
env:
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
Expand Down
14 changes: 14 additions & 0 deletions gradle/example-config.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
tasks.withType(Groovydoc).configureEach {
enabled = false
}

tasks.matching { 'bootJar' == it.name }.configureEach {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue for later removal of temporary workaround. #2082

// Workaround for:
// Execution failed for task ':core-examples-functional-test-app:bootJar'.
// > Entry BOOT-INF/lib/grails-web-databinding-7.0.0-SNAPSHOT.jar is a duplicate but no duplicate handling strategy has been set. Please refer to https://docs.gradle.org/8.12.1/dsl/org.gradle.api.tasks.Copy.html#org.gradle.api.tasks.Copy:duplicatesStrategy for details.
enabled = false
}

tasks.matching { 'assetCompile' == it.name }.configureEach {
// Workaround for: https://github.com/bertramdev/asset-pipeline/issues/177
// Execution failed for task ':cas-examples-spring-security-cas-test1:assetCompile'.
// > java.util.ConcurrentModificationException (no error message)
outputs.dir rootProject.layout.buildDirectory.dir('asset-serialize')
}
2 changes: 1 addition & 1 deletion grails-data-graphql/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
api "com.graphql-java:graphql-java:$graphqlJavaVersion"
api "com.graphql-java:graphql-java-extended-scalars:$graphqlJavaScalarExtVersion"
api 'com.github.javaparser:javaparser-core:3.25.7'
api 'org.grails.plugins:views-json:2.3.2'
api 'org.apache.grails:grails-views-gson:2.3.2'
api 'org.javassist:javassist:3.29.2-GA'

codenarc "org.codenarc:CodeNarc:$codenarcVersion"
Expand Down
12 changes: 5 additions & 7 deletions grails-data-graphql/examples/grails-docs-app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
dependencies {
implementation "org.springframework.boot:spring-boot-starter-logging"
implementation "org.springframework.boot:spring-boot-autoconfigure"
implementation "org.apache.grails:grails-core", {
exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated
}
implementation "org.apache.grails:grails-core"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "org.springframework.boot:spring-boot-starter-tomcat"
implementation "org.apache.grails:grails-url-mappings"
Expand All @@ -15,21 +13,21 @@ dependencies {
implementation "org.apache.grails:grails-databinding"
implementation "org.apache.grails.web:grails-web-boot"
implementation "org.apache.grails:grails-logging"
implementation "org.grails.plugins:cache"
implementation "org.apache.grails:grails-cache"
implementation "org.apache.grails:grails-async"
implementation "org.apache.grails:grails-events"
implementation "org.apache.grails:grails-data-hibernate5"
implementation "org.hibernate:hibernate-core:$hibernateCoreVersion"
implementation "org.grails.plugins:views-json"
implementation "org.apache.grails:grails-views-gson"
implementation "org.apache.grails:grails-data-mongodb-gson-templates"
implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0'
console "org.apache.grails:grails-console"
profile "org.grails.profiles:rest-api"
profile "org.apache.grails.profiles:rest-api"
runtimeOnly "org.glassfish.web:el-impl:2.1.2-b03"
runtimeOnly "com.h2database:h2"
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
testImplementation project(':grails-testing-support-datamapping')
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.apache.grails:grails-testing-support-web"

implementation project(":grails-plugin-gorm-graphql-plugin")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ repositories {
dependencies {
implementation "org.springframework.boot:spring-boot-starter-logging"
implementation "org.springframework.boot:spring-boot-autoconfigure"
implementation "org.apache.grails:grails-core", {
exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated
}
implementation "org.apache.grails:grails-core"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "org.springframework.boot:spring-boot-starter-tomcat"
implementation "org.apache.grails:grails-url-mappings"
Expand All @@ -19,25 +17,25 @@ dependencies {
implementation "org.apache.grails:grails-databinding"
implementation "org.apache.grails.web:grails-web-boot"
implementation "org.apache.grails:grails-logging"
implementation "org.grails.plugins:cache"
implementation "org.apache.grails:grails-cache"
implementation "org.apache.grails:grails-async"
implementation "org.apache.grails:grails-data-hibernate5"
implementation "org.hibernate:hibernate-core:$hibernateCoreVersion"
implementation "org.apache.grails:grails-data-mongodb"
implementation "org.grails.plugins:views-json"
implementation "org.apache.grails:grails-views-gson"
implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0'
implementation "org.apache.grails:grails-data-mongodb-gson-templates"
implementation "com.graphql-java:graphql-java:$graphqlJavaVersion"
console "org.apache.grails:grails-console"
profile "org.grails.profiles:rest-api"
profile "org.apache.grails.profiles:rest-api"
compileOnly 'org.grails.plugins:embedded-mongodb:2.0.1'
implementation "org.apache.commons:commons-compress:1.10"
implementation "org.glassfish.web:el-impl:2.1.2-b03"
implementation "com.h2database:h2"
implementation "org.apache.tomcat:tomcat-jdbc"
compileOnly "org.apache.grails:grails-testing-support-datamapping"
compileOnly "org.apache.grails:grails-geb"
compileOnly "org.grails:grails-web-testing-support"
compileOnly "org.apache.grails:grails-testing-support-web"
testRuntimeOnly "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
testRuntimeOnly "net.sourceforge.htmlunit:htmlunit:2.18"
testImplementation "org.grails:grails-test-mixins:3.3.0"
Expand Down
12 changes: 5 additions & 7 deletions grails-data-graphql/examples/grails-tenant-app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
dependencies {
implementation "org.springframework.boot:spring-boot-starter-logging"
implementation "org.springframework.boot:spring-boot-autoconfigure"
implementation "org.apache.grails:grails-core", {
exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated
}
implementation "org.apache.grails:grails-core"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "org.springframework.boot:spring-boot-starter-tomcat"
implementation "org.apache.grails:grails-url-mappings"
Expand All @@ -15,22 +13,22 @@ dependencies {
implementation "org.apache.grails:grails-databinding"
implementation "org.apache.grails.web:grails-web-boot"
implementation "org.apache.grails:grails-logging"
implementation "org.grails.plugins:cache"
implementation "org.apache.grails:grails-cache"
implementation "org.apache.grails:grails-async"
implementation "org.apache.grails:grails-events"
implementation "org.apache.grails:grails-data-hibernate5"
implementation "org.hibernate:hibernate-core:$hibernateCoreVersion"
implementation "org.grails.plugins:views-json"
implementation "org.apache.grails:grails-views-gson"
implementation "org.apache.grails:grails-data-mongodb-gson-templates"
implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0'
console "org.apache.grails:grails-console"
profile "org.grails.profiles:rest-api"
profile "org.apache.grails.profiles:rest-api"
runtimeOnly "org.glassfish.web:el-impl:2.1.2-b03"
runtimeOnly "com.h2database:h2"
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
testImplementation project(':grails-testing-support-datamapping')
testImplementation "org.apache.grails:grails-geb"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.apache.grails:grails-testing-support-web"
testRuntimeOnly "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
testRuntimeOnly "net.sourceforge.htmlunit:htmlunit:2.18"
testImplementation "org.grails:grails-test-mixins:3.3.0"
Expand Down
12 changes: 5 additions & 7 deletions grails-data-graphql/examples/grails-test-app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
dependencies {
implementation "org.springframework.boot:spring-boot-starter-logging"
implementation "org.springframework.boot:spring-boot-autoconfigure"
implementation "org.apache.grails:grails-core", {
exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated
}
implementation "org.apache.grails:grails-core"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "org.springframework.boot:spring-boot-starter-tomcat"
implementation "org.apache.grails:grails-url-mappings"
Expand All @@ -15,22 +13,22 @@ dependencies {
implementation "org.apache.grails:grails-databinding"
implementation "org.apache.grails.web:grails-web-boot"
implementation "org.apache.grails:grails-logging"
implementation "org.grails.plugins:cache"
implementation "org.apache.grails:grails-cache"
implementation "org.apache.grails:grails-async"
implementation "org.apache.grails:grails-events"
implementation "org.apache.grails:grails-data-hibernate5"
implementation "org.hibernate:hibernate-core:$hibernateCoreVersion"
implementation "org.grails.plugins:views-json"
implementation "org.apache.grails:grails-views-gson"
implementation "org.apache.grails:grails-data-mongodb-gson-templates"
implementation "com.graphql-java:graphql-java:$graphqlJavaVersion"
implementation 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.2.0'
console "org.apache.grails:grails-console"
profile "org.grails.profiles:rest-api"
profile "org.apache.grails.profiles:rest-api"
runtimeOnly "org.glassfish.web:el-impl:2.1.2-b03"
runtimeOnly "com.h2database:h2"
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
testImplementation project(':grails-testing-support-datamapping')
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.apache.grails:grails-testing-support-web"
testImplementation "org.grails:grails-test-mixins:3.3.0"

implementation project(":grails-plugin-gorm-graphql-plugin")
Expand Down
4 changes: 1 addition & 3 deletions grails-data-graphql/examples/spring-boot-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ dependencies {
// exclude javax variant of hibernate-core
exclude group: 'org.hibernate', module: 'hibernate-core'
}
implementation "org.apache.grails:grails-core", {
exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated
}
implementation "org.apache.grails:grails-core"
implementation project(":gorm-graphql")
//implementation 'org.codehaus.groovy:groovy-astbuilder:3.0.19'
implementation 'jakarta.transaction:jakarta.transaction-api'
Expand Down
12 changes: 6 additions & 6 deletions grails-data-graphql/plugin/build.gradle
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@

plugins {
id "org.grails.grails-plugin"
id "org.grails.plugins.views-json"
id "org.apache.grails.gradle.grails-plugin"
id "org.apache.grails.gradle.grails-gson"
}

dependencies {
api "org.apache.grails:grails-controllers"
api "org.apache.grails:grails-databinding"
api("org.apache.grails:grails-rest-transforms") {
exclude group: 'org.grails.plugins', module: 'converters'
exclude group: 'org.apache.grails', module: 'grails-converters'
}
api "org.apache.grails:grails-url-mappings"
api "org.grails.plugins:views-json:$viewsJsonVersion"
api "org.apache.grails:grails-views-gson:$viewsJsonVersion"
api 'io.micronaut.rxjava2:micronaut-rxjava2-http-client:1.3.0'
api "javax.servlet:javax.servlet-api:$servletApiVersion"
api "io.micronaut:micronaut-http-client:$micronautVersion"
api "org.apache.grails:grails-converters:3.3.1"
api 'com.github.javaparser:javaparser-core:3.25.7'
api "com.graphql-java:graphql-java:$graphqlJavaVersion"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.apache.grails:grails-testing-support-web"
testImplementation "cglib:cglib-nodep:3.3.0"
profile "org.grails.profiles:web-plugin"
profile "org.apache.grails.profiles:web-plugin"

api project(":gorm-graphql")
}
Expand Down
17 changes: 3 additions & 14 deletions grails-data-hibernate5/database-migration/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,26 +37,15 @@ dependencies {
compileOnly "org.springframework.boot:spring-boot-starter-logging"
compileOnly "org.springframework.boot:spring-boot-autoconfigure"
compileOnly project(":hibernate5-grails-plugin")
compileOnly "org.apache.grails:grails-core", {
exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated
}
compileOnly "org.apache.grails:grails-core"
compileOnly "org.apache.groovy:groovy-sql"
compileOnly "org.apache.groovy:groovy-xml"

testImplementation "org.springframework.boot:spring-boot-starter-tomcat"
testImplementation project(":hibernate5-grails-plugin")
testImplementation "org.apache.grails:grails-core", {
exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated
}
testImplementation "org.apache.grails:grails-core"
testImplementation project(":grails-testing-support-datamapping")
testImplementation "org.grails:grails-web-testing-support", {
exclude group: 'org.grails', module: 'grails-testing-support' // TODO: Remove after views are published
exclude group: 'org.grails', module: 'grails-plugin-interceptors' // TODO: remove after views published
exclude group: 'org.grails', module: 'grails-plugin-rest' // TODO: remove when views published
}
testImplementation 'org.apache.grails:grails-rest-transforms' // TODO: Remove when views published
testImplementation 'org.apache.grails:grails-interceptors' // TODO: Remove when views published
testImplementation 'org.apache.grails.testing:grails-testing-support-core' // TODO: Remove after views are published
testImplementation "org.apache.grails:grails-testing-support-web"
testImplementation "com.h2database:h2"
}

Expand Down
4 changes: 1 addition & 3 deletions grails-data-hibernate5/docs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ dependencies {
documentation 'org.apache.groovy:groovy-dateutil'
documentation 'org.fusesource.jansi:jansi'
documentation 'org.apache.grails.bootstrap:grails-bootstrap'
documentation 'org.apache.grails:grails-core', {
exclude group: 'org.grails', module: 'grails-datastore-core' // TODO: Remove after gorm published & core updated
}
documentation 'org.apache.grails:grails-core'
documentation 'org.apache.grails:grails-spring'
documentation "org.hibernate:hibernate-core-jakarta:$hibernateVersion"
coreProjects.each {
Expand Down
Loading
Loading