From 9e734e5e4ebffb1df2a4a5047dd1ea695596fe39 Mon Sep 17 00:00:00 2001
From: isudana <isudana@gmail.com>
Date: Wed, 20 May 2026 12:59:58 +0530
Subject: [PATCH] Fix JDK17 build issues

---
 modules/integration/pom.xml              |  2 +-
 modules/transports/core/nhttp/pom.xml    |  2 +-
 modules/transports/core/vfs/pom.xml      |  2 +-
 modules/transports/optional/amqp/pom.xml |  4 +-
 modules/transports/optional/fix/pom.xml  |  2 +-
 pom.xml                                  | 57 +++++++++++++++++++++++-
 6 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index cddd88268..ae101bc94 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -292,7 +292,7 @@
                         </property>
                         <timeStamp>${maven.build.timestamp}</timeStamp>
                     </systemPropertyVariables>
-                    <argLine>-Xms128m -Xmx384m -XX:MaxPermSize=128m</argLine>
+                    <argLine>${surefire.extra.argline} -Xms128m -Xmx384m</argLine>
                     <!-- The working directory must be set to the root directory of the Synapse project because the
                          test cases use the configuration files in the repository directory (repository/conf/sample/*.xml)
                          and some of these configuration files contain URLs that are relative to the current working
diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml
index f3251edd3..62b72cf9d 100644
--- a/modules/transports/core/nhttp/pom.xml
+++ b/modules/transports/core/nhttp/pom.xml
@@ -98,7 +98,7 @@
                             <value>target/cobertura.ser</value>
                         </property>
                     </systemProperties>
-                    <argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine>
+                    <argLine>${surefire.extra.argline} -javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml
index 02908d46d..1b68fa145 100644
--- a/modules/transports/core/vfs/pom.xml
+++ b/modules/transports/core/vfs/pom.xml
@@ -99,7 +99,7 @@
                             <value>target/cobertura.ser</value>
                         </property>
                     </systemProperties>
-                    <argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine>
+                    <argLine>${surefire.extra.argline} -javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/modules/transports/optional/amqp/pom.xml b/modules/transports/optional/amqp/pom.xml
index 6a5043301..2f2ad26ed 100644
--- a/modules/transports/optional/amqp/pom.xml
+++ b/modules/transports/optional/amqp/pom.xml
@@ -54,8 +54,8 @@ under the License.
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
 
diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml
index fd7483e18..523c10eda 100644
--- a/modules/transports/optional/fix/pom.xml
+++ b/modules/transports/optional/fix/pom.xml
@@ -100,7 +100,7 @@
                             <value>target/cobertura.ser</value>
                         </property>
                     </systemProperties>
-                    <argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine>
+                    <argLine>${surefire.extra.argline} -javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine>
                 </configuration>
             </plugin>-->
         </plugins>
diff --git a/pom.xml b/pom.xml
index 641dd8061..a40ed4fc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,58 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>jdk17</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <properties>
+                <aspectj.version>1.9.21</aspectj.version>
+                <surefire.extra.argline>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED</surefire.extra.argline>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjrt</artifactId>
+                        <version>${aspectj.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.aspectj</groupId>
+                        <artifactId>aspectjweaver</artifactId>
+                        <version>${aspectj.version}</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <fork>true</fork>
+                            <compilerArgs combine.children="append">
+                                <compilerArg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</compilerArg>
+                                <compilerArg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</compilerArg>
+                                <compilerArg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</compilerArg>
+                                <compilerArg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</compilerArg>
+                                <compilerArg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</compilerArg>
+                                <compilerArg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</compilerArg>
+                                <compilerArg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</compilerArg>
+                                <compilerArg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</compilerArg>
+                                <compilerArg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</compilerArg>
+                                <compilerArg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</compilerArg>
+                            </compilerArgs>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.22.2</version>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>release</id>
             <build>
@@ -281,7 +333,7 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>2.11</version>
                     <configuration>
-                        <argLine>-Xms128m -Xmx256m</argLine>
+                        <argLine>${surefire.extra.argline} -Xms128m -Xmx256m</argLine>
                         <environmentVariables>
                             <SOAP_SERVICE_TEST>http://localhost:9000/services/MyService1</SOAP_SERVICE_TEST>
 
@@ -323,7 +375,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>2.1.1</version>
+                    <version>3.3.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -1158,6 +1210,7 @@
              of the maven-compiler-plugin as well as certain ant tasks executed using
              maven-antrun-plugin.-->
         <java.version>1.8</java.version>
+        <surefire.extra.argline></surefire.extra.argline>
 
 	    <synapse.version>${project.version}</synapse.version>