Skip to content

Commit 792f9c2

Browse files
dshaodshao
authored
Merge pull request #341 from seqcode/grails-upgrade
Grails upgrade
2 parents 48c0cbf + dbb02e6 commit 792f9c2

14 files changed

Lines changed: 389 additions & 323 deletions

File tree

‎pegr/build.gradle‎

Lines changed: 80 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11
buildscript {
22
repositories {
3-
mavenLocal()
43
maven { url "https://repo.grails.org/grails/core" }
4+
mavenCentral()
55
}
66
dependencies {
7-
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
8-
classpath "org.grails.plugins:hibernate5:${gormVersion-".RELEASE"}"
9-
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.0.10"
7+
classpath "org.grails:grails-gradle-plugin:6.2.4"
8+
classpath "org.grails.plugins:hibernate5:8.1.0"
109
classpath 'org.grails.plugins:database-migration:3.1.0.RC1'
11-
classpath "gradle.plugin.com.energizedwork.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
1210
classpath 'org.grails.plugins:quartz:2.0.13'
1311
}
1412
}
1513

16-
version "0.1"
17-
group "pegr"
14+
plugins {
15+
id "groovy"
16+
id "com.github.erdi.webdriver-binaries" version "3.2"
17+
id "war"
18+
id "idea"
19+
id "com.bertramlabs.asset-pipeline" version "4.5.1"
20+
id "application"
21+
id "eclipse"
22+
}
1823

19-
apply plugin:"eclipse"
20-
apply plugin:"idea"
21-
apply plugin:"war"
2224
apply plugin:"org.grails.grails-web"
23-
apply plugin:"com.bertramlabs.asset-pipeline"
2425
apply plugin:"org.grails.grails-gsp"
25-
apply plugin:"com.energizedwork.webdriver-binaries"
26+
27+
group = "pegr"
2628

2729
repositories {
28-
mavenLocal()
29-
maven { url "https://repo.grails.org/grails/core" }
30+
mavenCentral()
31+
maven { url "https://repo.grails.org/grails/core/" }
3032
}
3133

3234
sourceSets {
@@ -44,67 +46,73 @@ configurations {
4446
}
4547
}
4648

