Consolidate demo projects in the "demo" directory (#584)

60 files changed, 313 insertions, 250 deletions

diff --git a/demo_gradle/.gitignore b/demo/gradle/.gitignore
index 12ddda9..12ddda9 100644
--- a/demo_gradle/.gitignore
+++ b/demo/gradle/.gitignore
diff --git a/demo_gradle/README.md b/demo/gradle/README.md
index 5c8bc80..5c8bc80 100644
--- a/demo_gradle/README.md
+++ b/demo/gradle/README.md
diff --git a/demo_gradle/api/.gitignore b/demo/gradle/api/.gitignore
index 378eac2..378eac2 100644
--- a/demo_gradle/api/.gitignore
+++ b/demo/gradle/api/.gitignore
diff --git a/demo/gradle/api/build.gradle b/demo/gradle/api/build.gradle
new file mode 100644
index 0000000..a758f70
--- /dev/null
+++ b/demo/gradle/api/build.gradle
@@ -0,0 +1,6 @@
+dependencies {
+    implementation group: 'org.pf4j', name: 'pf4j', version: "${pf4jVersion}"
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
+
+    testImplementation group: 'junit', name: 'junit', version: '4.+'
+}
diff --git a/demo/api/src/main/java/org/pf4j/demo/api/Greeting.java b/demo/gradle/api/src/main/java/org/pf4j/demo/api/Greeting.java
index 828d61b..828d61b 100644
--- a/demo/api/src/main/java/org/pf4j/demo/api/Greeting.java
+++ b/demo/gradle/api/src/main/java/org/pf4j/demo/api/Greeting.java
diff --git a/demo_gradle/app/.gitignore b/demo/gradle/app/.gitignore
index 378eac2..378eac2 100644
--- a/demo_gradle/app/.gitignore
+++ b/demo/gradle/app/.gitignore
diff --git a/demo_gradle/app/build.gradle b/demo/gradle/app/build.gradle
index 85c2412..eaab92a 100644
--- a/demo_gradle/app/build.gradle
+++ b/demo/gradle/app/build.gradle
@@ -6,13 +6,13 @@ run {
 }
 
 dependencies {
-  compile project(':api')
-  compile group: 'org.pf4j', name: 'pf4j', version: "${pf4jVersion}"
+  implementation project(':api')
+  implementation group: 'org.pf4j', name: 'pf4j', version: "${pf4jVersion}"
   annotationProcessor(group: 'org.pf4j', name: 'pf4j', version: "${pf4jVersion}")
-  compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
-  compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
+  implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
+  implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
 
-  testCompile group: 'junit', name: 'junit', version: '4.+'
+  testImplementation group: 'junit', name: 'junit', version: '4.+'
 }
 
 task uberjar(type: Jar, dependsOn: ['compileJava']) {
diff --git a/demo_gradle/app/src/main/java/org/pf4j/demo/Boot.java b/demo/gradle/app/src/main/java/org/pf4j/demo/Boot.java
index ebc5c31..ebc5c31 100644
--- a/demo_gradle/app/src/main/java/org/pf4j/demo/Boot.java
+++ b/demo/gradle/app/src/main/java/org/pf4j/demo/Boot.java
diff --git a/demo/app/src/main/java/org/pf4j/demo/WhazzupGreeting.java b/demo/gradle/app/src/main/java/org/pf4j/demo/WhazzupGreeting.java
index 1341b77..1341b77 100644
--- a/demo/app/src/main/java/org/pf4j/demo/WhazzupGreeting.java
+++ b/demo/gradle/app/src/main/java/org/pf4j/demo/WhazzupGreeting.java
diff --git a/demo_gradle/app/src/main/resources/log4j.properties b/demo/gradle/app/src/main/resources/log4j.properties
index f42e226..f42e226 100644
--- a/demo_gradle/app/src/main/resources/log4j.properties
+++ b/demo/gradle/app/src/main/resources/log4j.properties
diff --git a/demo_gradle/build.gradle b/demo/gradle/build.gradle
index 9968360..9968360 100644
--- a/demo_gradle/build.gradle
+++ b/demo/gradle/build.gradle
diff --git a/demo_gradle/gradle.properties b/demo/gradle/gradle.properties
index 4000315..4000315 100644
--- a/demo_gradle/gradle.properties
+++ b/demo/gradle/gradle.properties
diff --git a/demo/gradle/gradle/wrapper/gradle-wrapper.jar b/demo/gradle/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..e644113
--- /dev/null
+++ b/demo/gradle/gradle/wrapper/gradle-wrapper.jar
diff --git a/demo_gradle/gradle/wrapper/gradle-wrapper.properties b/demo/gradle/gradle/wrapper/gradle-wrapper.properties
index 4aeeaec..a441313 100644
--- a/demo_gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/demo/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Thu Nov 14 12:06:04 CST 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/demo/gradle/gradlew b/demo/gradle/gradlew
new file mode 100755
index 0000000..b740cf1
--- /dev/null
+++ b/demo/gradle/gradlew
@@ -0,0 +1,249 @@
+#!/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 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/HEAD/platforms/jvm/plugins-application/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
+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
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+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  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+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
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        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
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+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" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    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
+        # 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
+fi
+
+
+# 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"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# 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/demo_gradle/gradlew.bat b/demo/gradle/gradlew.bat
index 24467a1..7101f8e 100644
--- a/demo_gradle/gradlew.bat
+++ b/demo/gradle/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.

 @rem

 

-@if "%DEBUG%" == "" @echo off

+@if "%DEBUG%"=="" @echo off

 @rem ##########################################################################

 @rem

 @rem  Gradle startup script for Windows

@@ -25,10 +25,14 @@
 if "%OS%"=="Windows_NT" setlocal

 

 set DIRNAME=%~dp0

-if "%DIRNAME%" == "" set DIRNAME=.

+if "%DIRNAME%"=="" set DIRNAME=.

+@rem This is normally unused

 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"

 

@@ -37,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 

 set JAVA_EXE=java.exe

 %JAVA_EXE% -version >NUL 2>&1

-if "%ERRORLEVEL%" == "0" goto init

+if %ERRORLEVEL% equ 0 goto execute

 

-echo.

-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

-echo.

-echo Please set the JAVA_HOME variable in your environment to match the

-echo location of your Java installation.

+echo. 1>&2

+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2

+echo. 1>&2

+echo Please set the JAVA_HOME variable in your environment to match the 1>&2

+echo location of your Java installation. 1>&2

 

 goto fail

 

@@ -51,48 +55,36 @@ 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%

-echo.

-echo Please set the JAVA_HOME variable in your environment to match the

-echo location of your Java installation.

+echo. 1>&2

+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2

+echo. 1>&2

+echo Please set the JAVA_HOME variable in your environment to match the 1>&2

+echo location of your Java installation. 1>&2

 

 goto fail

 

-:init

-@rem Get command-line arguments, handling Windows variants

-

-if not "%OS%" == "Windows_NT" goto win9xME_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=%*

-

 :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

-if "%ERRORLEVEL%"=="0" goto mainEnd

+if %ERRORLEVEL% equ 0 goto mainEnd

 

 :fail

 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of

 rem the _cmd.exe /c_ return code!

-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1

-exit /b 1

+set EXIT_CODE=%ERRORLEVEL%

+if %EXIT_CODE% equ 0 set EXIT_CODE=1

+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%

+exit /b %EXIT_CODE%

 

 :mainEnd

 if "%OS%"=="Windows_NT" endlocal

diff --git a/demo_gradle/plugins/build.gradle b/demo/gradle/plugins/build.gradle
index a46f84c..4b03210 100644
--- a/demo_gradle/plugins/build.gradle
+++ b/demo/gradle/plugins/build.gradle
@@ -15,7 +15,7 @@ subprojects {
       with jar
     }
     into('lib') {
-      from configurations.compile
+      from configurations.runtimeClasspath
     }
     archiveExtension ='zip'
   }
diff --git a/demo/plugins/disabled.txt b/demo/gradle/plugins/disabled.txt
index 45f1801..45f1801 100644
--- a/demo/plugins/disabled.txt
+++ b/demo/gradle/plugins/disabled.txt
diff --git a/demo/plugins/enabled.txt b/demo/gradle/plugins/enabled.txt
index 3d76b2f..3d76b2f 100644
--- a/demo/plugins/enabled.txt
+++ b/demo/gradle/plugins/enabled.txt
diff --git a/demo_gradle/plugins/plugin1/.gitignore b/demo/gradle/plugins/plugin1/.gitignore
index 378eac2..378eac2 100644
--- a/demo_gradle/plugins/plugin1/.gitignore
+++ b/demo/gradle/plugins/plugin1/.gitignore
diff --git a/demo_gradle/plugins/plugin2/build.gradle b/demo/gradle/plugins/plugin1/build.gradle
index f3f00a5..78eef47 100644
--- a/demo_gradle/plugins/plugin2/build.gradle
+++ b/demo/gradle/plugins/plugin1/build.gradle
@@ -5,6 +5,7 @@ dependencies {
     exclude group: "org.slf4j"
   }
   annotationProcessor(group: 'org.pf4j', name: 'pf4j', version: "${pf4jVersion}")
-  compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
-  testCompile group: 'junit', name: 'junit', version: '4.+'
+  implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
+  implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
+  testImplementation group: 'junit', name: 'junit', version: '4.+'
 }
