diff --git a/.classpath b/.classpath deleted file mode 100644 index 955ab6d..0000000 --- a/.classpath +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.project b/.project deleted file mode 100644 index 3d7c85f..0000000 --- a/.project +++ /dev/null @@ -1,32 +0,0 @@ - - - grails-cache-redis - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.grails.ide.eclipse.core.nature - org.eclipse.jdt.groovy.core.groovyNature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - - - - .link_to_grails_plugins - 2 - GRAILS_ROOT/grails-cache-redis/target/plugins - - - diff --git a/CacheRedisGrailsPlugin.groovy b/CacheRedisGrailsPlugin.groovy index 40d2a31..b1899d5 100644 --- a/CacheRedisGrailsPlugin.groovy +++ b/CacheRedisGrailsPlugin.groovy @@ -32,8 +32,8 @@ class CacheRedisGrailsPlugin { private final Logger log = LoggerFactory.getLogger('grails.plugin.cache.CacheRedisGrailsPlugin') - String version = '1.1.2-SNAPSHOT' - String grailsVersion = '2.5 > *' + String version = '1.1.2' + String grailsVersion = '2.5.6 > *' def loadAfter = ['cache'] def pluginExcludes = [ 'grails-app/conf/*CacheConfig.groovy', diff --git a/application.properties b/application.properties index 2524845..d985381 100644 --- a/application.properties +++ b/application.properties @@ -1,3 +1,3 @@ #Grails Metadata file -#Mon Mar 30 21:40:27 CST 2015 -app.grails.version=2.5.0 +#Thu Feb 10 13:36:55 CET 2022 +app.grails.version=2.5.6 diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy index c9ea26d..fd51b99 100644 --- a/grails-app/conf/BuildConfig.groovy +++ b/grails-app/conf/BuildConfig.groovy @@ -1,12 +1,27 @@ -if (System.getenv('TRAVIS_BRANCH')) { - grails.project.repos.grailsCentral.username = System.getenv("GRAILS_CENTRAL_USERNAME") - grails.project.repos.grailsCentral.password = System.getenv("GRAILS_CENTRAL_PASSWORD") -} +//if (System.getenv('TRAVIS_BRANCH')) { +// grails.project.repos.grailsCentral.username = System.getenv("GRAILS_CENTRAL_USERNAME") +// grails.project.repos.grailsCentral.password = System.getenv("GRAILS_CENTRAL_PASSWORD") +//} grails.project.work.dir = 'target' grails.project.docs.output.dir = 'docs/manual' // for gh-pages branch -grails.project.source.level = 1.7 -grails.project.target.level = 1.7 +grails.project.source.level = 1.8 +grails.project.target.level = 1.8 + +// add repository information to deploy it to our artifactory +// determine snapshot version +boolean isSnapshot = false +new File("${basedir}").eachFile { + if (it.name.endsWith("GrailsPlugin.groovy")) { + isSnapshot = it.readLines().any { it.contains("version") && it.contains('SNAPSHOT') } + } +} + +//Nexus Configuration +grails.project.repos.default = "" +grails.project.repos.dvinci.url = "" +grails.project.repos.dvinci.username = "" +grails.project.repos.dvinci.password = "" grails.project.dependency.resolver = "maven" // or ivy grails.project.dependency.resolution = { @@ -28,11 +43,11 @@ grails.project.dependency.resolution = { exclude group: 'org.springframework', name: 'spring-context-support' exclude group: 'org.springframework', name: 'spring-context' } - + compile 'org.apache.maven.wagon:wagon-http:1.0-beta-2' } plugins { - build(':release:3.1.1', ':rest-client-builder:2.1.1') { + build(':release:3.1.3', ':rest-client-builder:2.1.1') { export = false } compile ':cache:1.1.8' diff --git a/grailsw b/grailsw index 311a315..93ad769 100755 --- a/grailsw +++ b/grailsw @@ -132,7 +132,7 @@ fi if [ -z "$STARTER_CONF" ]; then STARTER_CONF="$GRAILS_HOME/conf/groovy-starter.conf" fi -STARTER_CLASSPATH="wrapper/grails-wrapper-runtime-2.5.0.jar:wrapper:." +STARTER_CLASSPATH="wrapper/grails-wrapper-runtime-2.5.6.jar:wrapper:." # Allow access to Cocoa classes on OS X if $darwin; then @@ -200,7 +200,7 @@ if $mingw ; then fi if [ -z "$GRAILS_AGENT_CACHE_DIR" ]; then - GRAILS_AGENT_CACHE_DIR=~/.grails/2.5.0/ + GRAILS_AGENT_CACHE_DIR=~/.grails/2.5.6/ fi SPRINGLOADED_PARAMS=profile=grails\;cacheDir=$GRAILS_AGENT_CACHE_DIR if [ ! -d "$GRAILS_AGENT_CACHE_DIR" ]; then @@ -208,7 +208,7 @@ if [ ! -d "$GRAILS_AGENT_CACHE_DIR" ]; then fi # Process JVM args -AGENT_STRING="-javaagent:wrapper/springloaded-1.2.3.RELEASE.jar -Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true -Dspringloaded=$SPRINGLOADED_PARAMS" +AGENT_STRING="-javaagent:wrapper/springloaded-1.2.7.RELEASE.jar -Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true -Dspringloaded=$SPRINGLOADED_PARAMS" CMD_LINE_ARGS="" DISABLE_RELOADING=true diff --git a/grailsw.bat b/grailsw.bat index 6a2dc5f..74fd0b5 100644 --- a/grailsw.bat +++ b/grailsw.bat @@ -60,7 +60,7 @@ if "%GRAILS_HOME:~-1%"=="\" SET GRAILS_HOME=%GRAILS_HOME:~0,-1% :init for %%x in ("%USERPROFILE%") do set SHORTHOME=%%~fsx -if "x%GRAILS_AGENT_CACHE_DIR%" == "x" set GRAILS_AGENT_CACHE_DIR=%SHORTHOME%/.grails/2.5.0/ +if "x%GRAILS_AGENT_CACHE_DIR%" == "x" set GRAILS_AGENT_CACHE_DIR=%SHORTHOME%/.grails/2.5.6/ set SPRINGLOADED_PARAMS="profile=grails;cacheDir=%GRAILS_AGENT_CACHE_DIR%" if not exist "%GRAILS_AGENT_CACHE_DIR%" mkdir "%GRAILS_AGENT_CACHE_DIR%" @@ -69,7 +69,7 @@ if "%GRAILS_NO_PERMGEN%" == "" ( if not errorlevel 1 set GRAILS_NO_PERMGEN=1 ) -set AGENT_STRING=-javaagent:wrapper/springloaded-1.2.3.RELEASE.jar -Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true -Dspringloaded=\"%SPRINGLOADED_PARAMS%\" +set AGENT_STRING=-javaagent:wrapper/springloaded-1.2.7.RELEASE.jar -Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true -Dspringloaded=\"%SPRINGLOADED_PARAMS%\" set DISABLE_RELOADING= if "%GRAILS_OPTS%" == "" ( set GRAILS_OPTS=-server -Xmx768M -Xms64M -Dfile.encoding=UTF-8 @@ -140,7 +140,7 @@ set CMD_LINE_ARGS=%$ :execute @rem Setup the command line -set STARTER_CLASSPATH=wrapper/grails-wrapper-runtime-2.5.0.jar;wrapper;. +set STARTER_CLASSPATH=wrapper/grails-wrapper-runtime-2.5.6.jar;wrapper;. if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat" @@ -169,7 +169,7 @@ set JAVA_OPTS=%GRAILS_OPTS% %JAVA_OPTS% %AGENT% set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name="%PROGNAME%" set JAVA_OPTS=%JAVA_OPTS% -Dgrails.home="%GRAILS_HOME%" -set JAVA_OPTS=%JAVA_OPTS% -Dgrails.version=2.5.0 +set JAVA_OPTS=%JAVA_OPTS% -Dgrails.version=2.5.6 set JAVA_OPTS=%JAVA_OPTS% -Dbase.dir=. set JAVA_OPTS=%JAVA_OPTS% -Dtools.jar="%TOOLS_JAR%" set JAVA_OPTS=%JAVA_OPTS% -Dgroovy.starter.conf="%STARTER_CONF%" diff --git a/wrapper/grails-wrapper-runtime-2.5.0.jar b/wrapper/grails-wrapper-runtime-2.5.0.jar deleted file mode 100644 index e6b8ccf..0000000 Binary files a/wrapper/grails-wrapper-runtime-2.5.0.jar and /dev/null differ diff --git a/wrapper/grails-wrapper-runtime-2.5.6.jar b/wrapper/grails-wrapper-runtime-2.5.6.jar new file mode 100644 index 0000000..59e5645 Binary files /dev/null and b/wrapper/grails-wrapper-runtime-2.5.6.jar differ diff --git a/wrapper/grails-wrapper.properties b/wrapper/grails-wrapper.properties index 74391ce..0c31d6f 100644 --- a/wrapper/grails-wrapper.properties +++ b/wrapper/grails-wrapper.properties @@ -1 +1 @@ -wrapper.dist.url=http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/ +wrapper.dist.url=https://github.com/grails/grails-core/releases/download/v2.5.6/ diff --git a/wrapper/springloaded-1.2.3.RELEASE.jar b/wrapper/springloaded-1.2.3.RELEASE.jar deleted file mode 100644 index 7e8cb3f..0000000 Binary files a/wrapper/springloaded-1.2.3.RELEASE.jar and /dev/null differ diff --git a/wrapper/springloaded-1.2.7.RELEASE.jar b/wrapper/springloaded-1.2.7.RELEASE.jar new file mode 100644 index 0000000..acdd828 Binary files /dev/null and b/wrapper/springloaded-1.2.7.RELEASE.jar differ