From d260f51d8bac16601bd76e56ea907149a28c2020 Mon Sep 17 00:00:00 2001
From: 3hsan <56245694+ehsansasanian@users.noreply.github.com>
Date: Mon, 3 Apr 2023 19:13:45 +0200
Subject: [PATCH] Upgrade osgi module to JDK 11 by moving it to jdk9-and-above
 profile (#13728)

---
 osgi/pom.xml | 13 +++++++++++++
 pom.xml      |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/osgi/pom.xml b/osgi/pom.xml
index 3fa2dcdf02..ecc8758ef9 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -67,6 +67,17 @@
     </dependencyManagement>
 
     <build>
+        <plugins>
+            <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>
+                </configuration>
+            </plugin>
+        </plugins>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -84,6 +95,8 @@
         <javax.json.version>1.1</javax.json.version>
         <osgi.version>6.0.0</osgi.version>
         <maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0f532beaf2..12688defa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -367,7 +367,6 @@
 
                 <module>muleesb</module>
 
-                <module>osgi</module>
                 <module>persistence-modules</module>
                 <module>web-modules</module>
             </modules>
@@ -567,7 +566,6 @@
                 <module>lombok-modules</module>
                 <module>muleesb</module>
 
-                <module>osgi</module>
                 <module>persistence-modules</module>
                 <module>web-modules</module>
             </modules>
@@ -744,6 +742,7 @@
             </build>
 
             <modules>
+                <module>osgi</module>
                 <module>spring-katharsis</module>
                 <module>logging-modules</module>
                 <module>spring-boot-modules</module>
@@ -991,6 +990,7 @@
             </build>
 
             <modules>
+                <module>osgi</module>
                 <module>spring-katharsis</module>
                 <module>logging-modules</module>
                 <module>spring-boot-modules</module>