From 15d89e07cd5eb99ccb9bb5183e8dc41ec2e2d59f Mon Sep 17 00:00:00 2001
From: 3hsan <56245694+ehsansasanian@users.noreply.github.com>
Date: Wed, 22 Mar 2023 09:21:10 +0100
Subject: [PATCH] Upgrade spring-mobile module to JDK 11 and move it to
 jdk9-and-above (#13652)

* Upgrade spring-mobile module to JDK 11 and move it to jdk9-and-above profile

* Add maven-war-plugin to spring-mobile module

---------

Co-authored-by: Dhawal Kapil <dhawalkapil@gmail.com>
---
 pom.xml               |  6 ++----
 spring-mobile/pom.xml | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index d2f7724c1a..3b55736aca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -416,7 +416,6 @@
                 <module>spring-jenkins-pipeline</module>
 
                 <module>spring-katharsis</module>
-                <module>spring-mobile</module>
                 <module>spring-remoting-modules</module>
 
                 <!-- <module>spring-roo</module> --> <!-- JAVA-17327 -->
@@ -606,7 +605,6 @@
                 <module>spring-jenkins-pipeline</module>
 
                 <module>spring-katharsis</module>
-                <module>spring-mobile</module>
                 <module>spring-remoting-modules</module>
 
                 <!-- <module>spring-roo</module> --> <!-- JAVA-17327 -->
@@ -739,6 +737,7 @@
             </build>
 
             <modules>
+                <module>spring-mobile</module>
                 <module>microservices-modules</module>
                 <module>spring-ejb-modules</module>
                 <module>spring-di</module>
@@ -749,7 +748,6 @@
                 <module>azure</module>
                 <module>netflix-modules</module>
                 <module>spf4j</module>
-
                 <module>spring-jersey</module>
                 <module>jersey</module>
                 <module>jaxb</module>
@@ -1014,6 +1012,7 @@
             </build>
 
             <modules>
+                <module>spring-mobile</module>
                 <module>microservices-modules</module>
                 <module>spring-ejb-modules</module>
                 <module>spring-di</module>
@@ -1024,7 +1023,6 @@
                 <module>azure</module>
                 <module>netflix-modules</module>
                 <module>spf4j</module>
-
                 <module>spring-jersey</module>
                 <module>jersey</module>
                 <module>jaxb</module>
diff --git a/spring-mobile/pom.xml b/spring-mobile/pom.xml
index 7f715c8735..0c279c0d62 100644
--- a/spring-mobile/pom.xml
+++ b/spring-mobile/pom.xml
@@ -32,8 +32,33 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <compilerArgs>
+                        <arg>--add-exports=java.base/jdk.internal.vm.annotation=ALL-UNNAMED</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <spring-mobile-device.version>1.1.5.RELEASE</spring-mobile-device.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file