Skip to content

Commit e091fe9

Browse files
sbglasiussbglasius
committed
Upgraded to Grails 6.2.x
* All functional tests now uses Micronaut Http Client * Using test-containers for Redis instance * Updating documentation
1 parent 1ed40f2 commit e091fe9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1700
-994
lines changed

‎build.gradle

Lines changed: 59 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,86 @@
11
buildscript {
2-
ext {
3-
grailsVersion = project.grailsVersion
4-
}
52
repositories {
6-
mavenLocal()
73
maven { url "https://repo.grails.org/grails/core" }
4+
mavenCentral()
85
}
9-
dependencies {
10-
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
11-
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.8.2"
12-
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
6+
dependencies { // Not Published to Gradle Plugin Portal
7+
classpath "org.grails:grails-gradle-plugin:6.2.4"
8+
classpath "org.grails.plugins:hibernate5:8.1.0"
139
}
1410
}
1511

16-
version '2.0.1.BUILD-SNAPSHOT'
17-
group 'org.grails.plugins'
12+
plugins {
13+
id "groovy"
14+
id "war"
15+
id "idea"
16+
id "application"
17+
id "eclipse"
18+
id 'org.asciidoctor.jvm.convert' version '4.0.2'
19+
}
1820

19-
apply plugin:"eclipse"
20-
apply plugin:"idea"
21-
apply plugin:"org.grails.grails-plugin"
22-
apply plugin:"org.grails.grails-plugin-publish"
23-
apply plugin:"org.grails.grails-gsp"
24-
apply plugin: 'org.asciidoctor.convert'
21+
// Not Published to Gradle Plugin Portal
22+
apply plugin: "org.grails.grails-plugin"
23+
//apply plugin:"org.grails.grails-plugin-publish"
2524

26-
ext {
27-
grailsVersion = project.grailsVersion
28-
gradleWrapperVersion = project.gradleWrapperVersion
29-
}
3025

3126
repositories {
32-
mavenLocal()
33-
maven { url "https://repo.grails.org/grails/core" }
34-
}
35-
36-
dependencyManagement {
37-
imports {
38-
mavenBom "org.grails:grails-bom:$grailsVersion"
39-
}
40-
applyMavenExclusions false
27+
mavenCentral()
28+
maven { url "https://repo.grails.org/grails/core/" }
4129
}
4230

4331
dependencies {
44-
provided 'org.springframework.boot:spring-boot-starter-logging'
45-
provided 'org.springframework.boot:spring-boot-autoconfigure'
46-
provided 'org.springframework.boot:spring-boot-starter-actuator'
47-
provided 'org.springframework.boot:spring-boot-starter-tomcat'
48-
provided "org.grails:grails-dependencies"
49-
provided "org.grails:grails-web-boot"
50-
compile "org.grails:grails-core"
51-
compile "org.grails.plugins:cache"
32+
compileOnly 'org.springframework.boot:spring-boot-starter-logging'
33+
compileOnly 'org.springframework.boot:spring-boot-autoconfigure'
34+
compileOnly 'org.springframework.boot:spring-boot-starter-actuator'
35+
compileOnly 'org.springframework.boot:spring-boot-starter-tomcat'
36+
compileOnly "org.grails:grails-dependencies"
37+
compileOnly "org.grails:grails-web-boot"
38+
implementation "org.grails:grails-core"
39+
implementation "org.grails.plugins:cache"
5240
console "org.grails:grails-console"
53-
profile "org.grails.profiles:web-plugin:3.1.8"
54-
provided "org.grails:grails-plugin-services"
55-
provided "org.grails:grails-plugin-domain-class"
56-
testCompile "org.grails:grails-plugin-testing"
41+
profile "org.grails.profiles:plugin"
42+
compileOnly "org.grails:grails-plugin-services"
43+
compileOnly "org.grails:grails-plugin-domain-class"
44+
testImplementation "org.grails:grails-test"
45+
testImplementation "org.grails:grails-testing-support"
5746

58-
compile 'redis.clients:jedis:2.8.0'
59-
compile 'org.springframework.data:spring-data-redis:1.6.2.RELEASE'
60-
}
47+
implementation 'redis.clients:jedis:3.8.0'
48+
implementation 'org.springframework.data:spring-data-redis'
6149

62-
task wrapper(type: Wrapper) {
63-
gradleVersion = gradleWrapperVersion
64-
}
65-
grailsPublish {
66-
// TODO: Provide values here
67-
user = 'user'
68-
key = 'key'
69-
githubSlug = 'foo/bar'
70-
license {
71-
name = 'Apache-2.0'
72-
}
73-
title = "My Plugin"
74-
desc = "Full plugin description"
75-
developers = [johndoe:"John Doe"]
76-
portalUser = ""
77-
portalPassword = ""
50+
testImplementation 'net.bytebuddy:byte-buddy:1.14.18'
7851
}
7952

53+
//grailsPublish {
54+
// // TODO: Provide values here
55+
// user = 'user'
56+
// key = 'key'
57+
// githubSlug = 'foo/bar'
58+
// license {
59+
// name = 'Apache-2.0'
60+
// }
61+
// title = "My Plugin"
62+
// desc = "Full plugin description"
63+
// developers = [johndoe:"John Doe"]
64+
// portalUser = ""
65+
// portalPassword = ""
66+
//}
67+
8068
asciidoctor {
8169
resources {
8270
from('src/docs/images')
8371
into "./images"
8472
}
8573

86-
attributes 'experimental' : 'true',
87-
'compat-mode' : 'true',
88-
'toc' : 'left',
89-
'icons' : 'font',
90-
'version' : project.version,
91-
'sourcedir' : "/src/main/groovy"
74+
attributes 'experimental': 'true',
75+
'compat-mode': 'true',
76+
'toc': 'left',
77+
'icons': 'font',
78+
'version': project.version,
79+
'sourcedir': "/src/main/groovy"
9280
}
9381

94-
task docs(dependsOn:[asciidoctor])
82+
tasks.register('docs') { dependsOn asciidoctor }
83+
84+
tasks.withType(Test).configureEach {
85+
useJUnitPlatform()
86+
}

‎functional-tests/build.gradle

Lines changed: 40 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,59 @@
11
buildscript {
2-
ext {
3-
grailsVersion = project.grailsVersion
4-
}
52
repositories {
6-
mavenLocal()
73
maven { url "https://repo.grails.org/grails/core" }
4+
mavenCentral()
85
}
9-
dependencies {
10-
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
11-
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.8.2"
12-
classpath "org.grails.plugins:hibernate4:5.0.6"
6+
dependencies { // Not Published to Gradle Plugin Portal
7+
classpath "org.grails:grails-gradle-plugin:6.2.4"
8+
classpath "org.grails.plugins:hibernate5:8.1.0"
139
}
1410
}
1511

16-
version "0.1"
17-
group "functional.tests"
18-
19-
apply plugin:"eclipse"
20-
apply plugin:"idea"
21-
apply plugin:"war"
22-
apply plugin:"org.grails.grails-web"
23-
apply plugin:"org.grails.grails-gsp"
24-
apply plugin:"asset-pipeline"
25-
26-
ext {
27-
grailsVersion = project.grailsVersion
28-
gradleWrapperVersion = project.gradleWrapperVersion
12+
plugins {
13+
id "groovy"
14+
id "war"
15+
id "idea"
16+
id "application"
17+
id "eclipse"
2918
}
3019

20+
// Not Published to Gradle Plugin Portal
21+
apply plugin: "org.grails.grails-web"
22+
apply plugin: "org.grails.grails-gsp"
23+
3124
repositories {
3225
mavenLocal()
26+
mavenCentral()
3327
maven { url "https://repo.grails.org/grails/core" }
3428
}
3529

36-
dependencyManagement {
37-
imports {
38-
mavenBom "org.grails:grails-bom:$grailsVersion"
39-
}
40-
applyMavenExclusions false
41-
}
42-
4330
dependencies {
44-
compile "org.springframework.boot:spring-boot-starter-logging"
45-
compile "org.springframework.boot:spring-boot-autoconfigure"
46-
compile "org.grails:grails-core"
47-
compile "org.springframework.boot:spring-boot-starter-actuator"
48-
compile "org.springframework.boot:spring-boot-starter-tomcat"
49-
compile "org.grails:grails-dependencies"
50-
compile "org.grails:grails-web-boot"
51-
compile "org.grails.plugins:cache"
52-
compile "org.grails.plugins:scaffolding"
53-
compile "org.grails.plugins:hibernate4"
54-
compile "org.hibernate:hibernate-ehcache"
55-
compile rootProject
31+
implementation "org.springframework.boot:spring-boot-starter-logging"
32+
implementation "org.springframework.boot:spring-boot-autoconfigure"
33+
implementation "org.grails:grails-core"
34+
implementation "org.springframework.boot:spring-boot-starter-actuator"
35+
implementation "org.springframework.boot:spring-boot-starter-tomcat"
36+
implementation "org.grails:grails-dependencies"
37+
implementation "org.grails:grails-web-boot"
38+
implementation "org.grails.plugins:cache"
39+
implementation "org.grails.plugins:hibernate5"
40+
implementation "org.hibernate:hibernate-ehcache"
41+
implementation rootProject
5642
console "org.grails:grails-console"
57-
compile 'org.grails.plugins:grails-console:2.0.5'
58-
profile "org.grails.profiles:web:3.1.8"
59-
runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.8.2"
60-
runtime "com.h2database:h2"
61-
testCompile "org.grails:grails-plugin-testing"
62-
testCompile "org.grails.plugins:geb"
63-
testCompile 'org.grails:grails-datastore-rest-client'
64-
testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
65-
testRuntime "net.sourceforge.htmlunit:htmlunit:2.18"
66-
}
67-
68-
task wrapper(type: Wrapper) {
69-
gradleVersion = gradleWrapperVersion
43+
profile "org.grails.profiles:web"
44+
runtimeOnly "com.h2database:h2"
45+
testImplementation "org.grails:grails-test"
46+
testImplementation "io.micronaut:micronaut-inject-groovy"
47+
testImplementation "io.micronaut:micronaut-http-client"
48+
testImplementation "org.grails:grails-web-testing-support"
49+
testImplementation "org.spockframework:spock-core"
50+
51+
testImplementation 'org.testcontainers:spock:1.21.1'
7052
}
7153

72-
assets {
73-
minifyJs = true
74-
minifyCss = true
54+
java {
55+
sourceCompatibility = JavaVersion.toVersion("11")
7556
}
57+
tasks.withType(Test).configureEach {
58+
useJUnitPlatform()
59+
}

‎functional-tests/gradle.properties

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
grailsVersion=3.1.8
2-
gradleWrapperVersion=2.13
1+
grailsVersion=6.2.3
2+
grailsGradlePluginVersion=6.2.4
3+
version=0.1
4+
org.gradle.caching=true
5+
org.gradle.daemon=true
6+
org.gradle.parallel=true
7+
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M

‎functional-tests/gradle/wrapper/gradle-wrapper.jar

5.84 KB
Binary file not shown.

‎functional-tests/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Jun 16 14:27:12 CDT 2016
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip

0 commit comments

Comments
 (0)