diff --git a/demo_gradle/plugins/plugin1/gradle.properties b/demo/gradle/plugins/plugin1/gradle.properties
index 2edd800..2edd800 100644
--- a/demo_gradle/plugins/plugin1/gradle.properties
+++ b/demo/gradle/plugins/plugin1/gradle.properties
diff --git a/demo_gradle/plugins/plugin1/src/main/java/org/pf4j/demo/welcome/WelcomePlugin.java b/demo/gradle/plugins/plugin1/src/main/java/org/pf4j/demo/welcome/WelcomePlugin.java
index aaf1804..aaf1804 100644
--- a/demo_gradle/plugins/plugin1/src/main/java/org/pf4j/demo/welcome/WelcomePlugin.java
+++ b/demo/gradle/plugins/plugin1/src/main/java/org/pf4j/demo/welcome/WelcomePlugin.java
diff --git a/demo_gradle/plugins/plugin2/.gitignore b/demo/gradle/plugins/plugin2/.gitignore
index 378eac2..378eac2 100644
--- a/demo_gradle/plugins/plugin2/.gitignore
+++ b/demo/gradle/plugins/plugin2/.gitignore
diff --git a/demo_gradle/plugins/plugin1/build.gradle b/demo/gradle/plugins/plugin2/build.gradle
index f3f00a5..78eef47 100644
--- a/demo_gradle/plugins/plugin1/build.gradle
+++ b/demo/gradle/plugins/plugin2/build.gradle
@@ -5,6 +5,7 @@ dependencies {
     exclude group: "org.slf4j"
   }
   annotationProcessor(group: 'org.pf4j', name: 'pf4j', version: "${pf4jVersion}")
