From f5daa9f6f78b5f7a9fc20e33f52b8c9c5c077ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Berg=20Glasius?= Date: Wed, 16 Oct 2024 13:19:19 +0200 Subject: [PATCH 1/4] Upgraded to Grails 6.2.1 * Latest guava library * Using testcontainers for Geb test --- .sdkmanrc | 3 + README.md | 6 +- build.gradle | 105 ++++--- buildSrc/build.gradle | 8 + gradle.properties | 10 +- gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 290 +++++++++++------- gradlew.bat | 53 ++-- grails-app/conf/logback.groovy | 36 --- grails-app/conf/logback.xml | 19 ++ grails-cli.yml | 8 + settings.gradle | 14 + .../demo/CachingServiceIntegrationSpec.groovy | 36 +-- .../com/demo/helper/ContainerGebSpec.groovy | 59 ++++ 14 files changed, 404 insertions(+), 246 deletions(-) create mode 100644 .sdkmanrc create mode 100644 buildSrc/build.gradle delete mode 100644 grails-app/conf/logback.groovy create mode 100644 grails-app/conf/logback.xml create mode 100644 grails-cli.yml create mode 100644 src/integration-test/groovy/com/demo/helper/ContainerGebSpec.groovy diff --git a/.sdkmanrc b/.sdkmanrc new file mode 100644 index 0000000..3abc5c7 --- /dev/null +++ b/.sdkmanrc @@ -0,0 +1,3 @@ +# Enable auto-env through the sdkman_auto_env config +# Add key=value pairs of SDKs to use below +java=11.0.24-tem diff --git a/README.md b/README.md index c969e32..b997d20 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ The guava cache provides a simple in memory cache with maximal capacity and TTL. ```groovy dependencies { - compile 'org.grails.plugins:cache:4.0.0' - compile 'org.grails.plugins:cache-guava:1.0.0' + implementation 'org.grails.plugins:cache' + implementation 'org.grails.plugins:cache-guava:2.0.0-SNAPSHOT' } ``` @@ -38,7 +38,7 @@ grails: The GrailsGuavaCacheManager is automatically configured by the plugin. -### Annoations and Services +### Annotations and Services Just use grails-cache's annotations and services as described in its [documentation](http://grails-plugins.github.io/grails-cache/snapshot/guide/index.html) diff --git a/build.gradle b/build.gradle index 13de0ab..84ac0d9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,67 +1,74 @@ -buildscript { - repositories { - mavenLocal() - maven { url "https://repo.grails.org/grails/core" } - } - dependencies { - classpath "org.grails:grails-gradle-plugin:$grailsVersion" - } +plugins { + id "groovy" + id "org.grails.grails-web" + id "org.grails.grails-gsp" + id "org.grails.grails-plugin" version '6.2.1' + id "application" } -version "1.0.0" group "org.grails.plugins" -apply plugin:"eclipse" -apply plugin:"idea" -apply plugin:"org.grails.grails-plugin" -apply plugin:"org.grails.grails-plugin-publish" -apply plugin:"org.grails.grails-gsp" - repositories { mavenLocal() - maven { url "https://repo.grails.org/grails/core" } + mavenCentral() + maven { url "https://repo.grails.org/grails/core/" } } dependencies { - 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-dependencies" - compile "org.grails:grails-web-boot" - compile "org.grails.plugins:scaffolding" - console "org.grails:grails-console" - profile "org.grails.profiles:web-plugin" - provided "org.grails:grails-plugin-services" + 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-services") + implementation("org.grails:grails-plugin-url-mappings") + implementation("org.grails:grails-web-boot") + implementation("org.springframework.boot:spring-boot-autoconfigure") + implementation("org.springframework.boot:spring-boot-starter-logging") + implementation("org.springframework.boot:spring-boot-starter-validation") + compileOnly("io.micronaut:micronaut-inject-groovy") + console("org.grails:grails-console") + testImplementation("org.spockframework:spock-core") + testImplementation("io.micronaut:micronaut-inject-groovy") + testImplementation("org.grails:grails-web-testing-support") + testImplementation("org.grails.plugins:geb") + testImplementation platform("org.seleniumhq.selenium:selenium-bom:${seleniumVersion}") + testImplementation("org.seleniumhq.selenium:selenium-api") + testImplementation("org.seleniumhq.selenium:selenium-remote-driver") + testImplementation("org.seleniumhq.selenium:selenium-support") + testImplementation("org.seleniumhq.selenium:selenium-http") + testImplementation("org.seleniumhq.selenium:selenium-chrome-driver") + testImplementation "org.testcontainers:spock:1.20.2" + testImplementation "org.testcontainers:selenium:1.20.2" - testCompile "org.grails:grails-plugin-testing" - testCompile "org.grails:grails-web-testing-support" - testCompile "org.grails.plugins:geb" - testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1" - testRuntime "net.sourceforge.htmlunit:htmlunit:2.18" + implementation "org.grails.plugins:cache" - compile "org.grails.plugins:cache:4.0.0" + // https://mvnrepository.com/artifact/com.google.guava/guava + implementation 'com.google.guava:guava:33.3.1-jre' +} - compile "com.google.guava:guava:30.1.1-jre" +application { + mainClass.set("grails.cache.guava.Application") } -bootRun { - jvmArgs('-Dspring.output.ansi.enabled=always') - addResources = true - String springProfilesActive = 'spring.profiles.active' - systemProperty springProfilesActive, System.getProperty(springProfilesActive) +java { + sourceCompatibility = JavaVersion.toVersion("11") } -// enable if you wish to package this plugin as a standalone application -bootRepackage.enabled = false -grailsPublish { - githubSlug = 'itds-ch/grails-cache-guava' - license { - name = 'Apache-2.0' - } - title = project.name - desc = "The guava cache provides a simple in memory cache with maximal capacity and TTL." - developers = [mkobel:"Moritz obel", sbglasius: 'Søren Berg Glasius'] +tasks.withType(Test) { + useJUnitPlatform() + systemProperty "geb.env", System.getProperty('geb.env') + systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest") } +//grailsPublish { +// +// githubSlug = 'itds-ch/grails-cache-guava' +// license { +// name = 'Apache-2.0' +// } +// title = project.name +// desc = "The guava cache provides a simple in memory cache with maximal capacity and TTL." +// developers = [mkobel: "Moritz obel", sbglasius: 'Søren Berg Glasius'] +//} + diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 0000000..668a8e3 --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,8 @@ +repositories { + mavenCentral() + maven { url "https://repo.grails.org/grails/core/" } +} +dependencies { + implementation("org.grails:grails-gradle-plugin:6.2.1") + implementation("org.grails.plugins:hibernate5:8.1.0") +} diff --git a/gradle.properties b/gradle.properties index 7863f26..616e81c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,8 @@ -grailsVersion=3.3.12 -gradleWrapperVersion=3.5 +grailsVersion=6.2.1 +grailsGradlePluginVersion=6.2.1 +seleniumVersion=4.25.0 +version=2.0.0 +org.gradle.caching=true +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca9ec11..3994438 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Nov 27 23:09:32 CET 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip diff --git a/gradlew b/gradlew index 9d82f78..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,74 +1,129 @@ -#!/usr/bin/env bash +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -77,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -85,76 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 8a0b282..107acd3 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -8,20 +24,23 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,34 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/grails-app/conf/logback.groovy b/grails-app/conf/logback.groovy deleted file mode 100644 index 20f85e1..0000000 --- a/grails-app/conf/logback.groovy +++ /dev/null @@ -1,36 +0,0 @@ -import grails.util.BuildSettings -import grails.util.Environment -import org.springframework.boot.logging.logback.ColorConverter -import org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter - -import java.nio.charset.Charset - -conversionRule 'clr', ColorConverter -conversionRule 'wex', WhitespaceThrowableProxyConverter - -// See http://logback.qos.ch/manual/groovy.html for details on configuration -appender('STDOUT', ConsoleAppender) { - encoder(PatternLayoutEncoder) { - charset = Charset.forName('UTF-8') - - pattern = - '%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} ' + // Date - '%clr(%5p) ' + // Log level - '%clr(---){faint} %clr([%15.15t]){faint} ' + // Thread - '%clr(%-40.40logger{39}){cyan} %clr(:){faint} ' + // Logger - '%m%n%wex' // Message - } -} - -def targetDir = BuildSettings.TARGET_DIR -if (Environment.isDevelopmentMode() && targetDir != null) { - appender("FULL_STACKTRACE", FileAppender) { - file = "${targetDir}/stacktrace.log" - append = true - encoder(PatternLayoutEncoder) { - pattern = "%level %logger - %msg%n" - } - } - logger("StackTrace", ERROR, ['FULL_STACKTRACE'], false) -} -root(ERROR, ['STDOUT']) diff --git a/grails-app/conf/logback.xml b/grails-app/conf/logback.xml new file mode 100644 index 0000000..a6ed379 --- /dev/null +++ b/grails-app/conf/logback.xml @@ -0,0 +1,19 @@ + + + + + + + + true + + UTF-8 + %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex + + + + + + + + diff --git a/grails-cli.yml b/grails-cli.yml new file mode 100644 index 0000000..f2b9b59 --- /dev/null +++ b/grails-cli.yml @@ -0,0 +1,8 @@ +applicationType: plugin +defaultPackage: g621plugin +testFramework: spock +sourceLanguage: groovy +buildTool: gradle +gormImpl: gorm-hibernate5 +servletImpl: spring-boot-starter-tomcat +features: [app-name, base, gorm-hibernate5, gradle, grails-application, grails-console, grails-dependencies, grails-gorm-testing-support, grails-gradle-plugin, h2, logback, micronaut-inject-groovy, readme, spock, spring-boot-autoconfigure, spring-boot-starter, spring-resources, yaml] diff --git a/settings.gradle b/settings.gradle index 1375770..1091122 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + mavenLocal() + maven { url "https://repo.grails.org/grails/core/" } + gradlePluginPortal() + } + plugins { + id "org.grails.grails-web" version "6.2.1" + id "org.grails.grails-gsp" version "6.2.1" + id "com.bertramlabs.asset-pipeline" version "4.3.0" + id "com.github.erdi.webdriver-binaries" version "3.2" + } +} + rootProject.name = "cache-guava" \ No newline at end of file diff --git a/src/integration-test/groovy/com/demo/CachingServiceIntegrationSpec.groovy b/src/integration-test/groovy/com/demo/CachingServiceIntegrationSpec.groovy index 5d59597..7465f6d 100644 --- a/src/integration-test/groovy/com/demo/CachingServiceIntegrationSpec.groovy +++ b/src/integration-test/groovy/com/demo/CachingServiceIntegrationSpec.groovy @@ -1,33 +1,31 @@ package com.demo -import geb.spock.GebSpec +import com.demo.helper.ContainerGebSpec import grails.testing.mixin.integration.Integration @Integration -class CachingServiceIntegrationSpec extends GebSpec { +class CachingServiceIntegrationSpec extends ContainerGebSpec { + void 'test cache service with ttl'() { + when: + go '/demoCache/index?key=key0&value=value0' + then: + browser.driver.pageSource.contains 'value0' - void 'test cache service with ttl'() { - when: - go '/demoCache/index?key=key0&value=value0' + when: + go '/demoCache/index?key=key0&value=value1' - then: - browser.driver.pageSource.contains 'value0' + then: + browser.driver.pageSource.contains 'value0' - when: - go '/demoCache/index?key=key0&value=value1' + Thread.sleep(10_000) - then: - browser.driver.pageSource.contains 'value0' + when: + go '/demoCache/index?key=key0&value=value3' - Thread.sleep(10_000) + then: + browser.driver.pageSource.contains 'value3' + } - when: - go '/demoCache/index?key=key0&value=value3' - - then: - browser.driver.pageSource.contains 'value3' - - } } diff --git a/src/integration-test/groovy/com/demo/helper/ContainerGebSpec.groovy b/src/integration-test/groovy/com/demo/helper/ContainerGebSpec.groovy new file mode 100644 index 0000000..663e62f --- /dev/null +++ b/src/integration-test/groovy/com/demo/helper/ContainerGebSpec.groovy @@ -0,0 +1,59 @@ +package com.demo.helper; + +import geb.spock.GebSpec; +import grails.testing.mixin.integration.Integration +import groovy.transform.PackageScope +import org.openqa.selenium.chrome.ChromeOptions +import org.openqa.selenium.remote.RemoteWebDriver +import org.springframework.beans.factory.annotation.Value +import org.testcontainers.Testcontainers; +import org.testcontainers.containers.BrowserWebDriverContainer +import org.testcontainers.containers.PortForwardingContainer; +import spock.lang.Shared + +import java.time.Duration; + +@Integration +class ContainerGebSpec extends GebSpec { + + private static final String HOST_TESTCONTAINERS_INTERNAL = 'host.testcontainers.internal' + + @Shared + BrowserWebDriverContainer webDriverContainer + + void setupSpec() { + webDriverContainer = new BrowserWebDriverContainer() + } + + @PackageScope + void initialize() { + if (!webDriverContainer.running) { + webDriverContainer.tap { + addExposedPort(serverPort) + withAccessToHost(true) + start() + } + Testcontainers.exposeHostPorts(serverPort) + if(hostName != HOST_TESTCONTAINERS_INTERNAL) { + String ip = PortForwardingContainer.INSTANCE.network.get().ipAddress + webDriverContainer.execInContainer("/bin/sh", '-c', "echo '$ip\t$hostName' | sudo tee -a /etc/hosts") + } + + browser.driver = new RemoteWebDriver(webDriverContainer.seleniumAddress, new ChromeOptions(), false) + browser.driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(30)) + } + } + + void setup() { + initialize() + baseUrl = "http://${hostName}:$serverPort" + } + + void cleanupSpec() { + webDriverContainer.stop() + } + + String getHostName() { + return HOST_TESTCONTAINERS_INTERNAL + } +} \ No newline at end of file From f331cef0c30e1dd64fde73a8665a4891ce6f5d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Berg=20Glasius?= Date: Wed, 16 Oct 2024 13:28:59 +0200 Subject: [PATCH 2/4] Version set to 2.0.0-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 616e81c..182dd78 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ grailsVersion=6.2.1 grailsGradlePluginVersion=6.2.1 seleniumVersion=4.25.0 -version=2.0.0 +version=2.0.0-SNAPSHOT org.gradle.caching=true org.gradle.daemon=true org.gradle.parallel=true From ea6893c111c823dfc126f4af15dcc1fadac410b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Berg=20Glasius?= Date: Wed, 16 Oct 2024 14:18:43 +0200 Subject: [PATCH 3/4] Clean up build.gradle New group: `io.github.gpc` --- README.md | 2 +- build.gradle | 2 +- buildSrc/build.gradle | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 buildSrc/build.gradle diff --git a/README.md b/README.md index b997d20..4a184f5 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The guava cache provides a simple in memory cache with maximal capacity and TTL. ```groovy dependencies { implementation 'org.grails.plugins:cache' - implementation 'org.grails.plugins:cache-guava:2.0.0-SNAPSHOT' + implementation 'io.github.gpc:cache-guava:2.0.0-SNAPSHOT' } ``` diff --git a/build.gradle b/build.gradle index 84ac0d9..465f700 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id "application" } -group "org.grails.plugins" +group "io.github.gpc" repositories { mavenLocal() diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle deleted file mode 100644 index 668a8e3..0000000 --- a/buildSrc/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -repositories { - mavenCentral() - maven { url "https://repo.grails.org/grails/core/" } -} -dependencies { - implementation("org.grails:grails-gradle-plugin:6.2.1") - implementation("org.grails.plugins:hibernate5:8.1.0") -} From 3227d62e4c64acec8fd6c98985aab607494ba45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Berg=20Glasius?= Date: Wed, 16 Oct 2024 14:24:46 +0200 Subject: [PATCH 4/4] Workflow to build snapshot --- .github/workflows/build.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..45ea4c6 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,31 @@ +# This workflow will build a Java project with Gradle +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle + +name: Check and publish snapshot + +on: + push: + branches: + - master + - main + pull_request: + branches: + - master + - main +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 11 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + - name: Build and publish snapshot + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} + run: ./gradlew publish \ No newline at end of file