From 47ca8fe691c0f8e6ed211a32a29abafaa81e155e Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Fri, 19 May 2023 05:50:37 +0300
Subject: [PATCH] 20616 (#14023)

* [JAVA-20616] Upgraded spring-spel module to jdk9-and-above profile

* [JAVA-20616]  Upgraded spring-websockets module to jdk9-and-above profile

* [JAVA-20616]  Upgraded spring-shell module to jdk9-and-above profile

---------

Co-authored-by: Dhawal Kapil <dhawalkapil@gmail.com>
---
 pom.xml                   | 16 ++++++++--------
 spring-shell/pom.xml      | 19 +++++++++++++++++--
 spring-websockets/pom.xml |  4 ++++
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index e3a9d07be2..b6e5c526c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -419,13 +419,10 @@
                 <!-- <module>spring-roo</module> --> <!-- JAVA-17327 -->
 
                 <module>spring-security-modules</module>
-                <module>spring-shell</module>
                 <module>spring-soap</module>
-                <module>spring-spel</module>
                 <module>spring-static-resources</module>
                 <module>spring-swagger-codegen</module>
                 <module>spring-web-modules</module>
-                <module>spring-websockets</module>
                 <module>testing-modules</module>
                 <module>video-tutorials</module>
                 <module>xml</module>
@@ -590,13 +587,10 @@
                 <!-- <module>spring-roo</module> --> <!-- JAVA-17327 -->
 
                 <module>spring-security-modules</module>
-                <module>spring-shell</module>
                 <module>spring-soap</module>
-                <module>spring-spel</module>
                 <module>spring-static-resources</module>
                 <module>spring-swagger-codegen</module>
                 <module>spring-web-modules</module>
-                <module>spring-websockets</module>
                 <module>testing-modules</module>
                 <module>video-tutorials</module>
                 <module>xml</module>
@@ -917,8 +911,11 @@
                 <module>spring-scheduling</module>
 
                 <module>spring-state-machine</module>
+                <module>spring-shell</module>
+                <module>spring-spel</module>
                 <module>spring-threads</module>
-				<module>spring-vault</module>
+                <module>spring-vault</module>
+                <module>spring-websockets</module>
                 <module>static-analysis</module>
                 <module>tensorflow-java</module>
                 <module>vertx-modules</module>
@@ -1176,8 +1173,11 @@
                 <module>spring-scheduling</module>
 
                 <module>spring-state-machine</module>
+                <module>spring-shell</module>
+                <module>spring-spel</module>
                 <module>spring-threads</module>
-				<module>spring-vault</module>
+                <module>spring-vault</module>
+                <module>spring-websockets</module>
                 <module>static-analysis</module>
                 <module>tensorflow-java</module>
                 <module>vertx-modules</module>
diff --git a/spring-shell/pom.xml b/spring-shell/pom.xml
index 4e64436486..506884b413 100644
--- a/spring-shell/pom.xml
+++ b/spring-shell/pom.xml
@@ -19,12 +19,27 @@
         <dependency>
             <groupId>org.springframework.shell</groupId>
             <artifactId>spring-shell</artifactId>
-            <version>${org.springframework.shell.version}</version>
+            <version>${spring-shell.version}</version>
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+                <configuration>
+                    <warSourceDirectory>src/main/webapp</warSourceDirectory>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
-        <org.springframework.shell.version>1.2.0.RELEASE</org.springframework.shell.version>
+        <spring-shell.version>1.2.0.RELEASE</spring-shell.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-websockets/pom.xml b/spring-websockets/pom.xml
index a28ef8749a..c13d1cff33 100644
--- a/spring-websockets/pom.xml
+++ b/spring-websockets/pom.xml
@@ -44,4 +44,8 @@
         </resources>
     </build>
 
+    <properties>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+    </properties>
+
 </project>
\ No newline at end of file