Skip to content

Commit 3da0b1a

Browse files
benrhinesdelamo
benrhine
authored and
sdelamo
committed
upgrading gradle, gorm, grails 3.3.0 and associated dependencies, tests updated to new testing framework
1 parent e27da27 commit 3da0b1a

File tree

19 files changed

+154
-132
lines changed

19 files changed

+154
-132
lines changed

Diff for: ‎complete/build.gradle

+17-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66
dependencies {
77
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
8-
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.14.1"
8+
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.14.2"
99
classpath "org.grails.plugins:hibernate5:${gormVersion-".RELEASE"}"
1010
}
1111
}
@@ -32,22 +32,32 @@ dependencies {
3232
compile "org.grails:grails-core"
3333
compile "org.springframework.boot:spring-boot-starter-actuator"
3434
compile "org.springframework.boot:spring-boot-starter-tomcat"
35-
compile "org.grails:grails-dependencies"
3635
compile "org.grails:grails-web-boot"
36+
compile "org.grails:grails-logging"
37+
compile "org.grails:grails-plugin-rest"
38+
compile "org.grails:grails-plugin-databinding"
39+
compile "org.grails:grails-plugin-i18n"
40+
compile "org.grails:grails-plugin-services"
41+
compile "org.grails:grails-plugin-url-mappings"
42+
compile "org.grails:grails-plugin-interceptors"
3743
compile "org.grails.plugins:cache"
44+
compile "org.grails.plugins:async"
3845
compile "org.grails.plugins:scaffolding"
46+
compile "org.grails.plugins:events"
3947
compile "org.grails.plugins:hibernate5"
40-
compile "org.hibernate:hibernate-core:5.1.3.Final"
41-
compile "org.hibernate:hibernate-ehcache:5.1.3.Final"
48+
compile "org.hibernate:hibernate-core:5.1.5.Final"
49+
compile "org.grails.plugins:gsp"
4250
console "org.grails:grails-console"
4351
profile "org.grails.profiles:web"
44-
runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.14.1"
52+
runtime "org.glassfish.web:el-impl:2.1.2-b03"
4553
runtime "com.h2database:h2"
54+
runtime "org.apache.tomcat:tomcat-jdbc"
55+
runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.14.2"
4656
//uncomment to use MySQL
4757
//runtime 'mysql:mysql-connector-java:5.1.40'
48-
49-
testCompile "org.grails:grails-plugin-testing"
58+
testCompile "org.grails:grails-gorm-testing-support"
5059
testCompile "org.grails.plugins:geb"
60+
testCompile "org.grails:grails-web-testing-support"
5161
testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
5262
testRuntime "net.sourceforge.htmlunit:htmlunit:2.18"
5363
}

Diff for: ‎complete/gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
grailsVersion=3.2.10
2-
gormVersion=6.0.10.RELEASE
3-
gradleWrapperVersion=3.4.1
1+
grailsVersion=3.3.0
2+
gormVersion=6.1.6.RELEASE
3+
gradleWrapperVersion=3.5

Diff for: ‎complete/gradle/wrapper/gradle-wrapper.jar

1.92 KB
Binary file not shown.

Diff for: ‎complete/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Nov 27 23:09:32 CET 2015
1+
#Fri Jul 28 10:46:41 EDT 2017
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-3.4.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip

Diff for: ‎complete/gradlew

+40-28
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,35 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
55
## Gradle start up script for UN*X
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
@@ -150,11 +154,19 @@ if $cygwin ; then
150154
esac
151155
fi
152156

