Merge pull request #4 from grails-plugins/upgrade

Upgrade to Grails 4.1.0.M2 & Flapdoodle Embedded MongoDB 2.2.0

Author: puneetbehl

.travis.yml

@@ -1,7 +1,7 @@
 language: groovy
 sudo: false
 jdk:
-- openjdk7
+- openjdk8
 before_script:
 - rm -rf target
 script: ./travis-build.sh

build.gradle

@@ -15,9 +15,10 @@ plugins {
     id 'org.asciidoctor.convert' version '1.5.3'
 }
 
-version "1.0.2.BUILD-SNAPSHOT"
+version "2.0.0.BUILD-SNAPSHOT"
 group "org.grails.plugins"
 
+apply plugin: 'java-library'
 apply plugin:"eclipse"
 apply plugin:"idea"
 apply plugin:"org.grails.grails-plugin"
@@ -33,36 +34,34 @@ repositories {
     maven { url "https://repo.grails.org/grails/core" }
 }
 
-dependencyManagement {
-    imports {
-        mavenBom "org.grails:grails-bom:$grailsVersion"
-    }
-    applyMavenExclusions false
-}
-
 configurations {
     documentation
 }
 
+configurations.all {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        if (details.requested.group == 'org.mongodb') {
+            details.useVersion(mongodbJavaDriverVersion)
+        }
+    }
+}
+
 dependencies {
     provided "org.springframework.boot:spring-boot-starter-logging"
     provided "org.springframework.boot:spring-boot-autoconfigure"
     provided "org.grails:grails-core"
-    profile "org.grails.profiles:plugin:3.1.8"
-    provided "org.grails:grails-plugin-testing"
-    compile("de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.50.5") {
+    profile "org.grails.profiles:plugin"
+    provided "org.grails:grails-gorm-testing-support"
+    api("de.flapdoodle.embed:de.flapdoodle.embed.mongo:2.2.0") {
         exclude group: "commons-io"
-        exclude group: "org.apache.commons"
+        exclude group: "org.apache.commons", module: "commons-lang3"
         exclude group: "net.java.dev.jna"
         exclude group: "org.slf4j"
     }
-    provided "org.grails.plugins:mongodb:5.0.8"
-    documentation "org.codehaus.groovy:groovy-all:2.4.6"
+    provided "org.grails.plugins:mongodb"
+    documentation "org.codehaus.groovy:groovy-all"
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = gradleWrapperVersion
-}
 grailsPublish {
     userOrg = 'grails'
     githubSlug = 'grails-plugins/grails-embedded-mongodb'
@@ -104,4 +103,24 @@ task apidocs(type: Groovydoc) {
 task docs(type:Copy, dependsOn:[apidocs, asciidoctor]) {
     from "$buildDir/asciidoc/html5"
     into "$buildDir/docs"
-}
+}
+
+bootRun {
+    ignoreExitValue true
+    jvmArgs(
+            '-Dspring.output.ansi.enabled=always',
+            '-noverify',
+            '-XX:TieredStopAtLevel=1',
+            '-Xmx1024m')
+    sourceResources sourceSets.main
+    String springProfilesActive = 'spring.profiles.active'
+    systemProperty springProfilesActive, System.getProperty(springProfilesActive)
+}
+
+tasks.withType(GroovyCompile) {
+    configure(groovyOptions) {
+        forkOptions.jvmArgs = ['-Xmx1024m']
+    }
+}
+
+bootJar.enabled = false

gradle.properties

@@ -1,2 +1,5 @@
-grailsVersion=3.1.8
-gradleWrapperVersion=2.13
+gormVersion=7.1.0.M2
+grailsVersion=4.1.0.M2
+gradleWrapperVersion=3.5
+groovyVersion=3.0.5
+mongodbJavaDriverVersion=4.0.3

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Fri Nov 27 23:09:32 CET 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -2,7 +2,6 @@ package org.grails.compiler.injection
 
 import grails.compiler.ast.AstTransformer
 import groovy.transform.CompileStatic
-import javassist.compiler.CompileError
 import org.codehaus.groovy.ast.ClassHelper
 import org.codehaus.groovy.ast.ClassNode
 import org.codehaus.groovy.ast.expr.ClassExpression

gradlew

@@ -20,7 +20,7 @@ import org.grails.datastore.mapping.mongo.MongoDatastore
 
 class EmbeddedMongoDBGrailsPlugin extends Plugin {
 
-    String grailsVersion = '3.1.0 > *'
+    String grailsVersion = '3.3.11 > *'
     String author = 'James Kleeh'
     String authorEmail = 'kleehj@ociweb.com'
     String title = 'Mongo Embedded Integration Test Plugin'
@@ -32,7 +32,7 @@ class EmbeddedMongoDBGrailsPlugin extends Plugin {
     def scm = [url: 'https://github.com/grails-plugins/grails-embedded-mongodb']
 
     int getPort() {
-        config.getProperty(MongoDatastore.SETTING_PORT, int, ServerAddress.defaultPort())
+        config.getProperty(MongoDatastore.SETTING_PORT, Integer, ServerAddress.defaultPort())
     }
 
     IFeatureAwareVersion getVersion() {

gradlew.bat

@@ -1,6 +1,6 @@
 package org.grails.plugin.embedded.mongodb
 
-import com.mongodb.MongoClient
+import com.mongodb.client.MongoClient
 import com.mongodb.client.MongoDatabase
 import grails.config.Config
 import grails.core.GrailsApplication