-  compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
-  testCompile group: 'junit', name: 'junit', version: '4.+'
+  implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
+  implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
+  testImplementation group: 'junit', name: 'junit', version: '4.+'
 }
diff --git a/demo_gradle/plugins/plugin2/gradle.properties b/demo/gradle/plugins/plugin2/gradle.properties
index ef70127..ef70127 100644
--- a/demo_gradle/plugins/plugin2/gradle.properties
+++ b/demo/gradle/plugins/plugin2/gradle.properties
diff --git a/demo_gradle/plugins/plugin2/src/main/java/org/pf4j/demo/hello/HelloPlugin.java b/demo/gradle/plugins/plugin2/src/main/java/org/pf4j/demo/hello/HelloPlugin.java
index f9c7797..f9c7797 100644
--- a/demo_gradle/plugins/plugin2/src/main/java/org/pf4j/demo/hello/HelloPlugin.java
+++ b/demo/gradle/plugins/plugin2/src/main/java/org/pf4j/demo/hello/HelloPlugin.java
diff --git a/demo_gradle/plugins/plugin3/build.gradle b/demo/gradle/plugins/plugin3/build.gradle
index 1860b61..4371251 100644
--- a/demo_gradle/plugins/plugin3/build.gradle
+++ b/demo/gradle/plugins/plugin3/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-  ext.kotlin_version = '1.3.50'
+  ext.kotlin_version = '1.9.24'
 
   repositories {
     mavenCentral()
@@ -22,8 +22,9 @@ dependencies {
     exclude group: "org.slf4j"
   }
   kapt(group: 'org.pf4j', name: 'pf4j', version: "${pf4jVersion}")
-  compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
-  compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+  implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
+  implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-  testCompile group: 'junit', name: 'junit', version: '4.+'
+  testImplementation group: 'junit', name: 'junit', version: '4.+'
 }
