From 50d9af5cb0bff2a3db385c023a96a4682ee318b1 Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Tue, 7 Dec 2021 15:20:44 -0700
Subject: [PATCH] Replace Jetty with Gretty

Issue gh-595
---
 build.gradle               | 1 -
 gradle/sample-war.gradle   | 8 --------
 samples/odm/build.gradle   | 7 ++++++-
 samples/plain/build.gradle | 7 ++++++-
 4 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 gradle/sample-war.gradle

diff --git a/build.gradle b/build.gradle
index b6b620c6..2f42b008 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,6 @@ ext.JAVA_MODULE_SCRIPT = "${GRADLE_SCRIPT_DIR}/java-module.gradle"
 ext.MAVEN_DEPLOYMENT_SCRIPT = "${GRADLE_SCRIPT_DIR}/maven-deployment.gradle"
 ext.JAVA_SCRIPT = "${GRADLE_SCRIPT_DIR}/java.gradle"
 ext.RELEASE_CHECKS_SCRIPT = "${GRADLE_SCRIPT_DIR}/release-checks.gradle"
-ext.SAMPLE_WAR_GRADLE = "${GRADLE_SCRIPT_DIR}/sample-war.gradle"
 ext.SPRING_SNAPSHOT_TEST_SCRIPT = "${GRADLE_SCRIPT_DIR}/spring-snapshot-test.gradle"
 
 ext.coreModules = subprojects.findAll { p-> (!p.name.equals('spring-build-src') && !p.name.contains("test") && !p.name.contains("sample") && !p.name.contains("sandbox")) || p.name.contains("spring-ldap-test") }
diff --git a/gradle/sample-war.gradle b/gradle/sample-war.gradle
deleted file mode 100644
index 3c84cada..00000000
--- a/gradle/sample-war.gradle
+++ /dev/null
@@ -1,8 +0,0 @@
-apply from: JAVA_SCRIPT
-
-apply plugin: 'war'
-apply plugin: 'jetty'
-
-sonarqube {
-    skipProject = true
-}
diff --git a/samples/odm/build.gradle b/samples/odm/build.gradle
index 7f7f32a0..dc5e0f43 100644
--- a/samples/odm/build.gradle
+++ b/samples/odm/build.gradle
@@ -1,4 +1,9 @@
-apply from: SAMPLE_WAR_GRADLE
+plugins {
+    id "org.gretty" version "2.3.1"
+    id 'war'
+}
+
+apply from: JAVA_SCRIPT
 
 dependencies {
     compile project(':spring-ldap-test'),
diff --git a/samples/plain/build.gradle b/samples/plain/build.gradle
index e3c6c9f1..e167d28c 100644
--- a/samples/plain/build.gradle
+++ b/samples/plain/build.gradle
@@ -1,4 +1,9 @@
-apply from: SAMPLE_WAR_GRADLE
+plugins {
+    id "org.gretty" version "2.3.1"
+    id 'war'
+}
+
+apply from: JAVA_SCRIPT
 
 dependencies {
     compile project(':spring-ldap-test'),