maven central and view fix

.travis.yml

@@ -1,19 +1,20 @@
 language: groovy
+dist: trusty
 sudo: false
 cache:
   directories:
-  - $HOME/.gradle/caches
-  - $HOME/.gradle/wrapper
+  - "$HOME/.gradle/caches"
+  - "$HOME/.gradle/wrapper"
 before_cache:
 - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 jdk:
 - oraclejdk8
-install: true
-script: ./travis-build.sh
+script: "./travis-build.sh"
 env:
   global:
-  - GIT_NAME="Robert Oschwald"
-  - GIT_EMAIL="[email protected]"
-  - secure: QgwDKgm+TFRpt6fnAjbI4MGmBOIqfCm0ycyIom927aZPvhp4fzzI6wGIN06RTAPNao95BnV7TwSgonRExPfqIMCrMzDj4BXVYkK9uXUXTUPYw24+9cEv2ZvnyEurg/MR2ajpu3MHtam+7uGO8mh4pYq+693RpiU+IZFkB5vPWcM=
-  - secure: mRX4Ye6O4iHcxV48DD8Oaz+7FmrN7vMf67g3Ym24zfzLLaxbl77z0XCMQYblU4s/OBqP9BNo4Y7v6HzCxJyWwMIRqz9txk/DkUUAzTSYHIxQwJqnZTdZNjh9muVmvGuyyBj7z/IhBtKVhNDEXn+OW6f0tdiHeLnaAy6kAovvwCA=
-  - secure: rNXYRNphzLvph9lkKJUNwx0RZ0kCYtR1tQIfvsEbk1LQd91W7knjH0w+uTpRaTx05AW6ZTPWGaiIhDZO42PcWmZQJ40/ZKKGMFajtaEr1Y9QATtKjF04//0mwT+3ib0mNbcvSjkKneUR3utX1lr9HovMxC1ZwOAmQAEbo+dGRnlRCVvMoahi1ha+1/1v/Tp9HjwVdxrLpMKLvDnAGSi/5Ac8rojyax5ZrWqU9eBkOzIj36POhT2fpuSegU3h10F+dTtSx9Dxq6/Y5Ml2u6PEgNo0t1hvRKfsMJt/36AR9cGKeKzA2GsR3vriE3dIrmCzIPgir/60WFevHmDGrvTt+2bCVx2Qm5ld9IlGfgYXnVvSahbNAnQv1Z/s/TOjYIWBk9iIFj2QvItW+neRWdPJ9zaLTL4RVpzUzl0cLay8SwwzJMMdB7O4IpQgGSlWDd2bxqx3lOGUmxsyzQ3ge9r6M1pt/9P5uhI7I3E7LBrSuq2J3RafsCZg7cO/l0+zneRQsJrEzuEDAw3CdSmhzKsNskip6Zc2r3HpbGSpG+y+dkSjxFPOVmhDyzgAf0VD4rWgbfb0os5XhxPcPGuNzqXptqXFxA5ynaVft9IV3xcuNK3Ilp/kYVOodISI1s6wferbFaONC8nTVcX5Xmo5T59Z0qusuh33gdL2xgJj1+VRLGs=
+    - TERM=dumb
+    - GIT_NAME="Robert Oschwald"
+    - GIT_EMAIL="[email protected]"
+    - secure: QgwDKgm+TFRpt6fnAjbI4MGmBOIqfCm0ycyIom927aZPvhp4fzzI6wGIN06RTAPNao95BnV7TwSgonRExPfqIMCrMzDj4BXVYkK9uXUXTUPYw24+9cEv2ZvnyEurg/MR2ajpu3MHtam+7uGO8mh4pYq+693RpiU+IZFkB5vPWcM=
+    - secure: mRX4Ye6O4iHcxV48DD8Oaz+7FmrN7vMf67g3Ym24zfzLLaxbl77z0XCMQYblU4s/OBqP9BNo4Y7v6HzCxJyWwMIRqz9txk/DkUUAzTSYHIxQwJqnZTdZNjh9muVmvGuyyBj7z/IhBtKVhNDEXn+OW6f0tdiHeLnaAy6kAovvwCA=
+    - secure: CwD0E4UPufxRM0TrPpRRcBxlwrWSBspTbcHxzgEfA0986ZGpEAlzMZ40s8QaHx7iHU+h/Mx1af4OIHBZ69Oj/bGzWZpOaq1kHI9l1rdhx4WrQwUa3pM9keUsIIffm/HFhM8ipvlHSTgh/NRXUh0KAElXhyzM0cfXTVAqnb7okw/KnYo+4qkv8dF6dGPrUjDCpCddfnZ05lq7qPxaaF0E4QXG/S1ssdSnE50V0mN9rdQEX781ORMtOOWjVO+2v5w+MQD/TN9wVh7L6zGqWD3MIVvcdaTygi74zBHrqPnWqQm0ffDa7ZAgfOCTGcSyI0aTDP/RUZPq9Bzexhp0uH9DTt7Z0nDk8dKva63tOvhjngCLrOcJFoX/UUbkLv8mY+xyHwINvbFw/HJeQ6rd2KmfZWyfXIlJvzCm/+OcaGWNPOHS4n7cppcmls9CmJtZZnW3pahk38akpfEViLLWYAkaAZCZPCoWry87ak4MYlIoOiRFCBryybwBQQsxk/ms86bkE2XUHo1z8McJ76n98+v+XbdsRrMGpmi5+k9w+DTpeNuP3AQRA9wTX62iZ7irwLSdROLfk7H6iOuQ1Q8/PopWH5/cS/QG3nXz4RH/1g8oLz02/a9FhmeUFHY0+ctGlK8kSjEaARyjlMUYF03q9HNUBNHU4i59smfbBcFNoWoxgxM=

