From 20c137bdb1a8483a12a5ff859891d7537170c0e2 Mon Sep 17 00:00:00 2001
From: Anastasios Ioannidis
 <121166333+anastasiosioannidis@users.noreply.github.com>
Date: Fri, 3 Mar 2023 15:54:15 +0200
Subject: [PATCH] JAVA-18145 Upgrade Jsf module to JDK 11 (#13491)

* JAVA-18145 Upgrade Jsf module to JDK 11

* JAVA-18145 Deleted jsf module from pre-jdk9 profiles
---
 jsf/pom.xml | 11 +++++++++++
 pom.xml     |  6 ++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/jsf/pom.xml b/jsf/pom.xml
index 88099ef9c4..4e17540557 100644
--- a/jsf/pom.xml
+++ b/jsf/pom.xml
@@ -15,6 +15,13 @@
     </parent>
 
     <dependencies>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax.annotation-api.version}</version>
+        </dependency>
+
         <!-- JSF -->
         <dependency>
             <groupId>com.sun.faces</groupId>
@@ -70,6 +77,10 @@
         <!-- JSF -->
         <com.sun.faces.version>2.2.14</com.sun.faces.version>
         <javax.el.version>3.0.0</javax.el.version>
+        <!-- Maven War plugin -->
+        <maven-war-plugin.version>3.3.1</maven-war-plugin.version>
+        <!-- Other-->
+        <javax.annotation-api.version>1.3.1</javax.annotation-api.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 345cd7979a..bc5e3b8e85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -362,8 +362,6 @@
 
                 <module>jmh</module>
 
-                <module>jsf</module>
-
                 <module>kubernetes-modules</module>
 
                 <!-- <module>lagom</module> --> <!-- Not a maven project -->
@@ -601,8 +599,6 @@
                 <module>jhipster-5</module>
                 <module>jmh</module>
 
-                <module>jsf</module>
-
                 <module>kubernetes-modules</module>
 
                 <!-- <module>lagom</module> --> <!-- Not a maven project -->
@@ -978,6 +974,7 @@
                 <module>java-native</module>
                 <module>jsoup</module>
                 <module>ksqldb</module>
+                <module>jsf</module>
                 <module>libraries-2</module>
                 <module>libraries-7</module>
                 <module>libraries-apache-commons</module>
@@ -1220,6 +1217,7 @@
 
                 <module>java-native</module>
                 <module>jsoup</module>
+                <module>jsf</module>
                 <module>ksqldb</module>
 
                 <module>libraries-7</module>