Skip to content

Commit d0d563d

Browse files
committed
Update to Grails 3.3.11
1 parent b1394df commit d0d563d

File tree

7 files changed

+47
-52
lines changed

7 files changed

+47
-52
lines changed

build.gradle

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ plugins {
1515
id 'org.asciidoctor.convert' version '1.5.3'
1616
}
1717

18-
version "1.0.2.BUILD-SNAPSHOT"
18+
version "2.0.0.BUILD-SNAPSHOT"
1919
group "org.grails.plugins"
2020

2121
apply plugin:"eclipse"
@@ -33,13 +33,6 @@ repositories {
3333
maven { url "https://repo.grails.org/grails/core" }
3434
}
3535

36-
dependencyManagement {
37-
imports {
38-
mavenBom "org.grails:grails-bom:$grailsVersion"
39-
}
40-
applyMavenExclusions false
41-
}
42-
4336
configurations {
4437
documentation
4538
}
@@ -48,21 +41,20 @@ dependencies {
4841
provided "org.springframework.boot:spring-boot-starter-logging"
4942
provided "org.springframework.boot:spring-boot-autoconfigure"
5043
provided "org.grails:grails-core"
51-
profile "org.grails.profiles:plugin:3.1.8"
44+
profile "org.grails.profiles:plugin"
5245
provided "org.grails:grails-plugin-testing"
46+
provided "org.grails:grails-gorm-testing-support"
47+
provided "org.grails:grails-web-testing-support"
5348
compile("de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.50.5") {
5449
exclude group: "commons-io"
5550
exclude group: "org.apache.commons"
5651
exclude group: "net.java.dev.jna"
5752
exclude group: "org.slf4j"
5853
}
59-
provided "org.grails.plugins:mongodb:5.0.8"
60-
documentation "org.codehaus.groovy:groovy-all:2.4.6"
54+
provided "org.grails.plugins:mongodb"
55+
documentation "org.codehaus.groovy:groovy-all"
6156
}
6257

63-
task wrapper(type: Wrapper) {
64-
gradleVersion = gradleWrapperVersion
65-
}
6658
grailsPublish {
6759
userOrg = 'grails'
6860
githubSlug = 'grails-plugins/grails-embedded-mongodb'
@@ -104,4 +96,4 @@ task apidocs(type: Groovydoc) {
10496
task docs(type:Copy, dependsOn:[apidocs, asciidoctor]) {
10597
from "$buildDir/asciidoc/html5"
10698
into "$buildDir/docs"
107-
}
99+
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
grailsVersion=3.1.8
2-
gradleWrapperVersion=2.13
1+
grailsVersion=3.3.11
2+
gradleWrapperVersion=3.5

gradle/wrapper/gradle-wrapper.jar

-818 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Nov 27 23:09:32 CET 2015
1+
#Mon Sep 21 14:22:27 IST 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip

gradlew

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,30 @@
66
##
77
##############################################################################
88

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
1126

1227
APP_NAME="Gradle"
1328
APP_BASE_NAME=`basename "$0"`
1429

30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
1533
# Use the maximum available, or set MAX_FD != -1 to use that value.
1634
MAX_FD="maximum"
1735

@@ -30,6 +48,7 @@ die ( ) {
3048
cygwin=false
3149
msys=false
3250
darwin=false
51+
nonstop=false
3352
case "`uname`" in
3453
CYGWIN* )
3554
cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
4059
MINGW* )
4160
msys=true
4261
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
4365
esac
4466

45-
# Attempt to set APP_HOME
46-
# Resolve links: $0 may be a link
47-
PRG="$0"
48-
# Need this for relative symlinks.
49-
while [ -h "$PRG" ] ; do
50-
ls=`ls -ld "$PRG"`
51-
link=`expr "$ls" : '.*-> \(.*\)$'`
52-
if expr "$link" : '/.*' > /dev/null; then
53-
PRG="$link"
54-
else
55-
PRG=`dirname "$PRG"`"/$link"
56-
fi
57-
done
58-
SAVED="`pwd`"
59-
cd "`dirname \"$PRG\"`/" >/dev/null
60-
APP_HOME="`pwd -P`"
61-
cd "$SAVED" >/dev/null
62-
6367
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6468

6569
# Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
8589
fi
8690

8791
# Increase the maximum file descriptors if we can.
88-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
8993
MAX_FD_LIMIT=`ulimit -H -n`
9094
if [ $? -eq 0 ] ; then
9195
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -157,4 +161,9 @@ function splitJvmOpts() {
157161
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
158162
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
159163

164+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
165+
if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
166+
cd "$(dirname "$0")"
167+
fi
168+
160169
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
@rem Set local scope for the variables with windows NT shell
99
if "%OS%"=="Windows_NT" setlocal
1010

11-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12-
set DEFAULT_JVM_OPTS=
13-
1411
set DIRNAME=%~dp0
1512
if "%DIRNAME%" == "" set DIRNAME=.
1613
set APP_BASE_NAME=%~n0
1714
set APP_HOME=%DIRNAME%
1815

16+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17+
set DEFAULT_JVM_OPTS=
18+
1919
@rem Find java.exe
2020
if defined JAVA_HOME goto findJavaFromJavaHome
2121

@@ -46,10 +46,9 @@ echo location of your Java installation.
4646
goto fail
4747

4848
:init
49-
@rem Get command-line arguments, handling Windowz variants
49+
@rem Get command-line arguments, handling Windows variants
5050

5151
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
if "%@eval[2+2]" == "4" goto 4NT_args
5352

5453
:win9xME_args
5554
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
6059
if "x%~1" == "x" goto execute
6160

6261
set CMD_LINE_ARGS=%*
63-
goto execute
64-
65-
:4NT_args
66-
@rem Get arguments from the 4NT Shell from JP Software
67-
set CMD_LINE_ARGS=%$
6862

6963
:execute
7064
@rem Setup the command line

src/main/groovy/org/grails/plugin/embedded/mongodb/EmbeddedMongoDBGrailsPlugin.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import org.grails.datastore.mapping.mongo.MongoDatastore
2020

2121
class EmbeddedMongoDBGrailsPlugin extends Plugin {
2222

23-
String grailsVersion = '3.1.0 > *'
23+
String grailsVersion = '3.3.11 > *'
2424
String author = 'James Kleeh'
2525
String authorEmail = 'kleehj@ociweb.com'
2626
String title = 'Mongo Embedded Integration Test Plugin'
@@ -32,7 +32,7 @@ class EmbeddedMongoDBGrailsPlugin extends Plugin {
3232
def scm = [url: 'https://github.com/grails-plugins/grails-embedded-mongodb']
3333

3434
int getPort() {
35-
config.getProperty(MongoDatastore.SETTING_PORT, int, ServerAddress.defaultPort())
35+
config.getProperty(MongoDatastore.SETTING_PORT, Integer, ServerAddress.defaultPort())
3636
}
3737

3838
IFeatureAwareVersion getVersion() {

0 commit comments

Comments
 (0)