diff --git a/demo_gradle/plugins/plugin3/gradle.properties b/demo/gradle/plugins/plugin3/gradle.properties
index a04b609..a04b609 100644
--- a/demo_gradle/plugins/plugin3/gradle.properties
+++ b/demo/gradle/plugins/plugin3/gradle.properties
diff --git a/demo_gradle/plugins/plugin3/src/main/kotlin/org/pf4j/demo/kotlin/KotlinPlugin.kt b/demo/gradle/plugins/plugin3/src/main/kotlin/org/pf4j/demo/kotlin/KotlinPlugin.kt
index 2b2bc17..2b2bc17 100644
--- a/demo_gradle/plugins/plugin3/src/main/kotlin/org/pf4j/demo/kotlin/KotlinPlugin.kt
+++ b/demo/gradle/plugins/plugin3/src/main/kotlin/org/pf4j/demo/kotlin/KotlinPlugin.kt
diff --git a/demo_gradle/settings.gradle b/demo/gradle/settings.gradle
index 828e80a..828e80a 100644
--- a/demo_gradle/settings.gradle
+++ b/demo/gradle/settings.gradle
diff --git a/demo/api/pom.xml b/demo/maven/api/pom.xml
index 615aa30..615aa30 100644
--- a/demo/api/pom.xml
+++ b/demo/maven/api/pom.xml
diff --git a/demo/api/src/main/java/org/pf4j/demo/api/DemoPlugin.java b/demo/maven/api/src/main/java/org/pf4j/demo/api/DemoPlugin.java
index a2f76fc..a2f76fc 100644
--- a/demo/api/src/main/java/org/pf4j/demo/api/DemoPlugin.java
+++ b/demo/maven/api/src/main/java/org/pf4j/demo/api/DemoPlugin.java
diff --git a/demo_gradle/api/src/main/java/org/pf4j/demo/api/Greeting.java b/demo/maven/api/src/main/java/org/pf4j/demo/api/Greeting.java
index 828d61b..828d61b 100644
--- a/demo_gradle/api/src/main/java/org/pf4j/demo/api/Greeting.java
+++ b/demo/maven/api/src/main/java/org/pf4j/demo/api/Greeting.java
diff --git a/demo/api/src/main/java/org/pf4j/demo/api/PluginContext.java b/demo/maven/api/src/main/java/org/pf4j/demo/api/PluginContext.java
index 0a7506f..0a7506f 100644
--- a/demo/api/src/main/java/org/pf4j/demo/api/PluginContext.java
+++ b/demo/maven/api/src/main/java/org/pf4j/demo/api/PluginContext.java
diff --git a/demo/app/pom.xml b/demo/maven/app/pom.xml
index 963bb60..963bb60 100644
--- a/demo/app/pom.xml
+++ b/demo/maven/app/pom.xml
diff --git a/demo/app/src/main/assembly/assembly.xml b/demo/maven/app/src/main/assembly/assembly.xml
index 77c66b4..77c66b4 100644
--- a/demo/app/src/main/assembly/assembly.xml
+++ b/demo/maven/app/src/main/assembly/assembly.xml
diff --git a/demo/app/src/main/java/org/pf4j/demo/Boot.java b/demo/maven/app/src/main/java/org/pf4j/demo/Boot.java
index d101104..d101104 100644
--- a/demo/app/src/main/java/org/pf4j/demo/Boot.java
+++ b/demo/maven/app/src/main/java/org/pf4j/demo/Boot.java
diff --git a/demo/app/src/main/java/org/pf4j/demo/DemoPluginFactory.java b/demo/maven/app/src/main/java/org/pf4j/demo/DemoPluginFactory.java
index bdae2d6..bdae2d6 100644
--- a/demo/app/src/main/java/org/pf4j/demo/DemoPluginFactory.java
+++ b/demo/maven/app/src/main/java/org/pf4j/demo/DemoPluginFactory.java
diff --git a/demo/app/src/main/java/org/pf4j/demo/DemoPluginManager.java b/demo/maven/app/src/main/java/org/pf4j/demo/DemoPluginManager.java
index 2571a3e..2571a3e 100644
--- a/demo/app/src/main/java/org/pf4j/demo/DemoPluginManager.java
+++ b/demo/maven/app/src/main/java/org/pf4j/demo/DemoPluginManager.java
diff --git a/demo/app/src/main/java/org/pf4j/demo/HowdyGreeting.java b/demo/maven/app/src/main/java/org/pf4j/demo/HowdyGreeting.java
index 050934d..050934d 100644
--- a/demo/app/src/main/java/org/pf4j/demo/HowdyGreeting.java
+++ b/demo/maven/app/src/main/java/org/pf4j/demo/HowdyGreeting.java
diff --git a/demo_gradle/app/src/main/java/org/pf4j/demo/WhazzupGreeting.java b/demo/maven/app/src/main/java/org/pf4j/demo/WhazzupGreeting.java
index 1341b77..1341b77 100644
--- a/demo_gradle/app/src/main/java/org/pf4j/demo/WhazzupGreeting.java
+++ b/demo/maven/app/src/main/java/org/pf4j/demo/WhazzupGreeting.java
diff --git a/demo/app/src/main/resources/META-INF/services/org.pf4j.demo.api.Greeting b/demo/maven/app/src/main/resources/META-INF/services/org.pf4j.demo.api.Greeting
index 615a943..615a943 100644
--- a/demo/app/src/main/resources/META-INF/services/org.pf4j.demo.api.Greeting
+++ b/demo/maven/app/src/main/resources/META-INF/services/org.pf4j.demo.api.Greeting
diff --git a/demo/app/src/main/resources/simplelogger.properties b/demo/maven/app/src/main/resources/simplelogger.properties
index 40302dd..40302dd 100755
--- a/demo/app/src/main/resources/simplelogger.properties
+++ b/demo/maven/app/src/main/resources/simplelogger.properties
diff --git a/demo_gradle/plugins/disabled.txt b/demo/maven/plugins/disabled.txt
index 45f1801..45f1801 100644
--- a/demo_gradle/plugins/disabled.txt
+++ b/demo/maven/plugins/disabled.txt
diff --git a/demo_gradle/plugins/enabled.txt b/demo/maven/plugins/enabled.txt
index 3d76b2f..3d76b2f 100644
--- a/demo_gradle/plugins/enabled.txt
+++ b/demo/maven/plugins/enabled.txt
diff --git a/demo/plugins/plugin1/plugin.properties b/demo/maven/plugins/plugin1/plugin.properties
index 9da9bcc..9da9bcc 100644
--- a/demo/plugins/plugin1/plugin.properties
+++ b/demo/maven/plugins/plugin1/plugin.properties
diff --git a/demo/plugins/plugin1/pom.xml b/demo/maven/plugins/plugin1/pom.xml
index 5873fdd..5873fdd 100644
--- a/demo/plugins/plugin1/pom.xml
+++ b/demo/maven/plugins/plugin1/pom.xml
diff --git a/demo/plugins/plugin1/src/main/java/org/pf4j/demo/welcome/WelcomePlugin.java b/demo/maven/plugins/plugin1/src/main/java/org/pf4j/demo/welcome/WelcomePlugin.java
index 3064902..3064902 100644
--- a/demo/plugins/plugin1/src/main/java/org/pf4j/demo/welcome/WelcomePlugin.java
+++ b/demo/maven/plugins/plugin1/src/main/java/org/pf4j/demo/welcome/WelcomePlugin.java
diff --git a/demo/plugins/plugin2/plugin.properties b/demo/maven/plugins/plugin2/plugin.properties
index 60b6f33..60b6f33 100644
--- a/demo/plugins/plugin2/plugin.properties
+++ b/demo/maven/plugins/plugin2/plugin.properties
diff --git a/demo/plugins/plugin2/pom.xml b/demo/maven/plugins/plugin2/pom.xml
index 82ed985..82ed985 100644
--- a/demo/plugins/plugin2/pom.xml
+++ b/demo/maven/plugins/plugin2/pom.xml
diff --git a/demo/plugins/plugin2/src/main/java/org/pf4j/demo/hello/HelloPlugin.java b/demo/maven/plugins/plugin2/src/main/java/org/pf4j/demo/hello/HelloPlugin.java
index ed67878..ed67878 100644
--- a/demo/plugins/plugin2/src/main/java/org/pf4j/demo/hello/HelloPlugin.java
+++ b/demo/maven/plugins/plugin2/src/main/java/org/pf4j/demo/hello/HelloPlugin.java
diff --git a/demo/plugins/pom.xml b/demo/maven/plugins/pom.xml
index 13d41f6..13d41f6 100644
--- a/demo/plugins/pom.xml
+++ b/demo/maven/plugins/pom.xml
diff --git a/demo/pom.xml b/demo/maven/pom.xml
index 5e8a8b6..36a0738 100644
--- a/demo/pom.xml
+++ b/demo/maven/pom.xml
@@ -5,6 +5,7 @@
         <groupId>org.pf4j</groupId>
         <artifactId>pf4j-parent</artifactId>
         <version>3.12.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/demo_gradle/api/build.gradle b/demo_gradle/api/build.gradle
