Rename to Grace artifacts

Author: rainboyan

boot-plugin/build.gradle

@@ -1,9 +1,7 @@
 dependencies {
     api "org.springframework.boot:spring-boot-autoconfigure:$springBootVersion"
     api "org.apache.groovy:groovy:$groovyVersion"
-    api project(":grails-datastore-gorm-mongodb")
-    api project(":grails-datastore-gorm-mongodb-ext"), {
-        exclude group:'org.graceframework', module:'grails-datastore-gorm-mongodb'
-    }
+    api project(":grace-datastore-gorm-mongodb")
+    api project(":grace-datastore-gorm-mongodb-ext")
     api "org.springframework:spring-tx:$springVersion"
 }

build.gradle

@@ -27,30 +27,29 @@ ext {
     nexusPassword = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : ''
 }
 
-ext."signing.keyId" = project.hasProperty("signing.keyId") ? project.getProperty('signing.keyId') : System.getenv('SIGNING_KEY')
-ext."signing.password" = project.hasProperty("signing.password") ? project.getProperty('signing.password') : System.getenv('SIGNING_PASSPHRASE')
-ext."signing.secretKeyRingFile" = project.hasProperty("signing.secretKeyRingFile") ? project.getProperty('signing.secretKeyRingFile') : "${System.properties['user.home']}${File.separator}.gnupg${File.separator}secring.gpg"
+ext."signing.keyId" = System.getenv("SIGNING_KEY") ?: project.hasProperty("signing.keyId") ? project.getProperty('signing.keyId') : null
+ext."signing.password" = System.getenv("SIGNING_PASSPHRASE") ?: project.hasProperty("signing.password") ? project.getProperty('signing.password') : null
+ext."signing.secretKeyRingFile" = project.hasProperty("signing.secretKeyRingFile") ? project.getProperty('signing.secretKeyRingFile') : null
+ext['junit-jupiter.version'] = junitJupiterVersion
 
-if (isReleaseVersion) {
-    apply plugin: 'maven-publish'
-    apply plugin: "io.github.gradle-nexus.publish-plugin"
-
-    nexusPublishing {
-        repositories {
-            sonatype {
-                def ossUser = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : ''
-                def ossPass = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : ''
-                def ossStagingProfileId = System.getenv("SONATYPE_STAGING_PROFILE_ID") ?: project.hasProperty("sonatypeOssStagingProfileId") ? project.sonatypeOssStagingProfileId : ''
-                nexusUrl = uri("https://s01.oss.sonatype.org/service/local/")
-                username = ossUser
-                password = ossPass
-                stagingProfileId = ossStagingProfileId
-            }
+apply plugin: 'maven-publish'
+apply plugin: "io.github.gradle-nexus.publish-plugin"
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            def ossUser = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : ''
+            def ossPass = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : ''
+            def ossStagingProfileId = System.getenv("SONATYPE_STAGING_PROFILE_ID") ?: project.hasProperty("sonatypeOssStagingProfileId") ? project.sonatypeOssStagingProfileId : ''
+            nexusUrl = uri("https://s01.oss.sonatype.org/service/local/")
+            snapshotRepositoryUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+            username = ossUser
+            password = ossPass
+            stagingProfileId = ossStagingProfileId
         }
     }
 }
 
