From ee64fa1fe2133435738a07bd43c15dac9d7825ed Mon Sep 17 00:00:00 2001
From: Ayushi Kumari <ayushi.kumari3@ibm.com>
Date: Tue, 9 Jun 2026 22:11:27 +0530
Subject: [PATCH 1/3] Updated Files as per requirement

---
 cics-java-liberty-restapp-app/build.gradle |  7 +++++-
 gradle.properties                          | 10 +++++++++
 pom.xml                                    | 25 +++++++++++++++++-----
 settings.gradle                            |  7 ++++++
 4 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 gradle.properties

diff --git a/cics-java-liberty-restapp-app/build.gradle b/cics-java-liberty-restapp-app/build.gradle
index c3eaf83..9c09e8b 100644
--- a/cics-java-liberty-restapp-app/build.gradle
+++ b/cics-java-liberty-restapp-app/build.gradle
@@ -10,7 +10,12 @@ plugins
 group = 'com.ibm.cicsdev.restapp'
 archivesBaseName='cics-java-liberty-restapp'
 version = '0.1.0'
-sourceCompatibility = '1.8'
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(java_version)
+    }
+}
 
 // If in Eclipse, add Javadoc to the local project classpath
 eclipse 
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..eebe627
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,10 @@
+java_version = 17
+
+# Gradle daemon improves build performance
+org.gradle.daemon=true
+
+# Enable parallel builds for faster compilation
+org.gradle.parallel=true
+
+# Configuration cache disabled - CICS Bundle Plugin 1.0.8 not compatible
+# org.gradle.configuration-cache=true
diff --git a/pom.xml b/pom.xml
index 3e88cc9..47485c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 	
 
 	<properties>
-		<java.version>1.8</java.version>	
+		<java.version>17</java.version>	
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -41,10 +41,25 @@
 
 
 	<modules>
-        <module>cics-java-liberty-restapp-app</module>
-        <module>cics-java-liberty-restapp-bundle</module>
-    </modules>
-
+	       <module>cics-java-liberty-restapp-app</module>
+	       <module>cics-java-liberty-restapp-bundle</module>
+	   </modules>
 
+	<!-- ================================================================ -->
+	<!-- Build Configuration                                              -->
+	<!-- ================================================================ -->
+	<build>
+		<plugins>
+			<!-- Maven Compiler Plugin with release parameter -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
+				<configuration>
+					<release>${java.version}</release>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 </project>
diff --git a/settings.gradle b/settings.gradle
index ffcf230..48bf055 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,10 @@
+// ============================================================================
+// Root Project Configuration
+// ============================================================================
 rootProject.name = 'cics-java-liberty-restapp'
+
+// ============================================================================
+// Subprojects
+// ============================================================================
 include(':cics-java-liberty-restapp-app')
 include(':cics-java-liberty-restapp-bundle')
\ No newline at end of file

From 28a703e885e37a50efe05baf69c069253a84bee7 Mon Sep 17 00:00:00 2001
From: Ayushi Kumari <ayushi.kumari3@ibm.com>
Date: Tue, 9 Jun 2026 22:21:51 +0530
Subject: [PATCH 2/3] Updated files

---
 gradle.properties | 2 +-
 pom.xml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index eebe627..458c344 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-java_version = 17
+java_version = 8
 
 # Gradle daemon improves build performance
 org.gradle.daemon=true
diff --git a/pom.xml b/pom.xml
index 47485c9..f96db6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 	
 
 	<properties>
-		<java.version>17</java.version>	
+		<java.version>8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<maven.compiler.source>${java.version}</maven.compiler.source>

From 8da413e59ef6806901c00ba3fa131260cfbae657 Mon Sep 17 00:00:00 2001
From: Ayushi Kumari <ayushi.kumari3@ibm.com>
Date: Tue, 9 Jun 2026 22:37:41 +0530
Subject: [PATCH 3/3] Updated Pom.xml files

---
 cics-java-liberty-restapp-app/pom.xml | 9 ++++++++-
 pom.xml                               | 5 +----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cics-java-liberty-restapp-app/pom.xml b/cics-java-liberty-restapp-app/pom.xml
index abd3b53..2784faa 100644
--- a/cics-java-liberty-restapp-app/pom.xml
+++ b/cics-java-liberty-restapp-app/pom.xml
@@ -44,6 +44,13 @@
 
     <build>
         <plugins>
+            <!-- Maven Compiler Plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+            </plugin>
+            
             <!-- WAR plugin build-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -53,7 +60,7 @@
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <archive>
                         <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>										
+                    </archive>
                 </configuration>
             </plugin>
 
diff --git a/pom.xml b/pom.xml
index f96db6b..87474ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,14 +50,11 @@
 	<!-- ================================================================ -->
 	<build>
 		<plugins>
-			<!-- Maven Compiler Plugin with release parameter -->
+			<!-- Maven Compiler Plugin -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.13.0</version>
-				<configuration>
-					<release>${java.version}</release>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>