deleted file mode 100644
index 0d3ca62..0000000
--- a/demo_gradle/api/build.gradle
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies {
-    compile group: 'org.pf4j', name: 'pf4j', version: "${pf4jVersion}"
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
-
-    testCompile group: 'junit', name: 'junit', version: '4.+'
-}
diff --git a/demo_gradle/gradle/wrapper/gradle-wrapper.jar b/demo_gradle/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index cc4fdc2..0000000
--- a/demo_gradle/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
diff --git a/demo_gradle/gradlew b/demo_gradle/gradlew
deleted file mode 100755
index 2fe81a7..0000000
--- a/demo_gradle/gradlew
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or 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
-##
-##############################################################################
-
-# 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
-
-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='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# 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
-    ;;
-esac
-
-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"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    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
-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
-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
-
-# 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
-    # 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\""
-        fi
-        i=`expr $i + 1`
-    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, 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"
-
-exec "$JAVACMD" "$@"
diff --git a/pom.xml b/pom.xml
index 19884e2..b59b24e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,7 @@
 
     <modules>
         <module>pf4j</module>
-        <module>demo</module>
+        <module>demo/maven</module>
         <module>maven-archetypes/quickstart</module>
     </modules>
 
diff --git a/run-demo.bat b/run-demo.bat
index 6622d90..f8846cd 100644
--- a/run-demo.bat
+++ b/run-demo.bat
@@ -11,11 +11,11 @@ mkdir demo-dist
 mkdir demo-dist\plugins
 
 REM copy artifacts to demo-dist folder
