cicsdev · AaronJhaj · May 29, 2025 · May 21, 2025 · May 22, 2025 · May 22, 2025
diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [8, 11, 17, 21]
+        jdk: [17, 21]
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.jdk }}
@@ -57,7 +57,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [8, 11, 17, 21]
+        jdk: [17, 21]
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK ${{ matrix.jdk }}

diff --git a/.project b/.project
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>cics-java-liberty-jdbc</name>
+	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=17
diff --git a/README.md b/README.md
diff --git a/cics-java-liberty-jdbc-bundle/.project b/cics-java-liberty-jdbc-bundle/.project
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>cics-java-liberty-jdbc-bundle</name>
+	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>

diff --git a/cics-java-liberty-jdbc-bundle/.settings/org.eclipse.buildship.core.prefs b/cics-java-liberty-jdbc-bundle/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=../cics-java-liberty-jdbc-web
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=false
+show.console.view=false
+show.executions.view=false
diff --git a/cics-java-liberty-jdbc-bundle/.settings/org.eclipse.core.resources.prefs b/cics-java-liberty-jdbc-bundle/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/cics-java-liberty-jdbc-bundle/.settings/org.eclipse.ltk.core.refactoring.prefs b/cics-java-liberty-jdbc-bundle/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/cics-java-liberty-jdbc-bundle/pom.xml b/cics-java-liberty-jdbc-bundle/pom.xml
@@ -28,16 +28,16 @@
     </dependencies>
 
     <build>
-        <plugins>
-            <plugin>
-                <groupId>com.ibm.cics</groupId>
-                <artifactId>cics-bundle-maven-plugin</artifactId>
-                <version>1.0.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <defaultjvmserver>${cics.jvmserver}</defaultjvmserver>
-                </configuration>
-            </plugin>
-        </plugins>
+	    <plugins>
+	      <plugin>
+	        <groupId>com.ibm.cics</groupId>
+	        <artifactId>cics-bundle-maven-plugin</artifactId>
+	        <version>1.0.7</version>
+	        <extensions>true</extensions>
+	        <configuration>
+	            <defaultjvmserver>${cics.jvmserver}</defaultjvmserver>
+	        </configuration>
+	      </plugin>
+	    </plugins>
     </build>
 </project>
diff --git a/cics-java-liberty-jdbc-web/.classpath b/cics-java-liberty-jdbc-web/.classpath
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="bin/main" path="src/main/java">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="com.ibm.cics.explorer.sdk.web.LIBERTY_LIBRARIES/L./V.61/JE.JEE_V9_R1"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/cics-java-liberty-jdbc-web/.project b/cics-java-liberty-jdbc-web/.project
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>cics-java-liberty-jdbc-web</name>
+	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
@@ -29,6 +30,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
@@ -37,5 +48,6 @@
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/cics-java-liberty-jdbc-web/.settings/org.eclipse.buildship.core.prefs b/cics-java-liberty-jdbc-web/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=false
+show.console.view=false
+show.executions.view=false
diff --git a/cics-java-liberty-jdbc-web/.settings/org.eclipse.jdt.apt.core.prefs b/cics-java-liberty-jdbc-web/.settings/org.eclipse.jdt.apt.core.prefs
@@ -1,3 +1,5 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.apt.aptEnabled=false
+org.eclipse.jdt.apt.genSrcDir=.apt_generated
+org.eclipse.jdt.apt.genTestSrcDir=.apt_generated_tests
 org.eclipse.jdt.apt.reconcileEnabled=true
diff --git a/cics-java-liberty-jdbc-web/.settings/org.eclipse.jdt.core.prefs b/cics-java-liberty-jdbc-web/.settings/org.eclipse.jdt.core.prefs
@@ -1,17 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=17
diff --git a/cics-java-liberty-jdbc-web/.settings/org.eclipse.wst.common.component b/cics-java-liberty-jdbc-web/.settings/org.eclipse.wst.common.component
@@ -1,9 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+
+
+
     <wb-module deploy-name="com.ibm.cicsdev.jdbc.web">
-        <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+                
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/.apt_generated"/>
+
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+
+        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+
+
+
         <property name="context-root" value="com.ibm.cicsdev.jdbc.web"/>
+
+
+
         <property name="java-output-path" value="/com.ibm.cicsdev.jdbc.web/WebContent/WEB-INF/classes"/>
+
+
+
     </wb-module>
-</project-modules>
+
+
+
+</project-modules>
diff --git a/cics-java-liberty-jdbc-web/.settings/org.eclipse.wst.common.project.facet.core.xml b/cics-java-liberty-jdbc-web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,7 +3,7 @@
   <fixed facet="wst.jsdt.web"/>
   <fixed facet="java"/>
   <fixed facet="jst.web"/>
-  <installed facet="jst.web" version="3.0"/>
+  <installed facet="jst.web" version="5.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.7"/>
+  <installed facet="java" version="17"/>
 </faceted-project>