153-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
154-
function splitJvmOpts() {
155-
JVM_OPTS=("$@")
157+
# Escape application args
158+
save ( ) {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
156161
}
157-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
158-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
159171

160-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
172+
exec "$JAVACMD" "$@"

Diff for: ‎complete/gradlew.bat

+4-10
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

Diff for: ‎complete/grails-app/assets/stylesheets/grails.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ a.navbar-brand {
235235

236236
@media (max-width: 1010px) {
237237
.event-logo {
238-
height: ;
238+
height: 100px;
239239
}
240240

241241
}

Diff for: ‎complete/grails-app/conf/application.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ grails:
77
transactionManagement:
88
proxies: false
99
gorm:
10-
# Whether to autowire entities.
11-
# Disabled by default for performance reasons.
12-
autowire: false
1310
reactor:
1411
# Whether to translate GORM events into Reactor events
1512
# Disabled by default for performance reasons
@@ -92,16 +89,15 @@ endpoints:
9289
hibernate:
9390
cache:
9491
queries: false
95-
use_second_level_cache: true
92+
use_second_level_cache: false
9693
use_query_cache: false
97-
region.factory_class: org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory
9894

9995
dataSource:
10096
pooled: true
10197
jmxExport: true
10298
driverClassName: org.h2.Driver
10399
username: sa
104-
password:
100+
password: ''
105101

106102
environments:
107103
development:

Diff for: ‎complete/src/test/groovy/org/grails/guides/ValueEstimateServiceSpec.groovy

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package org.grails.guides
22

3-
import grails.test.mixin.Mock
4-
import grails.test.mixin.TestFor
3+
import grails.testing.gorm.DataTest
4+
import grails.testing.services.ServiceUnitTest
55
import spock.lang.Specification
66

7-
/**
8-
* See the API for {@link grails.test.mixin.services.ServiceUnitTestMixin} for usage instructions
9-
*/
7+
class ValueEstimateServiceSpec extends Specification implements ServiceUnitTest<ValueEstimateService>, DataTest {
108

11-
@Mock([Make, Model, Vehicle]) // <1>
12-
@TestFor(ValueEstimateService)
13-
class ValueEstimateServiceSpec extends Specification {
9+
void setupSpec() { // <1>
10+
mockDomain Make
11+
mockDomain Model
12+
mockDomain Vehicle
13+
}
1414

1515
void testEstimateRetrieval() {
1616
given: 'a vehicle'

Diff for: ‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Jan 09 10:00:57 CST 2017
1+
#Fri Jul 28 10:45:23 EDT 2017
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-3.2.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip

Diff for: ‎initial/build.gradle

+18-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66
dependencies {
77
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
8-
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.14.1"
8+
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.14.2"
99
classpath "org.grails.plugins:hibernate5:${gormVersion-".RELEASE"}"
1010
}
1111
}
@@ -31,19 +31,30 @@ dependencies {
3131
compile "org.grails:grails-core"
3232
compile "org.springframework.boot:spring-boot-starter-actuator"
3333
compile "org.springframework.boot:spring-boot-starter-tomcat"
34-
compile "org.grails:grails-dependencies"
3534
compile "org.grails:grails-web-boot"
35+
compile "org.grails:grails-logging"
36+
compile "org.grails:grails-plugin-rest"
37+
compile "org.grails:grails-plugin-databinding"
38+
compile "org.grails:grails-plugin-i18n"
39+
compile "org.grails:grails-plugin-services"
40+
compile "org.grails:grails-plugin-url-mappings"
41+
compile "org.grails:grails-plugin-interceptors"
3642
compile "org.grails.plugins:cache"
43+
compile "org.grails.plugins:async"
3744
compile "org.grails.plugins:scaffolding"
45+
compile "org.grails.plugins:events"
3846
compile "org.grails.plugins:hibernate5"
39-
compile "org.hibernate:hibernate-core:5.1.3.Final"
40-
compile "org.hibernate:hibernate-ehcache:5.1.3.Final"
47+
compile "org.hibernate:hibernate-core:5.1.5.Final"
48+
compile "org.grails.plugins:gsp"
4149
console "org.grails:grails-console"
4250
profile "org.grails.profiles:web"
43-
runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.14.1"
51+
runtime "org.glassfish.web:el-impl:2.1.2-b03"
4452
runtime "com.h2database:h2"
45-
testCompile "org.grails:grails-plugin-testing"
53+
runtime "org.apache.tomcat:tomcat-jdbc"
54+
runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.14.2"
55+
testCompile "org.grails:grails-gorm-testing-support"
4656
testCompile "org.grails.plugins:geb"
57+
testCompile "org.grails:grails-web-testing-support"
4758
testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
4859
testRuntime "net.sourceforge.htmlunit:htmlunit:2.18"
4960
}
@@ -53,8 +64,7 @@ bootRun {
5364
addResources = true
5465
}
5566

56-
5767
assets {
5868
minifyJs = true
5969
minifyCss = true
60-
}
70+
}

Diff for: ‎initial/gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
grailsVersion=3.2.10
2-
gormVersion=6.0.10.RELEASE
3-
gradleWrapperVersion=3.4.1
1+
grailsVersion=3.3.0
2+
gormVersion=6.1.6.RELEASE
3+
gradleWrapperVersion=3.5

Diff for: ‎initial/gradle/wrapper/gradle-wrapper.jar

1.92 KB
Binary file not shown.

Diff for: ‎initial/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Nov 27 23:09:32 CET 2015
1+
#Fri Jul 28 10:45:44 EDT 2017
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-3.4.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip

0 commit comments

Comments
 (0)