From 78d9b0573f50b65772646d72ed2ad61d2200cb54 Mon Sep 17 00:00:00 2001 From: Guillermo Calvo Date: Mon, 11 Mar 2024 17:05:33 +0100 Subject: [PATCH 1/8] Bump Grails to version 6.1.2 --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index ec9cf804..f51f1565 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ projectVersion=6.0.0-SNAPSHOT -grailsVersion=5.2.5 -grailsGradlePluginVersion=5.2.4 +grailsVersion=6.1.2 +grailsGradlePluginVersion=6.1.2 gormVersion=7.2.1 groovyVersion=3.0.7 githubSlug=grails/grails-cache From 1df05acfc8732e633ea1efd63d1ea8e6ce8cfe79 Mon Sep 17 00:00:00 2001 From: Guillermo Calvo Date: Mon, 11 Mar 2024 17:07:01 +0100 Subject: [PATCH 2/8] Bump JDK to version 11 --- .github/workflows/gradle.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 70a53dd6..bcfdb916 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -19,7 +19,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: 8 + java-version: 11 - name: Run Tests if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' id: tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6995894e..d52f62c3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: ['8'] + java: ['11'] env: GIT_USER_NAME: puneetbehl GIT_USER_EMAIL: behlp@objectcomputing.com From 3daede6da77d71dd1e1b3518fedf078fe495218b Mon Sep 17 00:00:00 2001 From: Guillermo Calvo Date: Mon, 11 Mar 2024 17:16:41 +0100 Subject: [PATCH 3/8] Bump selenium to version 4.16.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f51f1565..5d66f198 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ projectDesc=Provides AST transformations for caching method calls guide=../../guide tags=../ref/Tags gebVersion=6.0 -seleniumVersion=4.6.0 +seleniumVersion=4.16.1 webdriverBinariesVersion=2.7 hibernateCoreVersion=5.1.5.Final geckodriverVersion=0.32.2 From 9422e8d6d0a4b0a82fa14752f82b592ea1de2c79 Mon Sep 17 00:00:00 2001 From: Guillermo Calvo Date: Mon, 11 Mar 2024 17:29:31 +0100 Subject: [PATCH 4/8] Bump selenium safari driver to version 4.16.1 --- build.gradle | 2 +- gradle.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a81fd085..b438fa12 100644 --- a/build.gradle +++ b/build.gradle @@ -58,7 +58,7 @@ dependencies { testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion" testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion" - testRuntimeOnly "org.seleniumhq.selenium:selenium-safari-driver:$seleniumVersion" + testRuntimeOnly "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion" testImplementation "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion" testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion" diff --git a/gradle.properties b/gradle.properties index 5d66f198..0c73e966 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,7 @@ seleniumVersion=4.16.1 webdriverBinariesVersion=2.7 hibernateCoreVersion=5.1.5.Final geckodriverVersion=0.32.2 +seleniumSafariDriverVersion=4.16.1 chromeDriverVersion=110.0.5481.77 org.gradle.daemon=true org.gradle.caching=true From 2f160e548ae580aaea77f6faa3ee5136459bccee Mon Sep 17 00:00:00 2001 From: Guillermo Calvo Date: Mon, 11 Mar 2024 17:30:00 +0100 Subject: [PATCH 5/8] Bump groovy to version 3.0.11 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0c73e966..0d5f011c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ projectVersion=6.0.0-SNAPSHOT grailsVersion=6.1.2 grailsGradlePluginVersion=6.1.2 gormVersion=7.2.1 -groovyVersion=3.0.7 +groovyVersion=3.0.11 githubSlug=grails/grails-cache githubBranch=6.0.x title=Cache Plugin From 45316da6166d7a2c125dddeb36512f7a9bcfb0f2 Mon Sep 17 00:00:00 2001 From: Guillermo Calvo Date: Mon, 11 Mar 2024 17:37:44 +0100 Subject: [PATCH 6/8] Bump gorm to version 8.1.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0d5f011c..bebd2add 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ projectVersion=6.0.0-SNAPSHOT grailsVersion=6.1.2 grailsGradlePluginVersion=6.1.2 -gormVersion=7.2.1 +gormVersion=8.1.1 groovyVersion=3.0.11 githubSlug=grails/grails-cache githubBranch=6.0.x From ce2ea5e0014a233cd874bbdcc96267ba2f0e0657 Mon Sep 17 00:00:00 2001 From: Puneet Behl Date: Sun, 17 Mar 2024 10:36:48 +0530 Subject: [PATCH 7/8] chore(build): upgrade gradle to 7.6.3 Update Gradle wrapper from 7.5.1 to 7.6.3 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661e..068cdb2d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 4962f4bbc3877c439c90216e96b7b9ea28f3239d Mon Sep 17 00:00:00 2001 From: Puneet Behl Date: Sun, 17 Mar 2024 10:40:01 +0530 Subject: [PATCH 8/8] test(deps): udpate webdriver binaries to 3.2 * Update `webdriver-binaries` gradle plugin to 3.2 * Fixes #184 `java.lang.NoClassDefFoundError: org/openqa/selenium/interactions/HasTouchScreen` by forcing seleniumVersion. This is due to conflict in the selenium libraries. --- build.gradle | 30 ++++++++++++++++++------------ gradle.properties | 2 +- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index b438fa12..052e10a9 100644 --- a/build.gradle +++ b/build.gradle @@ -5,17 +5,17 @@ buildscript { dependencies { classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.6.1' - classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion" + classpath "com.github.erdi:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion" } } -version project.projectVersion group "org.grails.plugins" +version project.projectVersion apply plugin:"eclipse" apply plugin:"idea" apply plugin: "com.github.erdi.webdriver-binaries" -apply from:"https://raw.githubusercontent.com/grails/grails-common-build/master/common-docs.gradle" +apply from:"https://raw.githubusercontent.com/grails/grails-common-build/v2.0.3/common-docs.gradle" apply plugin:"org.grails.grails-plugin" apply plugin:"org.grails.internal.grails-plugin-publish" @@ -23,6 +23,16 @@ repositories { maven { url "https://repo.grails.org/grails/core" } } +configurations { + all { + resolutionStrategy.eachDependency { DependencyResolveDetails details-> + if (details.requested.group == 'org.seleniumhq.selenium') { + details.useVersion(seleniumVersion) + } + } + } +} + dependencies { api "org.springframework.boot:spring-boot-starter-logging" api "org.springframework.boot:spring-boot-autoconfigure" @@ -64,25 +74,22 @@ dependencies { testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion" testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion" - api "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2" - - } + apply from: rootProject.file('gradle/testVerbose.gradle') webdriverBinaries { - if (!System.getenv().containsKey('GITHUB_ACTIONS')) { + if (!System.getenv().containsKey('CI')) { chromedriver "$chromeDriverVersion" geckodriver "$geckodriverVersion" } } tasks.withType(Test) { - systemProperty "geb.env", System.getProperty('geb.env', 'chromeHeadless') + systemProperty "geb.env", System.getProperty('geb.env') systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest") - - if (!System.getenv().containsKey('GITHUB_ACTIONS')) { + if (!System.getenv().containsKey('CI')) { systemProperty 'webdriver.chrome.driver', System.getProperty('webdriver.chrome.driver') systemProperty 'webdriver.gecko.driver', System.getProperty('webdriver.gecko.driver') } else { @@ -101,8 +108,7 @@ bootRun { String springProfilesActive = 'spring.profiles.active' systemProperty springProfilesActive, System.getProperty(springProfilesActive) } -// enable if you wish to package this plugin as a standalone application -bootJar.enabled = false + grailsPublish { userOrg = 'grails' githubSlug = 'grails/grails-cache' diff --git a/gradle.properties b/gradle.properties index bebd2add..2349139f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ guide=../../guide tags=../ref/Tags gebVersion=6.0 seleniumVersion=4.16.1 -webdriverBinariesVersion=2.7 +webdriverBinariesVersion=3.2 hibernateCoreVersion=5.1.5.Final geckodriverVersion=0.32.2 seleniumSafariDriverVersion=4.16.1