From efe02529c390bc80c8b00d399e3976f7cc950db2 Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Mon, 20 Mar 2023 07:39:20 +0200
Subject: [PATCH] [JAVA-18194] Moved spring-ejb-modules to jdk9-and-above
 profile (#13655)

* [JAVA-18194] Moved spring-ejb-modules to jdk9-and-above profile

* Update pom.xml

---------

Co-authored-by: Dhawal Kapil <dhawalkapil@gmail.com>
---
 pom.xml                                        | 7 +++----
 spring-ejb-modules/wildfly/pom.xml             | 2 --
 spring-ejb-modules/wildfly/widlfly-web/pom.xml | 3 +++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 820411b771..c52ec62cdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -412,7 +412,6 @@
                 <module>spring-cloud-modules</module>
                 <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
 
-                <module>spring-ejb-modules</module>
                 <module>spring-exceptions</module>
                 <module>spring-integration</module>
                 <module>spring-jenkins-pipeline</module>
@@ -493,7 +492,6 @@
                 <module>libraries-5</module>
                 <module>libraries-6</module>
                 <module>spring-boot-modules/spring-boot-react</module>
-                <module>spring-ejb-modules/ejb-beans</module>
 
                 <module>vaadin</module>
 
@@ -603,7 +601,7 @@
                 <module>spring-boot-modules</module>
                 <module>spring-cloud-modules</module>
                 <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
-                <module>spring-ejb-modules</module>
+
                 <module>spring-exceptions</module>
                 <module>spring-integration</module>
                 <module>spring-jenkins-pipeline</module>
@@ -676,7 +674,6 @@
                 <module>libraries-5</module>
                 <module>libraries-6</module>
                 <module>spring-boot-modules/spring-boot-react</module>
-                <module>spring-ejb-modules/ejb-beans</module>
                 <module>vaadin</module>
             </modules>
 
@@ -743,6 +740,7 @@
             </build>
 
             <modules>
+                <module>spring-ejb-modules</module>
                 <module>spring-di</module>
                 <module>spring-di-2</module>
                 <module>spring-jinq</module>
@@ -1014,6 +1012,7 @@
             </build>
 
             <modules>
+                <module>spring-ejb-modules</module>
                 <module>spring-di</module>
                 <module>spring-di-2</module>
                 <module>spring-jinq</module>
diff --git a/spring-ejb-modules/wildfly/pom.xml b/spring-ejb-modules/wildfly/pom.xml
index c73a1f128d..f122e99001 100644
--- a/spring-ejb-modules/wildfly/pom.xml
+++ b/spring-ejb-modules/wildfly/pom.xml
@@ -85,8 +85,6 @@
     </dependencyManagement>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
         <javaee-api.version>7.0</javaee-api.version>
         <wildfly-javaee7.version>10.1.0.Final</wildfly-javaee7.version>
         <hibernate-core.version>5.2.3.Final</hibernate-core.version>
diff --git a/spring-ejb-modules/wildfly/widlfly-web/pom.xml b/spring-ejb-modules/wildfly/widlfly-web/pom.xml
index fb8a7678af..46c3f7d0bc 100644
--- a/spring-ejb-modules/wildfly/widlfly-web/pom.xml
+++ b/spring-ejb-modules/wildfly/widlfly-web/pom.xml
@@ -41,4 +41,7 @@
         </dependency>
     </dependencies>
 
+    <properties>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+    </properties>
 </project>
\ No newline at end of file