Update build scripts

rainboyan · rainboyan · commit f643155151e6 · 2025-11-11T16:20:06.000+08:00
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -33,7 +33,7 @@ jobs:
         uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
       - name: Run Build
         id: build
-        run: ./gradlew build -x codenarcMain -x codenarcTest -x checkstyleMain -x checkstyleTest
+        run: ./gradlew build -x integrationTest
   publish:
     if: github.event_name == 'push'
     needs: ["build"]
diff --git a/build.gradle b/build.gradle
@@ -281,43 +281,3 @@ subprojects { Project subproject ->
     }
 
 }
-
-
-def cleanTask = project.tasks.findByName('clean')
-if (cleanTask == null) {
-    task clean(type: Delete) {
-        delete(buildDir)
-    }
-}
-else {
-    cleanTask.doLast {
-        ant.delete(dir: 'build/docs')
-    }
-}
-
-tasks.withType(Groovydoc) {
-    group = 'Documentation'
-    docTitle = "Grace Data Hibernate - ${project.version}"
-    destinationDir = project.file('build/docs/manual/api')
-    def files = []
-    project.rootProject.subprojects
-            .findAll { !it.name != 'docs' && !it.name.startsWith('examples') }
-            .each { subproject ->
-                if(subproject.file('src/main/groovy').exists()) {
-                    files += subproject.files('src/main/groovy')
-                }
-                if(subproject.file('src/main/java').exists()) {
-                    files += subproject.files('src/main/java')
-                }
-            }
-    if (project.file('src/main/groovy').exists()) {
-        files += project.files('src/main/groovy')
-    }
-    source = files
-    classpath += configurations.documentation
-}
-
-publishGuide {
-    dependsOn groovydoc
-    sourceDir = project.file('src/docs')
-}
diff --git a/examples/grace-data-service/app/views/application/index.gson b/examples/grace-data-service/app/views/application/index.gson
@@ -11,7 +11,7 @@ model {
 json {
 	message "Welcome to Grace!"
     environment Environment.current.name
-    appversion grailsApplication.metadata.getApplicationVersion()
+    appversion Metadata.current.getApplicationVersion()
     grailsversion GrailsUtil.grailsVersion
     appprofile grailsApplication.config.getProperty('grails.profile')
     groovyversion GroovySystem.getVersion()
diff --git a/examples/grace-data-service/build.gradle b/examples/grace-data-service/build.gradle
@@ -15,20 +15,20 @@ buildscript {
     }
     dependencies {
         classpath "org.graceframework:grace-gradle-plugin:$graceVersion"
-        classpath "org.graceframework.plugins:views-gradle:$graceViewsVersion"
     }
 }
 
 group = "examples"
 
 apply plugin: "org.graceframework.grace-web"
-apply plugin: "org.graceframework.plugins.views-json"
+apply plugin: "org.graceframework.grace-json"
 
 dependencies {
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-logging"
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.graceframework:grace-boot"
+    implementation "org.graceframework:grace-boot-hibernate"
     implementation "org.graceframework:grace-core"
     implementation "org.graceframework:grace-logging"
     implementation "org.graceframework:grace-plugin-codecs"
@@ -42,10 +42,9 @@ dependencies {
     implementation "org.graceframework:grace-plugin-rest"
     implementation "org.graceframework:grace-plugin-services"
     implementation "org.graceframework:grace-plugin-url-mappings"
-    // implementation "org.graceframework.plugins:cache"
+    // implementation "org.graceframework:grace-plugin-cache"
     implementation "org.graceframework:grace-plugin-events"
-    implementation "org.graceframework.plugins:views-json"
-    implementation project(":hibernate")
+    implementation "org.graceframework:grace-views-json"
     runtimeOnly 'com.h2database:h2'
     profile "org.graceframework.profiles:rest-api"
     testImplementation "org.graceframework:grace-test-support"
diff --git a/examples/grace-database-per-tenant/build.gradle b/examples/grace-database-per-tenant/build.gradle
@@ -25,13 +25,14 @@ group = "examples"
 apply plugin: "org.graceframework.grace-web"
 apply plugin: "org.graceframework.grace-gsp"
 apply plugin: "org.graceframework.asset-pipeline"
-apply plugin: "org.graceframework.plugins.views-json"
+apply plugin: "org.graceframework.grace-json"
 
 dependencies {
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-logging"
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.graceframework:grace-boot"
+    implementation "org.graceframework:grace-boot-hibernate"
     implementation "org.graceframework:grace-core"
     implementation "org.graceframework:grace-logging"
     implementation "org.graceframework:grace-plugin-codecs"
@@ -46,15 +47,13 @@ dependencies {
     implementation "org.graceframework:grace-plugin-rest"
     implementation "org.graceframework:grace-plugin-services"
     implementation "org.graceframework:grace-plugin-url-mappings"
-    implementation project(":hibernate")
-    // implementation "org.graceframework.plugins:cache"
+    // implementation "org.graceframework:grace-plugin-cache"
     implementation "org.graceframework:grace-plugin-events"
-    runtimeOnly "org.graceframework.plugins:fields"
-    runtimeOnly "org.graceframework.plugins:scaffolding"
+    runtimeOnly "org.graceframework:grace-plugin-fields"
+    runtimeOnly "org.graceframework:grace-plugin-scaffolding"
     runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin"
     runtimeOnly "com.h2database:h2"
-    implementation "org.graceframework.plugins:views-json"
-    implementation "org.graceframework.plugins:views-json-templates"
+    implementation "org.graceframework:grace-views-json"
     profile "org.graceframework.profiles:rest-api"
     testImplementation "org.graceframework:grace-test-support"
 }
diff --git a/examples/grace-hibernate5/app/domain/functional/tests/Person.groovy b/examples/grace-hibernate5/app/domain/functional/tests/Person.groovy
@@ -1,5 +1,5 @@
 package functional.tests
 
-abstract class Person {
+class Person {
 
 }
diff --git a/examples/grace-hibernate5/build.gradle b/examples/grace-hibernate5/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.graceframework:grace-core"
     implementation "org.graceframework:grace-boot"
+    implementation "org.graceframework:grace-boot-hibernate"
     implementation "org.graceframework:grace-logging"
     implementation "org.graceframework:grace-plugin-core"
     implementation "org.graceframework:grace-plugin-codecs"
@@ -56,11 +57,10 @@ dependencies {
     implementation "org.graceframework:grace-plugin-services"
     implementation "org.graceframework:grace-plugin-url-mappings"
     implementation "org.graceframework:grace-plugin-async"
-    // implementation "org.graceframework.plugins:cache"
+    // implementation "org.graceframework:grace-plugin-cache"
     implementation "org.graceframework:grace-plugin-events"
-    implementation "org.graceframework.plugins:fields"
-    implementation "org.graceframework.plugins:scaffolding"
-    implementation project(":hibernate")
+    implementation "org.graceframework:grace-plugin-fields"
+    implementation "org.graceframework:grace-plugin-scaffolding"
     runtimeOnly "com.h2database:h2"
     implementation "net.sf.ehcache:ehcache:2.10.6"
     implementation ("org.hibernate:hibernate-ehcache:$hibernateCoreVersion") {
@@ -107,7 +107,9 @@ tasks.withType(Test) {
 //         version = '126.0.6478.126'
 //         fallbackTo32Bit = true
 //     }
-//     geckodriver '0.33.0'
+//     geckodriver {
+//         version = '0.33.0'
+//     }
 // }
 
 tasks.withType(Test) {
diff --git a/examples/grace-hibernate5/src/integration-test/resources/GebConfig.groovy b/examples/grace-hibernate5/src/integration-test/resources/GebConfig.groovy
@@ -2,14 +2,14 @@ import org.openqa.selenium.chrome.ChromeDriver
 import org.openqa.selenium.chrome.ChromeOptions
 import org.openqa.selenium.firefox.FirefoxDriver
 import org.openqa.selenium.firefox.FirefoxOptions
-import org.openqa.selenium.safari.SafariDriver
+// import org.openqa.selenium.safari.SafariDriver
 
 environments {
 
     // You need to configure in Safari -> Develop -> Allowed Remote Automation
-    safari {
-        driver = { new SafariDriver() }
-    }
+    // safari {
+    //     driver = { new SafariDriver() }
+    // }
 
     // run via “./gradlew -Dgeb.env=chrome iT”
     chrome {
diff --git a/examples/grace-partitioned-multi-tenancy/build.gradle b/examples/grace-partitioned-multi-tenancy/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.graceframework:grace-core"
     implementation "org.graceframework:grace-boot"
+    implementation "org.graceframework:grace-boot-hibernate"
     implementation "org.graceframework:grace-logging"
     implementation "org.graceframework:grace-plugin-core"
     implementation "org.graceframework:grace-plugin-codecs"
@@ -56,11 +57,10 @@ dependencies {
     implementation "org.graceframework:grace-plugin-services"
     implementation "org.graceframework:grace-plugin-url-mappings"
     implementation "org.graceframework:grace-plugin-async"
-    // implementation "org.graceframework.plugins:cache"
+    // implementation "org.graceframework:grace-plugin-cache"
     implementation "org.graceframework:grace-plugin-events"
-    implementation "org.graceframework.plugins:fields"
-    implementation "org.graceframework.plugins:scaffolding"
-    implementation project(":hibernate")
+    implementation "org.graceframework:grace-plugin-fields"
+    implementation "org.graceframework:grace-plugin-scaffolding"
     profile "org.graceframework.profiles:web"
     runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin"
     runtimeOnly "com.h2database:h2"
diff --git a/examples/grace-schema-per-tenant/build.gradle b/examples/grace-schema-per-tenant/build.gradle
@@ -17,7 +17,6 @@ buildscript {
     dependencies {
         classpath "org.graceframework:grace-gradle-plugin:$graceVersion"
         classpath "org.graceframework.plugins:asset-pipeline-gradle:$assetPipelineVersion"
-        classpath "org.graceframework.plugins:views-gradle:$graceViewsVersion"
         // classpath "com.github.erdi:webdriver-binaries-gradle-plugin:3.2"
     }
 }
@@ -42,6 +41,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.graceframework:grace-core"
     implementation "org.graceframework:grace-boot"
+    implementation "org.graceframework:grace-boot-hibernate"
     implementation "org.graceframework:grace-logging"
     implementation "org.graceframework:grace-plugin-core"
     implementation "org.graceframework:grace-plugin-codecs"
@@ -57,11 +57,10 @@ dependencies {
     implementation "org.graceframework:grace-plugin-services"
     implementation "org.graceframework:grace-plugin-url-mappings"
     implementation "org.graceframework:grace-plugin-async"
-    // implementation "org.graceframework.plugins:cache"
+    // implementation "org.graceframework:grace-plugin-cache"
     implementation "org.graceframework:grace-plugin-events"
-    implementation "org.graceframework.plugins:fields"
-    implementation "org.graceframework.plugins:scaffolding"
-    implementation project(":hibernate")
+    implementation "org.graceframework:grace-plugin-fields"
+    implementation "org.graceframework:grace-plugin-scaffolding"
     profile "org.graceframework.profiles:web"
     runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin"
     runtimeOnly "com.h2database:h2"
diff --git a/examples/spring-boot-hibernate5/build.gradle b/examples/spring-boot-hibernate5/build.gradle
@@ -28,10 +28,10 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.apache.groovy:groovy'
     implementation "org.graceframework:grace-boot:$graceVersion"
+    implementation "org.graceframework:grace-boot-hibernate:$graceVersion"
     implementation "org.graceframework:grace-core:$graceVersion"
     implementation "org.graceframework:grace-plugin-core:$graceVersion"
     implementation "org.graceframework:grace-plugin-datasource:$graceVersion"
-    implementation project(":hibernate")
     implementation "org.javassist:javassist:3.30.2-GA"
     runtimeOnly 'com.h2database:h2'
     implementation "net.sf.ehcache:ehcache:2.10.6"
diff --git a/examples/standalone-hibernate5/build.gradle b/examples/standalone-hibernate5/build.gradle
@@ -12,7 +12,7 @@ dependencyManagement {
 }
 
 dependencies {
-    implementation project(":grace-datastore-gorm-hibernate")
+    implementation "org.graceframework:grace-datastore-gorm-hibernate"
     runtimeOnly "com.h2database:h2"
     runtimeOnly "org.apache.tomcat:tomcat-jdbc"
     runtimeOnly "org.slf4j:slf4j-api"
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 projectVersion=2024.0.0-SNAPSHOT
 gormVersion=2024.0.0-SNAPSHOT
 graceVersion=2024.0.0-SNAPSHOT
-groovyVersion=4.0.28
+groovyVersion=4.0.29
 hibernateCoreVersion=5.6.15.Final
 hibernateValidatorVersion=8.0.2.Final
 jakartaElImplVersion=5.0.0
diff --git a/settings.gradle b/settings.gradle
@@ -1,14 +1,7 @@
-rootProject.name = 'Grace.Data.Hibernate'
-
-// Core
-include "grace-datastore-gorm-hibernate"
-
-// Plugins
-include 'grace-plugin'
-project(':grace-plugin').name = 'hibernate'
+rootProject.name = 'Grace.Data.Examples'
 
 // Examples
-// file("${rootDir}/examples").eachDir {
-// 	include "examples-${it.name}"
-//     project(":examples-${it.name}").projectDir = new File(settingsDir, "examples/${it.name}")
-// }
+file("${rootDir}/examples").eachDir {
+	include "examples-${it.name}"
+    project(":examples-${it.name}").projectDir = new File(settingsDir, "examples/${it.name}")
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`package functional.tests`
`2`	`2`
`3`		`-abstract class Person {`
	`3`	`+class Person {`
`4`	`4`
`5`	`5`	`}`