47-
dependencies {
48-
developmentOnly("org.springframework.boot:spring-boot-devtools")
49-
compile "org.springframework.boot:spring-boot-starter-logging"
50-
compile "org.springframework.boot:spring-boot-autoconfigure"
51-
compile "org.grails:grails-core"
52-
compile "org.springframework.boot:spring-boot-starter-actuator"
53-
compile "org.springframework.boot:spring-boot-starter-tomcat"
54-
compile "org.grails:grails-web-boot"
55-
compile "org.grails:grails-logging"
56-
compile "org.grails:grails-plugin-rest"
57-
compile "org.grails:grails-plugin-databinding"
58-
compile "org.grails:grails-plugin-i18n"
59-
compile "org.grails:grails-plugin-services"
60-
compile "org.grails:grails-plugin-url-mappings"
61-
compile "org.grails:grails-plugin-interceptors"
62-
compile "org.grails.plugins:cache"
63-
compile "org.grails.plugins:async"
64-
compile "org.grails.plugins:scaffolding"
65-
compile "org.grails.plugins:events"
66-
compile "org.grails.plugins:hibernate5"
67-
compile "org.hibernate:hibernate-core:5.4.0.Final"
68-
runtime "org.hibernate:hibernate-ehcache:5.4.6.Final"
69-
compile "org.grails.plugins:gsp"
70-
console "org.grails:grails-console"
49+
dependencies {
7150
profile "org.grails.profiles:web"
72-
runtime "org.glassfish.web:el-impl:2.1.2-b03"
73-
runtime "com.h2database:h2"
74-
runtime "org.apache.tomcat:tomcat-jdbc"
75-
runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.0.10"
76-
testCompile "org.grails:grails-gorm-testing-support"
77-
testCompile "org.grails.plugins:geb"
78-
testCompile "org.grails:grails-web-testing-support"
79-
testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:2.47.1"
80-
runtime 'mysql:mysql-connector-java:5.1.29'
81-
compile 'org.grails.plugins:database-migration:3.1.0.RC1'
82-
compile 'org.grails.plugins:spring-security-core:4.0.3'
83-
compile 'org.grails.plugins:quartz:2.0.13'
84-
compile 'org.quartz-scheduler:quartz:2.2.1'
85-
compile "org.grails.plugins:mail:3.0.0"
86-
compile 'org.grails.plugins:external-config:2.0.0'
87-
compile 'org.grails.plugins:excel-export:2.1'
88-
compile fileTree(dir: 'libs', include: '*.jar')
89-
compile 'org.liquibase:liquibase-core:3.6.3'
90-
testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
91-
testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
92-
testRuntime "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion"
93-
testCompile "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
94-
testCompile "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
95-
testCompile "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
96-
compile 'com.github.jai-imageio:jai-imageio-core:1.4.0'
97-
compile 'org.apache.poi:poi:5.2.3'
98-
compile 'org.apache.poi:poi-ooxml:5.2.3'
99-
compile 'org.apache.poi:poi-ooxml-full:5.2.3'
100-
compile 'javax.annotation:javax.annotation-api:1.3.2'
101-
compile 'org.apache.logging.log4j:log4j-to-slf4j:2.19.0'
102-
compile 'org.apache.logging.log4j:log4j-api:2.19.0'
51+
implementation "org.grails:grails-core"
52+
implementation "org.grails:grails-logging"
53+
implementation "org.grails:grails-plugin-databinding"
54+
implementation "org.grails:grails-plugin-i18n"
55+
implementation "org.grails:grails-plugin-interceptors"
56+
implementation "org.grails:grails-plugin-rest"
57+
implementation "org.grails:grails-plugin-services"
58+
implementation "org.grails:grails-plugin-url-mappings"
59+
implementation "org.grails:grails-web-boot"
60+
implementation "org.grails.plugins:gsp"
61+
implementation "org.grails.plugins:hibernate5"
62+
implementation "org.grails.plugins:scaffolding"
63+
implementation "org.springframework.boot:spring-boot-autoconfigure"
64+
implementation "org.springframework.boot:spring-boot-starter"
65+
implementation "org.springframework.boot:spring-boot-starter-actuator"
66+
implementation "org.springframework.boot:spring-boot-starter-logging"
67+
implementation "org.springframework.boot:spring-boot-starter-tomcat"
68+
implementation "org.springframework.boot:spring-boot-starter-validation"
69+
compileOnly "io.micronaut:micronaut-inject-groovy"
70+
console "org.grails:grails-console"
71+
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:4.5.1"
72+
runtimeOnly "com.h2database:h2"
73+
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
74+
runtimeOnly "org.fusesource.jansi:jansi:1.18"
75+
testImplementation "io.micronaut:micronaut-inject-groovy"
76+
testImplementation "org.grails:grails-gorm-testing-support"
77+
testImplementation "org.grails:grails-web-testing-support"
78+
testImplementation "org.grails.plugins:geb"
79+
testImplementation "org.seleniumhq.selenium:selenium-api:4.19.1"
80+
testImplementation "org.seleniumhq.selenium:selenium-remote-driver:4.19.1"
81+
testImplementation "org.seleniumhq.selenium:selenium-support:4.19.1"
82+
testImplementation "org.spockframework:spock-core"
83+
testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:4.19.1"
84+
testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:4.19.1"
85+
testRuntimeOnly "org.seleniumhq.selenium:selenium-safari-driver:4.19.1"
86+
implementation "org.grails.plugins:cache"
87+
implementation "org.grails.plugins:async"
88+
implementation "org.grails.plugins:scaffolding"
89+
implementation "org.grails.plugins:events"
90+
implementation "org.hibernate:hibernate-core:5.4.0.Final"
91+
implementation "org.hibernate:hibernate-ehcache"
92+
runtimeOnly "org.glassfish.web:el-impl:2.1.2-b03"
93+
runtimeOnly 'mysql:mysql-connector-java:5.1.29'
94+
implementation 'org.grails.plugins:database-migration:3.1.0.RC1'
95+
implementation 'org.grails.plugins:spring-security-core:6.1.2'
96+
implementation 'org.grails.plugins:quartz:2.0.13'
97+
implementation 'org.quartz-scheduler:quartz:2.2.1'
98+
implementation "org.grails.plugins:mail:3.0.0"
99+
implementation 'org.grails.plugins:external-config:2.0.0'
100+
implementation 'org.grails.plugins:excel-export:2.1'
101+
implementation fileTree(dir: 'libs', include: '*.jar')
102+
implementation 'org.liquibase:liquibase-core:3.6.3'
103+
implementation 'com.github.jai-imageio:jai-imageio-core:1.4.0'
104+
implementation 'org.apache.poi:poi:5.2.3'
105+
implementation 'org.apache.poi:poi-ooxml:5.2.3'
106+
implementation 'org.apache.poi:poi-ooxml-full:5.2.3'
107+
implementation 'javax.annotation:javax.annotation-api:1.3.2'
108+
implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.19.0'
109+
implementation 'org.apache.logging.log4j:log4j-api:2.19.0'
103110
}
104111

105112
webdriverBinaries {
106-
chromedriver "$chromeDriverVersion"
107-
geckodriver "$geckodriverVersion"
113+
chromedriver '122.0.6260.0'
114+
geckodriver '0.33.0'
115+
edgedriver '110.0.1587.57'
108116
}
109117

110118
bootRun {
@@ -117,7 +125,6 @@ bootRun {
117125
tasks.withType(Test) {
118126
systemProperty "geb.env", System.getProperty('geb.env')
119127
systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
120-
systemProperty "webdriver.chrome.driver", System.getProperty('webdriver.chrome.driver')
121128
systemProperty "webdriver.gecko.driver", System.getProperty('webdriver.gecko.driver')
122129
}
123130

@@ -127,5 +134,5 @@ assets {
127134
}
128135

129136
springBoot {
130-
mainClassName = 'pegr.Application'
137+
mainClass = 'pegr.Application'
131138
}

‎pegr/gradle.properties‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
grailsVersion=4.0.11
2-
gormVersion=7.0.2
3-
gradleWrapperVersion=5.0
4-
seleniumVersion=3.12.0
5-
webdriverBinariesVersion=1.4
6-
chromeDriverVersion=2.44
7-
geckodriverVersion=0.23.0
8-
seleniumSafariDriverVersion=3.14.0
1+
grailsVersion=6.2.3
2+
grailsGradlePluginVersion=6.2.4
3+
version=0.1
4+
org.gradle.caching=true
95
org.gradle.daemon=true
106
org.gradle.parallel=true
11-
org.gradle.jvmargs=-Xmx1024M
7+
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M

‎pegr/gradle/wrapper/gradle-wrapper.jar‎

5.75 KB
Binary file not shown.

‎pegr/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)