diff --git a/.github/workflows/gradle-check.yml b/.github/workflows/gradle-check.yml index 3abcc09..fdb29a9 100644 --- a/.github/workflows/gradle-check.yml +++ b/.github/workflows/gradle-check.yml @@ -4,30 +4,20 @@ name: Run tests in project on: - push: - branches: [ master ] - pull_request: - branches: [ master ] + push: + branches: [ master ] + pull_request: + branches: [ master ] jobs: - build: - runs-on: ubuntu-latest - - steps: - - - uses: actions/checkout@v2 - - name: Set up JDK 8 - uses: actions/setup-java@v2 - with: - java-version: '8' - distribution: 'adopt' - - name: Cache Gradle - id: cache-gradle - uses: actions/cache@v2 - with: - path: ./gradle/ - key: ${{ runner.os }}-gradle - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew check + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 11 + - uses: gradle/gradle-build-action@v2 + - name: Build with Gradle + run: ./gradlew check diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2e9d65e..d940585 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,20 +9,16 @@ jobs: GIT_USER_NAME: sbglasius GIT_USER_EMAIL: soeren@glasius.dk steps: - - name: Checkout repository - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: token: ${{ secrets.GITHUB_TOKEN }} - - name: Set up JDK - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: - java-version: '11' - distribution: 'zulu' - - name: Get latest release version number + java-version: 11 + distribution: temurin + - uses: dhkatz/get-version-action@v3.0.0 id: get_version - uses: dhkatz/get-version-action@v3.0.0 - - name: Run pre-release - uses: micronaut-projects/github-actions/pre-release@master + - uses: micronaut-projects/github-actions/pre-release@master with: token: ${{ secrets.GITHUB_TOKEN }} - name: Publish to Sonatype OSSRH diff --git a/.sdkmanrc b/.sdkmanrc index 00c962f..1cfbf44 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1,4 +1 @@ -java=8.0.392-librca -grails=5.3.5 -gradle=7.2 -groovy=3.0.8 +java=11.0.21-tem diff --git a/build.gradle b/build.gradle index ff4c32c..f61eece 100644 --- a/build.gradle +++ b/build.gradle @@ -1,54 +1,44 @@ -import io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository - -buildscript { - repositories { - mavenLocal() - maven { url "https://repo.grails.org/grails/core" } - mavenCentral() - } - dependencies { - classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" - classpath "io.github.gradle-nexus:publish-plugin:1.1.0" - } +plugins { + id 'java' + id 'groovy' + id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' } -version project.projectVersion - ext { isBuildSnapshot = version.toString().endsWith("-SNAPSHOT") isReleaseVersion = !isBuildSnapshot } allprojects { - apply plugin: 'groovy' - - version rootProject.version - repositories { - mavenLocal() - maven { url "https://repo.grails.org/grails/core" } + mavenCentral() + maven { url "https://repo.grails.org/grails/core/" } + } + + java { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } + ext { isBuildSnapshot = version.toString().endsWith("-SNAPSHOT") isReleaseVersion = !isBuildSnapshot } - tasks.withType(Test) { + tasks.withType(Test).configureEach { useJUnitPlatform() } - tasks.withType(GroovyCompile) { + tasks.withType(GroovyCompile).configureEach { configure(groovyOptions) { forkOptions.jvmArgs = ['-Xmx1024m'] } } - + } if (project.isReleaseVersion) { - apply plugin: 'io.github.gradle-nexus.publish-plugin' - nexusPublishing { repositories { sonatype { @@ -66,12 +56,13 @@ if (project.isReleaseVersion) { } } //do not generate extra load on Nexus with new staging repository if signing fails or if not a release version +import io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository tasks.withType(InitializeNexusStagingRepository).configureEach { onlyIf { isReleaseVersion } shouldRunAfter(tasks.withType(Sign)) } -tasks.register('snapshotVersion') { +tasks.register('snapshotVersion') { doLast { if (!isBuildSnapshot) { ant.propertyfile(file: "gradle.properties") { diff --git a/external-config/build.gradle b/external-config/build.gradle index a455e6f..fec2736 100644 --- a/external-config/build.gradle +++ b/external-config/build.gradle @@ -1,14 +1,23 @@ -group "dk.glasius" +plugins { + id 'java' + id 'groovy' + id 'maven-publish' + id 'signing' + id 'io.spring.dependency-management' version '1.1.4' +} -apply plugin: 'maven-publish' +group "dk.glasius" -sourceCompatibility = "1.8" -targetCompatibility = "1.8" +dependencyManagement { + imports { + mavenBom "org.grails:grails-bom:$grailsVersion" + } + applyMavenExclusions false +} dependencies { - implementation(platform("org.grails:grails-bom:$grailsVersion")) - implementation "org.grails:grails-core" + implementation "org.codehaus.groovy:groovy-yaml:${groovyVersion}" implementation "io.micronaut:micronaut-core" implementation "io.micronaut:micronaut-inject" @@ -19,15 +28,12 @@ dependencies { runtimeOnly 'org.yaml:snakeyaml:2.2' } -tasks.withType(Test) { +tasks.withType(Test).configureEach { systemProperty 'TEST_HOME', 'home-value' systemProperty 'user.home', System.getProperty('user.home') systemProperty 'grails.env', 'TEST' } -apply plugin: 'maven-publish' -apply plugin: 'signing' - java { withSourcesJar() withJavadocJar() diff --git a/external-config/src/main/groovy/grails/plugin/externalconfig/ExternalConfigRunListener.groovy b/external-config/src/main/groovy/grails/plugin/externalconfig/ExternalConfigRunListener.groovy index 3673bd8..6d6c32c 100644 --- a/external-config/src/main/groovy/grails/plugin/externalconfig/ExternalConfigRunListener.groovy +++ b/external-config/src/main/groovy/grails/plugin/externalconfig/ExternalConfigRunListener.groovy @@ -27,7 +27,6 @@ class ExternalConfigRunListener implements SpringApplicationRunListener { private ResourceLoader defaultResourceLoader = new DefaultResourceLoader() private YamlPropertySourceLoader yamlPropertySourceLoader = new YamlPropertySourceLoader() private PropertiesPropertySourceLoader propertiesPropertySourceLoader = new PropertiesPropertySourceLoader() - private String userHome = System.properties.getProperty('user.home') private String separator = System.properties.getProperty('file.separator') @@ -112,7 +111,6 @@ class ExternalConfigRunListener implements SpringApplicationRunListener { } catch (FileNotFoundException ignore) { return null } - } } return null @@ -166,22 +164,22 @@ class ExternalConfigRunListener implements SpringApplicationRunListener { List sources = System.getProperty('micronaut.config.files', System.getenv('MICRONAUT_CONFIG_FILES') ?: '').tokenize(',') sources.addAll(newSources.collect { it.toString() }) sources = filterMissingMicronautLocations(sources) - log.debug("---> Setting 'micronaut.config.files' to ${sources.join(',')}") - System.setProperty('micronaut.config.files', sources.join(',') ) + log.debug("Setting 'micronaut.config.files' to ${sources.join(',')}") + System.setProperty('micronaut.config.files', sources.join(',')) } private List filterMissingMicronautLocations(List sources) { sources.findAll { String location -> - try { - def resource = defaultResourceLoader.getResource(location) - if (!resource.exists()) { - log.debug("Configuration file ${location} not found, ignoring.") - return false - } - } catch (FileNotFoundException ignore) { + try { + def resource = defaultResourceLoader.getResource(location) + if (!resource.exists()) { log.debug("Configuration file ${location} not found, ignoring.") return false } + } catch (FileNotFoundException ignore) { + log.debug("Configuration file ${location} not found, ignoring.") + return false + } true } } diff --git a/external-config/src/test/resources/logback.xml b/external-config/src/test/resources/logback.xml index 8da5230..b95d4c9 100644 --- a/external-config/src/test/resources/logback.xml +++ b/external-config/src/test/resources/logback.xml @@ -18,6 +18,4 @@ - - diff --git a/gradle.properties b/gradle.properties index ec7e15d..b5eabf2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,8 @@ -#Thu, 28 Dec 2023 10:38:29 +0100 -grailsVersion=5.3.5 -grailsGradlePluginVersion=5.2.3 +#Thu, 01 Sep 2022 14:38:14 +0000 +grailsVersion=6.1.1 +grailsGradlePluginVersion=6.1.0 groovyVersion=3.0.11 -projectVersion=3.2.0 +version=4.0.0 org.gradle.daemon=true org.gradle.parallel=true -org.gradle.jvmargs=-Dfile.encoding\=UTF-8 -Xmx1024M - -version=3.2.1-SNAPSHOT +org.gradle.jvmArgs=-Dfile.encoding\=UTF-8 -Xmx1024M diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf..7454180 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a2..068cdb2 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# 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. @@ -17,67 +17,101 @@ # ############################################################################## -## -## 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/. +# ############################################################################## # 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 +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 -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +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 () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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 @@ -98,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 @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "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" = "true" -o "$msys" = "true" ] ; 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 +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # 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=`expr $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 -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# 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. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +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/settings.gradle b/settings.gradle index 1401d15..397adc1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,15 @@ + +pluginManagement { + repositories { + mavenLocal() + maven { url "https://repo.grails.org/grails/core/" } + gradlePluginPortal() + } + plugins { + id "org.grails.grails-web" version "${grailsGradlePluginVersion}" + id "org.grails.grails-gsp" version "${grailsGradlePluginVersion}" + } +} + include 'external-config' include 'test-app' diff --git a/test-app/build.gradle b/test-app/build.gradle index 86ad1b7..fa4e58b 100644 --- a/test-app/build.gradle +++ b/test-app/build.gradle @@ -1,10 +1,11 @@ +plugins { + id "org.grails.grails-web" + id "org.grails.grails-gsp" +} version "0.1" group "test.app" -apply plugin:"org.grails.grails-web" -apply plugin:"org.grails.grails-gsp" - dependencies { compileOnly "io.micronaut:micronaut-inject-groovy" console "org.grails:grails-console" diff --git a/test-app/grails-app/conf/application.yml b/test-app/grails-app/conf/application.yml index 45d70a5..a23be1d 100644 --- a/test-app/grails-app/conf/application.yml +++ b/test-app/grails-app/conf/application.yml @@ -89,15 +89,15 @@ environments: development: dataSource: dbCreate: create-drop - url: jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE + url: jdbc:h2:mem:devDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE test: dataSource: dbCreate: update - url: jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE + url: jdbc:h2:mem:testDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE production: dataSource: dbCreate: none - url: jdbc:h2:./prodDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE + url: jdbc:h2:./prodDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE properties: jmxEnabled: true initialSize: 5 @@ -126,4 +126,3 @@ grails: locations: - classpath:resourceConfig.yml - /tmp/not-found-12345.yml - diff --git a/test-app/grails-app/conf/logback.xml b/test-app/grails-app/conf/logback.xml index 8da5230..b95d4c9 100644 --- a/test-app/grails-app/conf/logback.xml +++ b/test-app/grails-app/conf/logback.xml @@ -18,6 +18,4 @@ - - diff --git a/travis-build.sh b/travis-build.sh deleted file mode 100755 index ada6b42..0000000 --- a/travis-build.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -set -e -echo "TRAVIS_TAG : $TRAVIS_TAG" -echo "TRAVIS_BRANCH : $TRAVIS_BRANCH" -echo "TRAVIS_PULL_REQUEST : $TRAVIS_PULL_REQUEST" -echo "Publishing archives for branch $TRAVIS_BRANCH" - -./gradlew clean external-config:test test-app:test external-config:install --stacktrace - -EXIT_STATUS=0 -# Only publish if the branch is on master, and it is not a PR -if [[ -n "${TRAVIS_TAG}" ]] || [[ "${TRAVIS_BRANCH}" == 'master' && "${TRAVIS_PULL_REQUEST}" == "false" ]]; then - echo "Publishing archives for branch $TRAVIS_BRANCH" - if [[ -n ${TRAVIS_TAG} ]]; then - echo "Pushing build to Bintray" - ./gradlew external-config:bintrayUpload -PpluginVersion=${TRAVIS_TAG} || EXIT_STATUS=$? - else - echo "Publishing snapshot to OJO" - ./gradlew external-config:artifactoryPublish || EXIT_STATUS=$? - fi -fi -exit ${EXIT_STATUS}