README.md

@@ -5,6 +5,8 @@
 This plugin is a fork of the [quartz-monitor](https://grails.org/plugin/quartz-monitor) plugin and supports
 the Grails [Quartz](https://plugins.grails.org/plugin/quartz) and Grails [Schwartz](https://plugins.grails.org/plugin/schwartz) plugins.
 
+Thanks to James Cook (jamescookie) and all other developers who developed Quartz Monitor.
+
 It allows you to view and administer all your Quartz job services in the web-ui.
 
 ## Prerequisites
@@ -20,7 +22,11 @@ Add the plugin to your build.gradle dependencies:
 ```groovy
 dependencies {
    ...
-   compile "org.grails.plugins:schwartz-monitor:2.0.1"
+<<<<<<< Updated upstream
+   compile "org.grails.plugins:schwartz-monitor:2.0.3"
+=======
+   compile "com.symentis.grails.plugins:schwartz-monitor:2.0.1"
+>>>>>>> Stashed changes
 }
 ```
 
@@ -69,11 +75,18 @@ If you use a security plugin (Spring-Security-Core, etc), you must ensure the co
 
 ## Documentation
 
-http://robertoschwald.github.io/grails-schwartz-monitor
+<<<<<<< Updated upstream
+http://symentis.github.io/grails-schwartz-monitor
+=======
+https://symentis.github.io/grails-schwartz-monitor
+>>>>>>> Stashed changes
 
 ## Internals
 
 Compared to the quartz-monitor plugin, this plugin is agnostic to the used quartz plugin, as it relies on Quartz itself and does not extend
 any quartz-plugin factories.
-Its implemented to register a org.quartz.JobListener, which listens to all Job tasks. 
+Its implemented to register an org.quartz.JobListener, which listens to all Job tasks.
 This listener updates Job metrics in the QuartzMonitorService, which also provides additional figures like the startTime of a Job.
+
+## Deployment
+The plugin artifact is deployed to Sonatype (Maven Central) by GitHub Actions.

build.gradle

@@ -0,0 +1,78 @@
+import io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository
+
+buildscript {
+  repositories {
+    maven { url "https://plugins.gradle.org/m2/" }
+  }
+  dependencies {
+    classpath "io.github.gradle-nexus:publish-plugin:1.0.0"
+  }
+}
+
+plugins {
+  id 'java'
+  id 'groovy'
+  id 'java-library'
+  id 'signing'
+  id 'idea'
+  id 'maven-publish'
+}
+
+version project.file("version.txt").text.trim()
+
+ext {
+  isBuildSnapshot = version.endsWith('-SNAPSHOT')
+  isReleaseVersion = !isBuildSnapshot
+}
+
+if (isReleaseVersion) {
+  apply plugin: "io.github.gradle-nexus.publish-plugin"
+  nexusPublishing {
+    repositories {
+      sonatype {
+        if(project.hasProperty('mavenUser')) {
+          username = mavenUser
+          password = mavenPassword
+        }
+      }
+    }
+  }
+}
+
+subprojects { project ->
+  sourceCompatibility = '1.8'
+  targetCompatibility = '1.8'
+
+  if (project.name.startsWith("plugin")) {
+    apply plugin:'maven-publish'
+    apply plugin:'signing'
+    afterEvaluate {
+      signing {
+        required { isReleaseVersion && gradle.taskGraph.hasTask("publish") }
+        sign publishing.publications.maven
+      }
+    }
+
+    tasks.withType(Sign) {
+      onlyIf { isReleaseVersion }
+    }
+
+    //do not generate extra load on Nexus with new staging repository if signing fails
+    tasks.withType(InitializeNexusStagingRepository).configureEach {
+      shouldRunAfter(tasks.withType(Sign))
+    }
+  }
+
+}
+
+repositories {
+  mavenLocal()
+  mavenCentral()
+}
+
+test {
+  testLogging {
+    exceptionFormat = 'full'
+    showStandardStreams = true
+  }
+}

changes.md

@@ -1,11 +1,11 @@
-#Making changes to Schwartz Monitor
+# Making changes to Schwartz Monitor
 
 * Increment version number in build.gradle and add -SNAPSHOT (whilst working on it)
 * Make changes
-* run `gradle install` to install snapshot version to local maven repo
-* go to one of the test projects, e.g. `cd integration-test-app`
-* run `gradle run`
-* open [quartz monitor page](http://localhost:8080/quartz/list) and make sure jobs are running correctly and the failing job is reported as such
-* If everything is ok remove the -SNAPSHOT, commit, tag it (following convention) and push
-* publish by running `gradle bintrayUpload`
+* Go to one of the test projects, e.g. `cd integration-test-app`
+* Run `gradle run`
+* Open [quartz monitor page](http://localhost:8080/quartz/list) and make sure jobs are running correctly and the failing job is reported as such
+* If everything is ok remove the -SNAPSHOT, commit, tag it (following convention) and push to Sonatype (Maven Central)
+* Artifacts are published automatically by GH Actions.
+* If you want to publish manually, run `./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository` (ensure the env vars are set correctly)
 

gradle.properties

@@ -1,5 +1,13 @@
-grailsVersion=3.1.9
-gradleWrapperVersion=2.13
-assetPipelineVersion=2.14.3
+grailsVersion=4.0.10
+gorm.version=7.0.8.RELEASE
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
 
 license=['Apache-2.0']
+
+schwartzPluginVersion=2.0.0.RC1
+
+# Overwrite Spring-Boot BOM version(s)
+# Schwartz 2.0.0.RC1 only works with 2.2.3
+quartz.version = 2.2.3

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Oct 09 10:29:06 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -28,16 +28,16 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$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=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,11 +154,19 @@ if $cygwin ; then
     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=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @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 DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows 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.
@@ -60,11 +59,6 @@ set _SKIP=2
 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