-
 subprojects { project ->
 
     ext {
@@ -120,8 +119,8 @@ subprojects { project ->
         return
     }
 
-    boolean isPluginProject = project.name.endsWith("-plugin") && (project.name.startsWith("grails") || project.name.startsWith("rx-"))
-    boolean isGrails3PluginProject = project.name.endsWith("-plugin")
+    boolean isPluginProject = project.name.startsWith("grace") && project.name.endsWith("-plugin")
+    boolean isGracePluginProject = project.name.endsWith("-plugin")
 
     ext {
         projectInfo = new PublishingConvention(project)
@@ -166,23 +165,21 @@ subprojects { project ->
     apply plugin: 'groovy'
 
     if (isPluginProject) {
-        group "org.graceframework.plugins"
-        version(rootProject.version)
+        group = "org.graceframework.plugins"
+        version = rootProject.version
+
+        apply plugin: "org.graceframework.grace-plugin"
     } else {
-        group "org.graceframework"
-        version rootProject.version
+        group = "org.graceframework"
+        version = rootProject.version
+
+        apply plugin: "groovy"
     }
 
     if (project.name == 'docs') {
         return
     }
 
-    if (isGrails3PluginProject) {
-        apply plugin: "org.graceframework.grace-plugin"
-    } else {
-        apply plugin: "groovy"
-    }
-
     apply plugin: "java-library"
     apply plugin: 'maven-publish'
     apply plugin: 'signing'
@@ -220,25 +217,6 @@ subprojects { project ->
     }
 
     publishing {
-
-        if (isBuildSnapshot) {
-            repositories {
-                maven {
-                    credentials {
-                        def u = System.getenv("ARTIFACTORY_USERNAME") ?: project.hasProperty("artifactoryPublishUsername") ? project.artifactoryPublishUsername : ''
-                        def p = System.getenv("ARTIFACTORY_PASSWORD") ?: project.hasProperty("artifactoryPublishPassword") ? project.artifactoryPublishPassword : ''
-                        username = u
-                        password = p
-                    }
-                    if (isGrails3PluginProject) {
-                        url "https://repo.grails.org/grails/plugins3-snapshots-local"
-                    } else {
-                        url "https://repo.grails.org/grails/libs-snapshots-local"
-                    }
-                }
-            }
-        }
-
         publications {
             maven(MavenPublication) {
 
@@ -274,7 +252,7 @@ subprojects { project ->
                 from components.java
 
                 afterEvaluate {
-                    if (isGrails3PluginProject) {
+                    if (isGracePluginProject) {
                         artifact source:"${sourceSets.main.groovy.outputDir}/META-INF/grails-plugin.xml",
                                 classifier:"plugin",
                                 extension:'xml'
@@ -311,7 +289,7 @@ class PublishingConvention {
     Project project
 
     String projectArtifactId
-    String projectName = 'GORM for MongoDB'
+    String projectName = 'Grace Data MongoDB'
     String projectDescription = 'Provides a GORM Object Mapping implementations for the MongodB Document Database'
     String projectURL = 'https://github.com/graceframework/grace-data-mongodb'
     String projectIssueTrackerUrl = 'https://github.com/graceframework/grace-data-mongodb/issues'
@@ -321,7 +299,7 @@ class PublishingConvention {
         this.project = project
 
         def name = project.name
-        if(name.startsWith('grails') && name.endsWith('-plugin')) {
+        if (name.startsWith('grace') && name.endsWith('-plugin')) {
             name = 'mongodb'
         }
         projectArtifactId = name

examples/grails3-hibernate5-mongodb/build.gradle

@@ -7,13 +7,10 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
     implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
     implementation "org.graceframework:grace-core:$graceVersion"
-    // implementation "org.graceframework:grace-dependencies:$graceVersion", {
-    //     exclude module:'grails-datastore-simple'
-    // }
     implementation "org.graceframework:grace-boot:$graceVersion"
     implementation "org.graceframework:grace-plugin-gsp:$graceVersion"
     implementation "org.mongodb:mongodb-driver-sync:$mongodbDriverVersion"
-    implementation project(":grails-plugin")
+    implementation project(":grace-plugin")
     implementation "org.graceframework.plugins:hibernate:$hibernatePluginVersion"
     implementation "org.hibernate:hibernate-ehcache:$hibernateCoreVersion"
 
@@ -28,7 +25,7 @@ dependencies {
     testImplementation "io.netty:netty-transport:4.1.72.Final"
     testImplementation "io.netty:netty-codec:4.1.72.Final"
     testImplementation "io.netty:netty-handler:4.1.72.Final"
-    testImplementation "org.grails.plugins:geb"
+    testImplementation "org.graceframework.plugins:geb"
 
     testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
     testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"

examples/grails3-mongodb-database-per-tenant/build.gradle

@@ -5,12 +5,9 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
     implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
     implementation "org.graceframework:grace-core:$graceVersion"
-    // implementation "org.graceframework:grace-dependencies:$grailsVersion", {
-    //     exclude module:'grace-datastore-simple'
-    // }
     implementation "org.graceframework:grace-boot:$graceVersion"
     implementation "org.graceframework:grace-plugin-gsp:$graceVersion"
-    implementation project(":grails-plugin")
+    implementation project(":grace-plugin")
 
     runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:$assetPipelineVersion"
     runtimeOnly "com.h2database:h2"

examples/grails3-mongodb/build.gradle

@@ -7,12 +7,9 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
     implementation "jakarta.servlet:jakarta.servlet-api:$servletApiVersion"
     implementation "org.graceframework:grace-core:$graceVersion"
-    // implementation "org.graceframework:grace-dependencies:$graceVersion", {
-    //     exclude module:'grails-datastore-simple'
-    // }
     implementation "org.graceframework:grace-boot:$graceVersion"
     implementation "org.graceframework:grace-plugin-gsp:$graceVersion"
-    implementation project(":grails-plugin")
+    implementation project(":grace-plugin")
     implementation "org.mongodb:mongodb-driver-sync:$mongodbDriverVersion"
 
     runtimeOnly "org.graceframework.plugins:asset-pipeline-plugin:$assetPipelineVersion"

examples/springboot-mongodb/build.gradle

@@ -14,16 +14,8 @@ ext['groovy.version'] = "$groovyVersion"
 dependencies {
     implementation "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
     implementation "org.mongodb:mongodb-driver-sync:$mongodbDriverVersion"
-    implementation project(":gorm-mongodb-spring-boot")
+    implementation project(":grace-gorm-mongodb-spring-boot")
 
     testImplementation"org.springframework.boot:spring-boot-starter-test:$springBootVersion"
     testImplementation"org.spockframework:spock-core:$spockVersion"
 }
-
-configurations.all {
-    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        if(details.requested.group == 'javax.validation' && details.requested.name.equals('validation-api')) {
-            details.useVersion("2.0.1.Final")
-        }
-    }
-}

examples/test-data-service/build.gradle

@@ -4,17 +4,14 @@ dependencies {
     implementation "org.graceframework:grace-core"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
-    // implementation ("org.graceframework:grace-dependencies") {
-    //     exclude module:'grails-datastore-simple'
-    // }
     implementation "org.graceframework:grace-plugin-codecs"
     implementation "org.graceframework:grace-plugin-services"
     implementation "org.graceframework:grace-plugin-datasource"
     implementation "org.graceframework:grace-boot"
     implementation "org.graceframework:grace-logging"
     implementation "org.graceframework.plugins:cache"
     implementation "org.graceframework.plugins:events"
-    implementation project(":grails-plugin")
+    implementation project(":grace-plugin")
     implementation "org.mongodb:mongodb-driver-sync:$mongodbDriverVersion"
     implementation "org.graceframework.plugins:views-json"
     implementation "org.graceframework.plugins:views-json-templates"