Skip to content

upgrade to grails 6 #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dshao merged 3 commits into from
Jan 28, 2025
Merged

upgrade to grails 6 #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9796818
Grails 6
dshao Jan 28, 2025
8e08d9b
update dependencies
dshao Jan 28, 2025
1409a86
clean up
dshao Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 80 additions & 73 deletions pegr/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,34 @@
buildscript {
repositories {
mavenLocal()
maven { url "https://repo.grails.org/grails/core" }
mavenCentral()
}
dependencies {
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
classpath "org.grails.plugins:hibernate5:${gormVersion-".RELEASE"}"
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.0.10"
classpath "org.grails:grails-gradle-plugin:6.2.4"
classpath "org.grails.plugins:hibernate5:8.1.0"
classpath 'org.grails.plugins:database-migration:3.1.0.RC1'
classpath "gradle.plugin.com.energizedwork.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
classpath 'org.grails.plugins:quartz:2.0.13'
}
}

version "0.1"
group "pegr"
plugins {
id "groovy"
id "com.github.erdi.webdriver-binaries" version "3.2"
id "war"
id "idea"
id "com.bertramlabs.asset-pipeline" version "4.5.1"
id "application"
id "eclipse"
}

apply plugin:"eclipse"
apply plugin:"idea"
apply plugin:"war"
apply plugin:"org.grails.grails-web"
apply plugin:"com.bertramlabs.asset-pipeline"
apply plugin:"org.grails.grails-gsp"
apply plugin:"com.energizedwork.webdriver-binaries"

group = "pegr"

repositories {
mavenLocal()
maven { url "https://repo.grails.org/grails/core" }
mavenCentral()
maven { url "https://repo.grails.org/grails/core/" }
}

sourceSets {
Expand All @@ -44,67 +46,73 @@ configurations {
}
}