-xcopy demo\app\target\pf4j-demo-app-*.zip demo-dist /s /i
-xcopy demo\plugins\plugin1\target\pf4j-demo-plugin1-*-all.jar demo-dist\plugins /s
-xcopy demo\plugins\plugin2\target\pf4j-demo-plugin2-*-all.jar demo-dist\plugins /s
-xcopy demo\plugins\enabled.txt demo-dist\plugins /s
-xcopy demo\plugins\disabled.txt demo-dist\plugins /s
+xcopy demo\maven\app\target\pf4j-demo-app-*.zip demo-dist /s /i
+xcopy demo\maven\plugins\plugin1\target\pf4j-demo-plugin1-*-all.jar demo-dist\plugins /s
+xcopy demo\maven\plugins\plugin2\target\pf4j-demo-plugin2-*-all.jar demo-dist\plugins /s
+xcopy demo\maven\plugins\enabled.txt demo-dist\plugins /s
+xcopy demo\maven\plugins\disabled.txt demo-dist\plugins /s
 
 cd demo-dist
 
diff --git a/run-demo.sh b/run-demo.sh
index 96ba799..2991e57 100755
--- a/run-demo.sh
+++ b/run-demo.sh
@@ -12,11 +12,11 @@ rm -fr demo-dist
 mkdir -p demo-dist/plugins
 
 # copy artifacts to demo-dist folder
-cp demo/app/target/pf4j-demo-*.zip demo-dist/
-cp demo/plugins/plugin1/target/pf4j-demo-plugin1-*-all.jar demo-dist/plugins/
-cp demo/plugins/plugin2/target/pf4j-demo-plugin2-*-all.jar demo-dist/plugins/
-cp demo/plugins/enabled.txt demo-dist/plugins/
-cp demo/plugins/disabled.txt demo-dist/plugins/
+cp demo/maven/app/target/pf4j-demo-*.zip demo-dist/
+cp demo/maven/plugins/plugin1/target/pf4j-demo-plugin1-*-all.jar demo-dist/plugins/
+cp demo/maven/plugins/plugin2/target/pf4j-demo-plugin2-*-all.jar demo-dist/plugins/
+cp demo/maven/plugins/enabled.txt demo-dist/plugins/
+cp demo/maven/plugins/disabled.txt demo-dist/plugins/
 
 cd demo-dist