Merge pull request #604 from jdaugherty/4.0.x

Remove mongo dependency & move json-templates to mongo repo

buildSrc/build.gradle

@@ -6,14 +6,7 @@ repositories {
     mavenCentral()
     maven { url = 'https://repo.grails.org/grails/core' }
 
-    def gradleGrailsVersion = project.rootProject
-            .extensions
-            .getByType(VersionCatalogsExtension.class)
-            .named("buildsrcLibs")
-            .findVersion("grails-gradle-plugin")
-            .get()
-            .displayName
-    if (System.getenv("GITHUB_MAVEN_PASSWORD") && !gradleGrailsVersion.endsWith('-SNAPSHOT')) {
+    if (System.getenv("GITHUB_MAVEN_PASSWORD")) {
         System.out.println("Adding Grails Core Repo")
         maven {
             url = 'https://maven.pkg.github.com/grails/grails-core'

docs/src/docs/asciidoc/json/installation.adoc

@@ -5,11 +5,6 @@ To activate JSON views, add the following dependency to the `dependencies` block
 [source,groovy,subs="attributes"]
 compile "org.grails.plugins:views-json:{version}"
 
-If you are also using MongoDB you may want to add the `views-json-templates` dependency too which includes support for GeoJSON:
-
-[source,groovy,subs="attributes"]
-compile "org.grails.plugins:views-json-templates:{version}"
-
 To enable Gradle compilation of JSON views for production environment add the following to the `buildscript` `dependencies` block:
 
 [source,groovy,subs="attributes"]

docs/src/docs/asciidoc/json/pluginSupport.adoc

@@ -52,8 +52,6 @@ Once this is in place any applications that includes this library will have acce
 
 For example if you want to render all instances of type `foo.bar.Birthday` create a template called `src/main/gson/foo/bar/_birthday.gson` then compile the template and place the JAR on the classpath of your application.
 
-NOTE: See the https://github.com/grails/grails-views/tree/master/json-templates/src/templates/grails/mongodb/geo[GeoJSON templates] for MongoDB for example of how it provides global templates for Mongo specific classes.
-
 == Customizing the Compile Task
 
 Unless otherwise configured, the project name of the plugin (the gradle `project.name`) is used as the `packageName` when compiling JSON views.

examples/functional-tests/build.gradle

@@ -27,15 +27,13 @@ dependencies {
 
     implementation 'org.grails.plugins:gsp'
     implementation 'org.grails.plugins:hibernate5'
-    implementation libs.grails.datastore.gorm.mongodb // Only used for access to grails.mongodb.geo.Point class
 
     implementation 'org.springframework.boot:spring-boot-autoconfigure'
     implementation 'org.springframework.boot:spring-boot-starter-logging'
     implementation 'org.springframework.boot:spring-boot-starter-tomcat'
 
     compileOnly libs.jakarta.servlet.api // Provided by Tomcat
 
-    runtimeOnly project(':views-json-templates')
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'org.apache.tomcat:tomcat-jdbc'
     runtimeOnly libs.assetpipeline

examples/functional-tests/grails-app/conf/application.yml

@@ -12,10 +12,6 @@ spring:
     groovy:
         template:
             check-template-location: false
-    autoconfigure:
-        exclude:
-            # No need to start MongoDB, we only need access to the Point class from gorm-mongodb
-            - org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration
 ---
 grails:
     mime:

examples/functional-tests/grails-app/controllers/functional/tests/PlaceController.groovy

@@ -1,24 +1,18 @@
 package functional.tests
 
-import grails.mongodb.geo.Point
-
 /**
  * Created by graemerocher on 19/05/16.
  */
 class PlaceController {
 
     static responseFormats = ['json']
 
-    def show() {
-        respond new Place(name: "London", location: Point.valueOf(10,10))
-    }
-
     def test() {
-        respond new Place(name: "London", location: Point.valueOf(10,10))
+        respond new Place(name: "London", location: "UK")
     }
 }
 
 class Place {
     String name
-    Point location
+    String location
 }

examples/functional-tests/src/integration-test/groovy/functional/tests/ObjectTemplateSpec.groovy

@@ -23,6 +23,6 @@ class ObjectTemplateSpec extends HttpClientSpec {
 
         then:"The correct response is returned"
         rsp.status() == HttpStatus.OK
-        rsp.body() == '{"location":{"type":"Point","coordinates":[10.0,10.0]},"name":"London"}'
+        rsp.body() == '{"location":"UK","name":"London"}'
     }
 }

gradle/libs.versions.toml

@@ -14,7 +14,6 @@ grails-bootstrap = { module = 'org.grails:grails-bootstrap' }
 grails-core = { module = 'org.grails:grails-core' }
 grails-datastore-core = { module = 'org.grails:grails-datastore-core' }
 grails-datastore-gorm-hibernate5 = { module = 'org.grails:grails-datastore-gorm-hibernate5' }
-grails-datastore-gorm-mongodb = { module = 'org.grails:grails-datastore-gorm-mongodb' }
 grails-datastore-gorm-support = { module = 'org.grails:grails-datastore-gorm-support' }
 grails-encoder = { module = 'org.grails:grails-encoder' }
 grails-gradle-plugin = { module = 'org.grails:grails-gradle-plugin', version.ref = 'grails-gradle-plugin' }
@@ -32,7 +31,6 @@ jakarta-servlet-api = { module = 'jakarta.servlet:jakarta.servlet-api' }
 jakarta-validation-api = { module = 'jakarta.validation:jakarta.validation-api' }
 micronaut-jackson-databind = { module = 'io.micronaut:micronaut-jackson-databind', version.ref = 'micronaut' }
 micronaut-http-client = { module = 'io.micronaut:micronaut-http-client', version.ref = 'micronaut' }
-mongodb-bson = { module = 'org.mongodb:bson' }
 slf4j-api = { module = 'org.slf4j:slf4j-api' }
 slf4j-nop = { module = 'org.slf4j:slf4j-nop' }
 spock-core = { module = 'org.spockframework:spock-core' }

settings.gradle

@@ -46,7 +46,7 @@ dependencyResolutionManagement {
     }
 }
 
-['core', 'json', 'docs', 'json-templates', 'json-testing-support', 'markup'].each {dirName ->
+['core', 'json', 'docs', 'json-testing-support', 'markup'].each {dirName ->
     include("views-$dirName")
     project(":views-$dirName").projectDir = file(dirName)
 }