diff --git a/cics-java-liberty-jdbc-web/build.properties b/cics-java-liberty-jdbc-web/build.properties
@@ -0,0 +1,7 @@
+source.. = src/main/java
+
+web.content.dir = src/main/webapp
+
+jre.compilation.profile = JavaSE-17
+
+war.name = cics-java-liberty-jdbc-web.war
diff --git a/cics-java-liberty-jdbc-web/src/main/webapp/WEB-INF/web.xml b/cics-java-liberty-jdbc-web/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd"
-	version="3.1">
-	<display-name>com.ibm.cicsdev.jdbc.web</display-name>
-</web-app>
+<web-app 
+  xmlns="https://jakarta.ee/xml/ns/jakartaee" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd" 
+  version="5.0">
+  <display-name>com.ibm.cicsdev.jdbc.web</display-name>
+</web-app>
diff --git a/etc/config/jvmprofile/DFHWLP.jvmprofile b/etc/config/jvmprofile/DFHWLP.jvmprofile
@@ -12,7 +12,7 @@
 # Copyright IBM Corp. 2012, 2023                                      #
 #                                                                     #
 #######################################################################
-JAVA_HOME=/usr/lpp/java/J8.0_64/
+JAVA_HOME=/java/java17_64
 WORK_DIR=.
 
 WLP_INSTALL_DIR=&USSHOME;/wlp
@@ -32,4 +32,5 @@ WLP_INSTALL_DIR=&USSHOME;/wlp
 _BPXK_DISABLE_SHLIB=YES
 
 # Define the Db2 type 2 driver (if using Db2 type 2)
--Dcom.ibm.cics.jvmserver.wlp.jdbc.driver.location=/usr/lpp/db2v13/jdbc
+-Dcom.ibm.cics.jvmserver.wlp.jdbc.driver.location=/usr/lpp/db2v13/jdbc
+-Ddb2.jcc.override.currentSchema=DBADMIN
diff --git a/etc/eclipse_projects/com.ibm.cicsdev.jdbc.web.cicsbundle/.project b/etc/eclipse_projects/com.ibm.cicsdev.jdbc.web.cicsbundle/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.ibm.cics.server.examples.wlp.jdbc.bundle</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.ibm.cics.bundle.ui.bundlebuilder</name>
+			<arguments>
+				<dictionary>
+					<key>bundleID</key>
+					<value>com.ibm.cics.server.examples.wlp.jdbc.bundle</value>
+				</dictionary>
+				<dictionary>
+					<key>majorVersion</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>microVersion</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>minorVersion</key>
+					<value></value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.ibm.cics.bundle.ui.bundlenature</nature>
+	</natures>
+</projectDescription>
diff --git a/...e_projects/com.ibm.cicsdev.jdbc.web.cicsbundle/.settings/org.eclipse.core.resources.prefs b/...e_projects/com.ibm.cicsdev.jdbc.web.cicsbundle/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,4 @@
 eclipse.preferences.version=1
 encoding//META-INF/cics.xml=UTF-8
-encoding/com.ibm.cicsdev.jdbc.web.warbundle=UTF-8
+encoding/<project>=UTF-8
+encoding/cics-java-liberty-jdbc-web.warbundle=UTF-8
diff --git a/etc/eclipse_projects/com.ibm.cicsdev.jdbc.web.cicsbundle/META-INF/cics.xml b/etc/eclipse_projects/com.ibm.cicsdev.jdbc.web.cicsbundle/META-INF/cics.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<manifest xmlns="http://www.ibm.com/xmlns/prod/cics/bundle" id="com.ibm.cicsdev.jdbc.web.cicsbundle" bundleMajorVer="1" bundleMinorVer="0" bundleMicroVer="0" bundleVersion="1" bundleRelease="0" build="IntB-201511072132">
+<manifest xmlns="http://www.ibm.com/xmlns/prod/cics/bundle" id="com.ibm.cics.server.examples.wlp.jdbc.bundle" bundleMajorVer="1" bundleMinorVer="0" bundleMicroVer="0" bundleVersion="1" bundleRelease="0" build="IntB-201511072132">
     <meta_directives>
         <timestamp>2017-08-01T09:50:06.715+01:00</timestamp>
     </meta_directives>
-    <define name="com.ibm.cicsdev.jdbc.web" type="http://www.ibm.com/xmlns/prod/cics/bundle/WARBUNDLE" path="com.ibm.cicsdev.jdbc.web.warbundle"/>
+    <define name="cics-java-liberty-jdbc-web" type="http://www.ibm.com/xmlns/prod/cics/bundle/WARBUNDLE" path="cics-java-liberty-jdbc-web.warbundle"/>
 </manifest>
diff --git a/...eclipse_projects/com.ibm.cicsdev.jdbc.web.cicsbundle/cics-java-liberty-jdbc-web.warbundle b/...eclipse_projects/com.ibm.cicsdev.jdbc.web.cicsbundle/cics-java-liberty-jdbc-web.warbundle
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<warbundle symbolicname="cics-java-liberty-jdbc-web" jvmserver="DFHWLP"/>
diff --git a/etc/eclipse_projects/com.ibm.cicsdev.jdbc.web.cicsbundle/com.ibm.cicsdev.jdbc.web.warbundle b/etc/eclipse_projects/com.ibm.cicsdev.jdbc.web.cicsbundle/com.ibm.cicsdev.jdbc.web.warbundle
diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <!-- CICS bundle properties -->
         <cics.jvmserver>DFHWLP</cics.jvmserver>
-        <java.version>8</java.version>
+        <java.version>17</java.version>
 
         <!-- Java project properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,4 @@
-rootProject.name = 'com.ibm.cicsdev.springboot.jdbc'
+rootProject.name = 'cics-java-liberty-jdbc'
 
 include(':cics-java-liberty-jdbc-web')
 include(':cics-java-liberty-jdbc-bundle')
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		encoding/<project>=UTF-8
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
		<warbundle symbolicname="cics-java-liberty-jdbc-web" jvmserver="DFHWLP"/>