dependencies {
developmentOnly("org.springframework.boot:spring-boot-devtools")
compile "org.springframework.boot:spring-boot-starter-logging"
compile "org.springframework.boot:spring-boot-autoconfigure"
compile "org.grails:grails-core"
compile "org.springframework.boot:spring-boot-starter-actuator"
compile "org.springframework.boot:spring-boot-starter-tomcat"
compile "org.grails:grails-web-boot"
compile "org.grails:grails-logging"
compile "org.grails:grails-plugin-rest"
compile "org.grails:grails-plugin-databinding"
compile "org.grails:grails-plugin-i18n"
compile "org.grails:grails-plugin-services"
compile "org.grails:grails-plugin-url-mappings"
compile "org.grails:grails-plugin-interceptors"
compile "org.grails.plugins:cache"
compile "org.grails.plugins:async"
compile "org.grails.plugins:scaffolding"
compile "org.grails.plugins:events"
compile "org.grails.plugins:hibernate5"
compile "org.hibernate:hibernate-core:5.4.0.Final"
runtime "org.hibernate:hibernate-ehcache:5.4.6.Final"
compile "org.grails.plugins:gsp"
console "org.grails:grails-console"
dependencies {
profile "org.grails.profiles:web"
runtime "org.glassfish.web:el-impl:2.1.2-b03"
runtime "com.h2database:h2"
runtime "org.apache.tomcat:tomcat-jdbc"
runtime "com.bertramlabs.plugins:asset-pipeline-grails:3.0.10"
testCompile "org.grails:grails-gorm-testing-support"
testCompile "org.grails.plugins:geb"
testCompile "org.grails:grails-web-testing-support"
testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:2.47.1"
runtime 'mysql:mysql-connector-java:5.1.29'
compile 'org.grails.plugins:database-migration:3.1.0.RC1'
compile 'org.grails.plugins:spring-security-core:4.0.3'
compile 'org.grails.plugins:quartz:2.0.13'
compile 'org.quartz-scheduler:quartz:2.2.1'
compile "org.grails.plugins:mail:3.0.0"
compile 'org.grails.plugins:external-config:2.0.0'
compile 'org.grails.plugins:excel-export:2.1'
compile fileTree(dir: 'libs', include: '*.jar')
compile 'org.liquibase:liquibase-core:3.6.3'
testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
testRuntime "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion"
testCompile "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
testCompile "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
testCompile "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
compile 'com.github.jai-imageio:jai-imageio-core:1.4.0'
compile 'org.apache.poi:poi:5.2.3'
compile 'org.apache.poi:poi-ooxml:5.2.3'
compile 'org.apache.poi:poi-ooxml-full:5.2.3'
compile 'javax.annotation:javax.annotation-api:1.3.2'
compile 'org.apache.logging.log4j:log4j-to-slf4j:2.19.0'
compile 'org.apache.logging.log4j:log4j-api:2.19.0'
implementation "org.grails:grails-core"
implementation "org.grails:grails-logging"
implementation "org.grails:grails-plugin-databinding"
implementation "org.grails:grails-plugin-i18n"
implementation "org.grails:grails-plugin-interceptors"
implementation "org.grails:grails-plugin-rest"
implementation "org.grails:grails-plugin-services"
implementation "org.grails:grails-plugin-url-mappings"
implementation "org.grails:grails-web-boot"
implementation "org.grails.plugins:gsp"
implementation "org.grails.plugins:hibernate5"
implementation "org.grails.plugins:scaffolding"
implementation "org.springframework.boot:spring-boot-autoconfigure"
implementation "org.springframework.boot:spring-boot-starter"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "org.springframework.boot:spring-boot-starter-logging"
implementation "org.springframework.boot:spring-boot-starter-tomcat"
implementation "org.springframework.boot:spring-boot-starter-validation"
compileOnly "io.micronaut:micronaut-inject-groovy"
console "org.grails:grails-console"
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:4.5.1"
runtimeOnly "com.h2database:h2"
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
runtimeOnly "org.fusesource.jansi:jansi:1.18"
testImplementation "io.micronaut:micronaut-inject-groovy"
testImplementation "org.grails:grails-gorm-testing-support"
testImplementation "org.grails:grails-web-testing-support"
testImplementation "org.grails.plugins:geb"
testImplementation "org.seleniumhq.selenium:selenium-api:4.19.1"
testImplementation "org.seleniumhq.selenium:selenium-remote-driver:4.19.1"
testImplementation "org.seleniumhq.selenium:selenium-support:4.19.1"
testImplementation "org.spockframework:spock-core"
testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:4.19.1"
testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:4.19.1"
testRuntimeOnly "org.seleniumhq.selenium:selenium-safari-driver:4.19.1"
implementation "org.grails.plugins:cache"
implementation "org.grails.plugins:async"
implementation "org.grails.plugins:scaffolding"
implementation "org.grails.plugins:events"
implementation "org.hibernate:hibernate-core:5.4.0.Final"
implementation "org.hibernate:hibernate-ehcache"
runtimeOnly "org.glassfish.web:el-impl:2.1.2-b03"
runtimeOnly 'mysql:mysql-connector-java:5.1.29'
implementation 'org.grails.plugins:database-migration:3.1.0.RC1'
implementation 'org.grails.plugins:spring-security-core:6.1.2'
implementation 'org.grails.plugins:quartz:2.0.13'
implementation 'org.quartz-scheduler:quartz:2.2.1'
implementation "org.grails.plugins:mail:3.0.0"
implementation 'org.grails.plugins:external-config:2.0.0'
implementation 'org.grails.plugins:excel-export:2.1'
implementation fileTree(dir: 'libs', include: '*.jar')
implementation 'org.liquibase:liquibase-core:3.6.3'
implementation 'com.github.jai-imageio:jai-imageio-core:1.4.0'
implementation 'org.apache.poi:poi:5.2.3'
implementation 'org.apache.poi:poi-ooxml:5.2.3'
implementation 'org.apache.poi:poi-ooxml-full:5.2.3'
implementation 'javax.annotation:javax.annotation-api:1.3.2'
implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.19.0'
implementation 'org.apache.logging.log4j:log4j-api:2.19.0'
}

webdriverBinaries {
chromedriver "$chromeDriverVersion"
geckodriver "$geckodriverVersion"
chromedriver '122.0.6260.0'
geckodriver '0.33.0'
edgedriver '110.0.1587.57'
}

bootRun {
Expand All @@ -117,7 +125,6 @@ bootRun {
tasks.withType(Test) {
systemProperty "geb.env", System.getProperty('geb.env')
systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
systemProperty "webdriver.chrome.driver", System.getProperty('webdriver.chrome.driver')
systemProperty "webdriver.gecko.driver", System.getProperty('webdriver.gecko.driver')
}

Expand All @@ -127,5 +134,5 @@ assets {
}

springBoot {
mainClassName = 'pegr.Application'
mainClass = 'pegr.Application'
}
14 changes: 5 additions & 9 deletions pegr/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
grailsVersion=4.0.11
gormVersion=7.0.2
gradleWrapperVersion=5.0
seleniumVersion=3.12.0
webdriverBinariesVersion=1.4
chromeDriverVersion=2.44
geckodriverVersion=0.23.0
seleniumSafariDriverVersion=3.14.0
grailsVersion=6.2.3
grailsGradlePluginVersion=6.2.4
version=0.1
org.gradle.caching=true
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.jvmargs=-Xmx1024M
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
Binary file modified pegr/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion pegr/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading