Update gradle.properties

.dockerignore

@@ -1,7 +0,0 @@
-target/**
-build/**
-bin/**
-.idea/**
-.history/**
-.github/**
-.git/**

.github/renovate.json

@@ -1,11 +0,0 @@
-{
-  "extends": [
-    "config:base",
-    ":preserveSemverRanges",
-    ":rebaseStalePrs",
-    ":disableRateLimiting",
-    ":semanticCommits",
-    ":semanticCommitTypeAll(renovatebot)"
-  ],
-  "labels": ["dependencies", "bot"]
-}

.gitignore

@@ -18,5 +18,4 @@ bin/
 *.log
 tmp/
 ./apache-tomcat
-apache-tomcat.zip
-config-metadata.properties
+apache-tomcat.zip

Dockerfile

@@ -13,7 +13,7 @@ RUN mkdir -p ~/.gradle \
     && ./gradlew --version;
 
 RUN cd cas-overlay \
-    && ./gradlew clean build --parallel --no-daemon;
+    && ./gradlew clean build --parallel;
 
 FROM adoptopenjdk/openjdk11:alpine-jre AS cas
 

README.md

@@ -5,7 +5,7 @@ Generic CAS WAR overlay to exercise the latest versions of CAS. This overlay cou
 
 # Versions
 
-- CAS `6.2.x`
+- CAS `6.1.x`
 - JDK `11`
 
 # Overview

build.gradle

@@ -1,28 +1,17 @@
 buildscript {
     repositories {
         mavenLocal()
-        gradlePluginPortal()
         mavenCentral()
         jcenter()
-        maven { 
-            url "https://repo.spring.io/libs-milestone" 
-            mavenContent { releasesOnly() }
-        }
-        maven { 
-            url "https://repo.spring.io/libs-snapshot" 
-            mavenContent { snapshotsOnly() }
-        }
-        maven { 
-            url "https://plugins.gradle.org/m2/" 
-            mavenContent { releasesOnly() }
-        }
+        maven { url "https://repo.spring.io/libs-milestone" }
+        maven { url "https://repo.spring.io/libs-snapshot" }
+        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
         classpath "de.undercouch:gradle-download-task:${project.gradleDownloadTaskVersion}"
         classpath "org.springframework.boot:spring-boot-gradle-plugin:${project.springBootVersion}"
         classpath "gradle.plugin.com.google.cloud.tools:jib-gradle-plugin:${project.jibVersion}"
         classpath "io.freefair.gradle:maven-plugin:${project.gradleMavenPluginVersion}"
-        classpath "io.freefair.gradle:lombok-plugin:${project.gradleLombokPluginVersion}"
     }
 }
 
@@ -30,26 +19,11 @@ repositories {
     mavenLocal()
     mavenCentral()
     jcenter()
-    maven { 
-        url "https://oss.sonatype.org/content/repositories/snapshots" 
-        mavenContent { snapshotsOnly() }
-    }
-    maven { 
-        mavenContent { releasesOnly() }
-        url "https://build.shibboleth.net/nexus/content/repositories/releases/" 
-    }
-    maven { 
-        mavenContent { releasesOnly() }
-        url "https://repo.spring.io/milestone/" 
-    }
-    maven { 
-        url "https://repo.spring.io/snapshot/" 
-        mavenContent { snapshotsOnly() }
-    }
-    maven { 
-        mavenContent { snapshotsOnly() }
-        url "https://oss.jfrog.org/artifactory/oss-snapshot-local" 
-    }
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+    maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" }
+    maven { url "https://repo.spring.io/milestone/" }
+    maven { url "https://repo.spring.io/snapshot/" }
+    maven { url "https://oss.jfrog.org/artifactory/oss-snapshot-local" }
 }
 
 def casServerVersion = project.'cas.version'
@@ -59,7 +33,6 @@ project.ext."casServerVersion" = casServerVersion
 project.ext."casWebApplicationBinaryName" = casWebApplicationBinaryName
 
 apply plugin: "io.freefair.war-overlay"
-apply plugin: "io.freefair.lombok"
 apply from: rootProject.file("gradle/tasks.gradle")
 
 apply plugin: "war"
@@ -71,7 +44,7 @@ apply from: rootProject.file("gradle/dockerjib.gradle")
 
 dependencies {
     // Other CAS dependencies/modules may be listed here...
-    // implementation "org.apereo.cas:cas-server-support-json-service-registry:${casServerVersion}"
+    // compile "org.apereo.cas:cas-server-support-json-service-registry:${casServerVersion}"
 }
 
 tasks.findByName("jibDockerBuild")
@@ -81,7 +54,7 @@ tasks.findByName("jibDockerBuild")
 tasks.findByName("jib")
     .dependsOn(copyWebAppIntoJib, copyConfigIntoJib)
     .finalizedBy(deleteWebAppFromJib)
-
+    
 configurations.all {
     resolutionStrategy {
         cacheChangingModulesFor 0, "seconds"
@@ -108,4 +81,25 @@ idea {
         downloadJavadoc = true
         downloadSources = true
     }
-}
+}
+
+bootWar {
+    entryCompression = ZipEntryCompression.STORED
+    overlays {
+        // https://docs.freefair.io/gradle-plugins/current/reference/#_io_freefair_war_overlay
+        // Note: The "excludes" property is only for files in the war dependency.
+        // If a jar is excluded from the war, it could be brought back into the final war as a dependency
+        // of non-war dependencies. Those should be excluded via normal gradle dependency exclusions.
+        cas {
+            from "org.apereo.cas:cas-server-webapp${project.appServer}:${casServerVersion}@war"
+            provided = false
+            //excludes = ["WEB-INF/lib/somejar-1.0*"]
+        }
+    }
+}
+
+
+wrapper {
+    distributionType = Wrapper.DistributionType.BIN
+    gradleVersion = "${project.gradleVersion}"
+}

docker-build.sh

@@ -2,9 +2,9 @@
 
 image_tag=(`cat gradle.properties | grep "cas.version" | cut -d= -f2`)
 
-echo "Building CAS docker image tagged as [v$image_tag]"
+echo "Building CAS docker image tagged as [$image_tag]"
 # read -p "Press [Enter] to continue..." any_key;
 
-docker build --tag="org.apereo.cas/cas:v$image_tag" . \
-  && echo "Built CAS image successfully tagged as org.apereo.cas/cas:v$image_tag" \
-  && docker images "org.apereo.cas/cas:v$image_tag"
+docker build --tag="org.apereo.cas/cas:$image_tag" . \
+  && echo "Built CAS image successfully tagged as org.apereo.cas/cas:$image_tag" \
+  && docker images "org.apereo.cas/cas:$image_tag"

docker-push.sh

@@ -7,6 +7,6 @@ echo "$docker_psw" | docker login --username "$docker_user" --password-stdin
 
 image_tag=(`cat gradle.properties | grep "cas.version" | cut -d= -f2`)
 
-echo "Pushing CAS docker image tagged as v$image_tag to org.apereo.cas/cas..."
-docker push org.apereo.cas/cas:"v$image_tag" \
-	&& echo "Pushed org.apereo.cas/cas:v$image_tag successfully.";
+echo "Pushing CAS docker image tagged as $image_tag to org.apereo.cas/cas..."
+docker push org.apereo.cas/cas:"$image_tag" \
+	&& echo "Pushed org.apereo.cas/cas:$image_tag successfully.";

docker-run.sh

@@ -3,5 +3,5 @@
 docker stop cas > /dev/null 2>&1
 docker rm cas > /dev/null 2>&1
 image_tag=(`cat gradle.properties | grep "cas.version" | cut -d= -f2`)
-docker run -d -p 8080:8080 -p 8443:8443 --name="cas" org.apereo.cas/cas:"v${image_tag}"
+docker run -d -p 8080:8080 -p 8443:8443 --name="cas" org.apereo.cas/cas:"${image_tag}"
 docker logs -f cas

gradle.properties

@@ -1,26 +1,26 @@
 # Versions
-cas.version=6.2.0-SNAPSHOT
-springBootVersion=2.2.5.RELEASE
+cas.version=6.1.5
+springBootVersion=2.2.0.RELEASE
 
 # Use -jetty, -undertow to other containers
 # Or blank if you want to deploy to an external container
 appServer=-tomcat
 executable=false
 
-tomcatVersion=9.0.33
+gradleVersion=5.6.3
+tomcatVersion=9.0.30
 
 group=org.apereo.cas
 sourceCompatibility=11
 targetCompatibility=11
 
-jibVersion=2.1.0
+jibVersion=1.7.0
 
 # Location of the downloaded CAS shell JAR
 shellDir=build/libs
 ivyVersion=2.4.0
 gradleDownloadTaskVersion=3.4.3
-gradleMavenPluginVersion=4.1.5
-gradleLombokPluginVersion=4.1.5
+gradleMavenPluginVersion=3.8.4
 
 # use without "-slim" in tag name if you want tools like jstack, adds about 100MB to image size
 # (https://hub.docker.com/r/adoptopenjdk/openjdk11/tags/)

gradle/dockerjib.gradle

@@ -17,11 +17,11 @@ jib {
             username = "*******"
             password = "*******"
         }
+        tags = [casServerVersion]
         */
-        tags = ["v" + casServerVersion]
     }
     container {
-        creationTime = "USE_CURRENT_TIMESTAMP"
+        useCurrentTimestamp = true
         entrypoint = ['docker/entrypoint.sh']
         ports = ['80', '443', '8080', '8443']
         labels = [version:casServerVersion, name:project.name, group:project.group]

gradle/springboot.gradle

@@ -1,101 +1,24 @@
 apply plugin: "org.springframework.boot"
 
-configurations {
-    bootRunConfig.extendsFrom compileClasspath
-}
-
-dependencies {
-    bootRunConfig "org.apereo.cas:cas-server-webapp-init:${casServerVersion}"
-    bootRunConfig "org.apereo.cas:cas-server-webapp-tomcat:${casServerVersion}"
-    bootRunConfig "org.springframework.boot:spring-boot-devtools:${project.springBootVersion}"
-}
-
-sourceSets {
-    bootRunSources {
-        resources {
-            srcDirs new File("//etc/cas/templates/"),
-                    new File("${project.getProjectDir()}/src/main/resources/")
-        }
-    }
-}
-
-bootRun {
-    classpath = configurations.bootRunConfig + sourceSets.main.compileClasspath + sourceSets.main.runtimeClasspath
-    doFirst {
-        sourceResources sourceSets.bootRunSources
-        systemProperties = System.properties
-    }
-
-    def list = []
-    list.add("-XX:TieredStopAtLevel=1")
-    list.add("-Xverify:none")
-    list.add("--add-modules")
-    list.add("java.se")
-    list.add("--add-exports")
-    list.add("java.base/jdk.internal.ref=ALL-UNNAMED")
-    list.add("--add-opens")
-    list.add("java.base/java.lang=ALL-UNNAMED")
-    list.add("--add-opens")
-    list.add("java.base/java.nio=ALL-UNNAMED")
-    list.add("--add-opens")
-    list.add("java.base/sun.nio.ch=ALL-UNNAMED")
-    list.add("--add-opens")
-    list.add("java.management/sun.management=ALL-UNNAMED")
-    list.add("--add-opens")
-    list.add("jdk.management/com.sun.management.internal=ALL-UNNAMED")
-
-    list.add("-XX:+UnlockExperimentalVMOptions")
-    list.add("-XX:+EnableJVMCI")
-    list.add("-XX:+UseJVMCICompiler")
-
-    list.add("-Xrunjdwp:transport=dt_socket,address=5000,server=y,suspend=n")
-
-    jvmArgs = list
-
-    def appArgList = []
-    args = appArgList
-}
+bootRun.enabled = false
+bootRun.onlyIf { return false }
+tasks.remove(tasks['bootRun'])
 
 springBoot {
-    buildInfo()
     mainClassName = "org.apereo.cas.web.CasWebApplication"
 }
 
 bootWar {
-    def executable = project.hasProperty("executable") && Boolean.valueOf(project.getProperty("executable"))
-    if (executable) {
-        logger.info "Including launch script for executable WAR artifact"
-        launchScript()
-    } else {
-        logger.info "WAR artifact is not marked as an executable"
-    }
-    archiveName "${casWebApplicationBinaryName}"
-    baseName "cas"
-    excludeDevtools = false
-
-    entryCompression = ZipEntryCompression.STORED
-    /*
-        attachClasses = true 
-        classesClassifier = 'classes'
-        archiveClasses = true
-    */
-    overlays {
-        /*
-            https://docs.freefair.io/gradle-plugins/current/reference/#_io_freefair_war_overlay
-            Note: The "excludes" property is only for files in the war dependency.
-            If a jar is excluded from the war, it could be brought back into the final war as a dependency
-            of non-war dependencies. Those should be excluded via normal gradle dependency exclusions.
-        */
-        cas {
-            from "org.apereo.cas:cas-server-webapp${project.appServer}:${casServerVersion}@war"
-            provided = false
-            /*
-            excludes = ["WEB-INF/lib/somejar-1.0*"]
-            enableCompilation = true
-            includes = ["*.xyz"]
-            targetPath = "sub-path/bar"
-            skip = false
-            */
+    doFirst {
+        def executable = project.hasProperty("executable") && Boolean.valueOf(project.getProperty("executable"))
+        if (executable) {
+            logger.info "Including launch script for executable WAR artifact"
+            launchScript()
+        } else {
+            logger.info "WAR artifact is not marked as an executable"
         }
+        archiveName "${casWebApplicationBinaryName}"
+        baseName "cas"
+        excludeDevtools = true
     }
-}
+}

gradle/tasks.gradle

@@ -1,28 +1,19 @@
-import org.apache.ivy.util.url.ApacheURLLister
+import org.apache.ivy.util.url.*
 import org.apache.tools.ant.taskdefs.condition.Os
-import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.gradle.api.tasks.Copy
 
-import java.nio.file.Files
-import java.nio.file.Paths
-import java.nio.file.StandardCopyOption
-
-import static org.gradle.internal.logging.text.StyledTextOutput.Style
+import java.nio.file.*
+import org.gradle.internal.logging.text.StyledTextOutputFactory;
+import static org.gradle.internal.logging.text.StyledTextOutput.Style;
 
 buildscript {
     repositories {
         mavenLocal()
         mavenCentral()
         jcenter()
-        maven {
-            url "https://oss.sonatype.org/content/repositories/snapshots"
-            mavenContent { snapshotsOnly() }
-        }
     }
-    
     dependencies {
         classpath "org.apache.ivy:ivy:${project.ivyVersion}"
-        classpath "org.apereo.cas:cas-server-core-api-configuration-model:${project.'cas.version'}"
-        classpath "org.apereo.cas:cas-server-core-configuration-metadata-repository:${project.'cas.version'}"
     }
 }
 
@@ -31,8 +22,8 @@ apply plugin: "de.undercouch.download"
 def tomcatDirectory = "${buildDir}/apache-tomcat-${tomcatVersion}"
 project.ext."tomcatDirectory" = tomcatDirectory
 
-def explodedDir = "${buildDir}/cas"
-def explodedResourcesDir = "${buildDir}/cas-resources"
+def explodedDir="${buildDir}/cas"
+def explodedResourcesDir="${buildDir}/cas-resources"
 def resourceJarName = "cas-server-webapp-resources"
 
 task copyCasConfiguration(type: Copy, group: "build", description: "Copy the CAS configuration from this project to /etc/cas/config") {
@@ -63,7 +54,6 @@ task run(group: "build", description: "Run the CAS web application in embedded c
             main = "-jar"
             jvmArgs = casRunArgs
             args = ["build/libs/${casWebApplicationBinaryName}"]
-            systemProperties = System.properties
             logger.info "Started ${commandLine}"
         }
     }
@@ -76,7 +66,7 @@ task setExecutable(group: "build", description: "Configure the project to run in
     }
 }
 
-task executable(type: Exec, group: "build", description: "Run the CAS web application in standalone executable mode") {
+task executable(type:Exec, group: "build", description: "Run the CAS web application in standalone executable mode") {
     dependsOn setExecutable, 'build'
     doFirst {
         workingDir "."
@@ -98,7 +88,6 @@ task debug(group: "build", description: "Debug the CAS web application in embedd
             jvmArgs = casArgs
             debug = true
             args = ["build/libs/${casWebApplicationBinaryName}"]
-            systemProperties = System.properties
             logger.info "Started ${commandLine}"
         }
     }
@@ -113,7 +102,7 @@ task downloadShell(group: "shell", description: "Download CAS shell jar from sna
         if (isRunningCasServerSnapshot(casServerVersion)) {
             def snapshotDir = "https://oss.sonatype.org/content/repositories/snapshots/org/apereo/cas/cas-server-support-shell/${casServerVersion}/"
             def files = new ApacheURLLister().listFiles(new URL(snapshotDir))
-            files = files.sort { it.path }
+            files = files.sort{it.path}
             files.each {
                 if (it.path.endsWith(".jar")) {
                     downloadFile = it
@@ -131,7 +120,7 @@ task downloadShell(group: "shell", description: "Download CAS shell jar from sna
     }
 }
 
-task runShell(group: "shell", description: "Run the CAS shell") {
+task runShell(group: "shell",  description: "Run the CAS shell") {
     dependsOn downloadShell
     doLast {
         println "Run the following command to launch the shell:\n\tjava -jar ${project.shellDir}/cas-server-support-shell-${casServerVersion}.jar"
@@ -159,7 +148,7 @@ task allDependenciesInsight(group: "build", type: DependencyInsightReportTask, d
 
 task allDependencies(group: "build", type: DependencyReportTask, description: "Display a graph of all project dependencies") {}
 
-task casVersion(group: "build", description: "Display the current CAS version") {
+task casVersion (group: "build", description: "Display the current CAS version") {
     doFirst {
         def verbose = project.hasProperty("verbose") && Boolean.valueOf(project.getProperty("verbose"))
         if (verbose) {
@@ -215,73 +204,16 @@ task createKeystore(group: "build", description: "Create CAS keystore") {
     }
 }
 
-task listTemplateViews(group: "build", description: "List all CAS views") {
+task listTemplateViews (group: "build", description: "List all CAS views") {
     dependsOn explodeWar
 
     doFirst {
         fileTree(explodedResourcesDir).matching {
             include "**/*.html"
         }
-                .collect { it.name }
-                .toSorted()
-                .each { println it }
-    }
-}
-
-task exportConfigMetadata(group: "build", description: "Export collection of CAS properties") {
-    doLast {
-        def file = new File(project.rootDir, 'config-metadata.properties')
-        file.withWriter('utf-8') { writer ->
-            def metadataRepository = new org.apereo.cas.metadata.CasConfigurationMetadataRepository()
-            def repository = metadataRepository.repository;
-            repository.allGroups
-                    .values()
-                    .sort { o1, o2 -> o1.id <=> o2.id }
-                    .each({ group ->
-                        def groupProperties = group.properties
-                        if (!groupProperties.isEmpty()) {
-                            def groupId = group.id.equalsIgnoreCase("_ROOT_GROUP_") ? "" : group.id + "."
-
-                            writer.writeLine("# Group ${group.id}");
-                            writer.writeLine("# ====================")
-                            groupProperties
-                                    .values()
-                                    .sort { o1, o2 -> o1.id <=> o2.id }
-                                    .each({ property ->
-                                        def description = property.shortDescription
-                                        if (!property.shortDescription?.equalsIgnoreCase(property.description) && property.description != null) {
-                                            description = property.description.replace('\n', '#')
-                                        }
-                                        writer.writeLine("# ${description}");
-                                        writer.writeLine("# Type: ${property.type}");
-                                        if (property.deprecated) {
-                                            def deprecation = property.deprecation
-                                            writer.writeLine("# This setting is deprecated with a severity level of ${deprecation.level}.")
-                                            if (deprecation.shortReason != null) {
-                                                writer.writeLine("# because ${deprecation.shortReason}")
-                                            }
-                                            if (deprecation.replacement != null) {
-                                                writer.writeLine("# Replace with: ${deprecation.replacement}")
-                                            }
-                                        }
-                                        property.hints.valueHints.each {
-                                            if (it.value instanceof Object[]) {
-                                                if (it.value[0].toString().contains("RequiresModule")) {
-                                                    writer.writeLine("# Required module: org.apereo.cas:${it.description}")
-                                                    writer.writeLine("# Automatically included/available: ${it.value[1]}")
-                                                }
-                                            }
-                                            if (it.value.toString().contains("RequiredProperty")) {
-                                                writer.writeLine("# Note: This setting is required!")
-                                            }
-                                        }
-                                        writer.writeLine("${groupId}${property.name}=${property.defaultValue}")
-                                        writer.writeLine("")
-                                    });
-                        }
-                    });
-        }
-        println "Configuration metadata is available at ${file.absolutePath}"
+        .collect { it.name }
+        .toSorted()
+        .each { println it }
     }
 }
 
@@ -293,7 +225,6 @@ task getResource(group: "build", description: "Fetch a CAS resource and move it
 
         def results = fileTree(explodedResourcesDir).matching {
             include "**/${resourceName}.*"
-            include "**/${resourceName}"
         }
         if (results.isEmpty()) {
             println "No resources could be found matching ${resourceName}"
@@ -321,11 +252,4 @@ task getResource(group: "build", description: "Fetch a CAS resource and move it
 
 def isRunningCasServerSnapshot(casServerVersion) {
     return "${casServerVersion}".contains("-SNAPSHOT")
-}
-
-task verifyRequiredJavaVersion {
-    logger.info "Checking current Java version ${JavaVersion.current()} for required Java version ${project.targetCompatibility}"
-    if (!JavaVersion.current().name.equalsIgnoreCase("${project.targetCompatibility}")) {
-        throw new GradleException("Current Java version ${JavaVersion.current()} does not match required Java version ${project.targetCompatibility}")
-    }
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=`expr $i + 1`
+        i=$((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" ;;
+        (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
 
@@ -175,9 +175,14 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=`save "$@"`
+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"
 
+# 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

@@ -29,9 +29,6 @@ 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"
 

lombok.config

@@ -1,2 +0,0 @@
-# This file is generated by the 'io.freefair.lombok' Gradle plugin
-config.stopBubbling = true

src/main/webapp/WEB-INF/web.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.1" 
-     metadata-complete="true"
-     xmlns="http://xmlns.jcp.org/xml/ns/javaee" 
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
-</web-app>