Eclipse improvements

.classpath

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

.github/workflows/build.yaml

@@ -15,6 +15,9 @@ jobs:
   check-copyright:
     runs-on: ubuntu-latest
     name: Check Copyright
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
       - uses: actions/checkout@v4
         with:
@@ -33,7 +36,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [8, 11, 17, 21, 25]
+        # JDK 8 excluded: maven-compiler-plugin <release> requires JDK 9+
+        # Use JDK 11+ with -Djava.version=8 to validate Java 8 source compatibility
+        jdk: [11, 17, 21, 25]
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.jdk }}
@@ -43,15 +48,17 @@ jobs:
           distribution: "semeru"
           cache: maven
       - name: Build with Maven
-        run: mvn --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} verify
+        run: mvn --batch-mode --update-snapshots --file pom.xml -Djava.version=8 verify
 
   build-mvnw:
     name: Build Maven Wrapper
 
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [8, 11, 17, 21, 25]
+        # JDK 8 excluded: maven-compiler-plugin <release> requires JDK 9+
+        # Use JDK 11+ with -Djava.version=8 to validate Java 8 source compatibility
+        jdk: [11, 17, 21, 25]
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.jdk }}
@@ -61,7 +68,7 @@ jobs:
           distribution: "semeru"
           cache: maven
       - name: Build with Maven Wrapper
-        run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} verify
+        run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=8 verify
 
   build-gradle:
     name: Build Gradle

.github/workflows/cleanup-old-runs.yml

@@ -19,6 +19,6 @@ jobs:
           token: ${{ github.token }}
           repository: ${{ github.repository }}
           retain_days: 30
-          keep_minimum_runs: 3  # Keep at least 3 recent runs of each workflow
+          keep_minimum_runs: 6  # Keep at least 6 recent runs of each workflow
 
 # Made with Bob

.project

@@ -27,21 +27,10 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>		
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
-	<filteredResources>
-		<filter>
-			<id>1756823436255</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
 </projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+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.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.source=1.8

cics-java-liberty-restapp-app/.classpath

@@ -8,10 +8,21 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="com.ibm.cics.explorer.sdk.web.LIBERTY_LIBRARIES/L./V.61/JE.JEE_V8_R0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

cics-java-liberty-restapp-app/build.gradle

@@ -7,8 +7,7 @@ plugins
 
 }
 
-group = 'com.ibm.cicsdev.restapp'
-archivesBaseName='cics-java-liberty-restapp'
+group = 'com.ibm.cicsdev'
 version = '0.1.0'
 
 java {
@@ -17,10 +16,15 @@ java {
     }
 }
 
+war
+{
+    archiveFileName = 'cics-java-liberty-restapp.war'
+}
+
 // If in Eclipse, add Javadoc to the local project classpath
-eclipse 
+eclipse
 {
-    classpath 
+    classpath
     {
         downloadJavadoc = true
     }

cics-java-liberty-restapp-app/pom.xml

@@ -44,43 +44,18 @@
 
     <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>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.4.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <archive>
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <!-- CICS bundle build, specify <jvmserver> value to match CICS JVMSERVER name -->
-                <groupId>com.ibm.cics</groupId>
-                <artifactId>cics-bundle-maven-plugin</artifactId>
-                <version>1.0.6</version>
-                <executions>
-                    <execution>
-                    <goals>
-                        <goal>bundle-war</goal>
-                    </goals>								
-                    <configuration>
-                        <jvmserver>${cics.jvmserver}</jvmserver>
-                    </configuration>
-                    </execution>
-                </executions>
-                </plugin>
-
+        	<!-- WAR plugin build-->
+        	<plugin>
+        		<groupId>org.apache.maven.plugins</groupId>
+        		<artifactId>maven-war-plugin</artifactId>
+        		<version>3.4.0</version>
+        		<configuration>
+        			<failOnMissingWebXml>false</failOnMissingWebXml>
+        			<archive>
+        				<addMavenDescriptor>false</addMavenDescriptor>
+        			</archive>
+        		</configuration>
+        	</plugin>
         </plugins>
     </build>
 </project>

cics-java-liberty-restapp-app/src/main/webapp/WEB-INF/ibm-web-ext.xml

@@ -5,7 +5,7 @@
 	xsi:schemaLocation="http://websphere.ibm.com/xml/ns/javaee http://websphere.ibm.com/xml/ns/javaee/ibm-web-ext_1_0.xsd"
 	version="1.0">
 
-	<context-root uri="com.ibm.cicsdev.restapp" />
+	<context-root uri="cics-java-liberty-restapp" />
 	<enable-directory-browsing value="false"/>
 	<enable-serving-servlets-by-class-name value="false" />
 

etc/eclipse_projects/com.ibm.cicsdev.wlp.restapp.cicsbundle/.project → cics-java-liberty-restapp-cicsbundle-eclipse/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.ibm.cicsdev.wlp.restapp.cicsbundle</name>
+	<name>cics-java-liberty-restapp-cicsbundle-eclipse</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -10,7 +10,7 @@
 			<arguments>
 				<dictionary>
 					<key>bundleID</key>
-					<value>com.ibm.cics.server.examples.wlp.link.bundle</value>
+					<value>cics-java-liberty-restapp-bundle</value>
 				</dictionary>
 				<dictionary>
 					<key>majorVersion</key>

etc/eclipse_projects/com.ibm.cicsdev.wlp.restapp.cicsbundle/.settings/org.eclipse.core.resources.prefs → cics-java-liberty-restapp-cicsbundle-eclipse/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,3 @@
 eclipse.preferences.version=1
 encoding//META-INF/cics.xml=UTF-8
+encoding/cics-java-liberty-restapp-app.warbundle=UTF-8

cics-java-liberty-restapp-bundle/.project → cics-java-liberty-restapp-cicsbundle/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>cics-java-liberty-restapp-bundle</name>
+	<name>cics-java-liberty-restapp-cicsbundle</name>
 	<comment></comment>
 	<projects>
 	</projects>

cics-java-liberty-restapp-cicsbundle/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

cics-java-liberty-restapp-bundle/build.gradle → cics-java-liberty-restapp-cicsbundle/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.ibm.cics.bundle' version "1.0.6"
+    id 'com.ibm.cics.bundle' version "1.0.8"
 }
 
 dependencies {

cics-java-liberty-restapp-bundle/pom.xml → cics-java-liberty-restapp-cicsbundle/pom.xml

@@ -9,7 +9,7 @@
         <version>1.0.0</version>
     </parent>
 
-    <artifactId>cics-java-liberty-restapp-bundle</artifactId>
+    <artifactId>cics-java-liberty-restapp-cicsbundle</artifactId>
     <name>CICS Enterprise Java Program - CICS Bundle</name>
 
     <packaging>cics-bundle</packaging>
@@ -28,7 +28,7 @@
             <plugin>
                 <groupId>com.ibm.cics</groupId>
                 <artifactId>cics-bundle-maven-plugin</artifactId>
-                <version>1.0.7</version>
+                <version>1.0.8</version>
                 <extensions>true</extensions>
 
                 <configuration>

etc/config/server.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Sample Liberty server.xml for cics-java-liberty-restapp.
+
+    This sample uses the javax.* namespace (Java EE 8).
+    Do NOT use Jakarta EE 10 features (restfulWS-3.1, servlet-6.0) —
+    they are incompatible with the javax.* API used in this sample.
+-->
+<server description="CICS Liberty JVM server">
+
+    <featureManager>
+        <!-- JAX-RS 2.1 provides the javax.ws.rs API used by this sample -->
+        <feature>jaxrs-2.1</feature>
+        <!-- Servlet 4.0 is the Java EE 8 servlet container -->
+        <feature>servlet-4.0</feature>
+    </featureManager>
+
+</server>

gradle.properties

@@ -6,5 +6,10 @@ org.gradle.daemon=true
 # Enable parallel builds for faster compilation
 org.gradle.parallel=true
 
+# Enable toolchain auto-provisioning to download JDKs if not found locally
+# This allows builds to work even if Java 8 isn't installed on the system
+org.gradle.java.installations.auto-detect=true
+org.gradle.java.installations.auto-download=true
+
 # Configuration cache disabled - CICS Bundle Plugin 1.0.8 not compatible
 # org.gradle.configuration-cache=true

pom.xml

@@ -20,10 +20,8 @@
 	<properties>
 		<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>
 		<cics.jvmserver>DFHWLP</cics.jvmserver>
-	  </properties>
+	</properties>
 
 	<!-- CICS TS V5.5 BOM (as of May 2020) -->
 	<dependencyManagement>
@@ -42,7 +40,7 @@
 
 	<modules>
 	       <module>cics-java-liberty-restapp-app</module>
-	       <module>cics-java-liberty-restapp-bundle</module>
+	       <module>cics-java-liberty-restapp-cicsbundle</module>
 	   </modules>
 
 	<!-- ================================================================ -->
@@ -55,6 +53,9 @@
 				<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>

settings.gradle

@@ -1,3 +1,11 @@
+// ============================================================================
+// Toolchain Configuration
+// ============================================================================
+// Configure toolchain resolver for auto-provisioning of JDKs
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
+
 // ============================================================================
 // Root Project Configuration
 // ============================================================================
@@ -7,4 +15,4 @@ rootProject.name = 'cics-java-liberty-restapp'
 // Subprojects
 // ============================================================================
 include(':cics-java-liberty-restapp-app')
-include(':cics-java-liberty-restapp-bundle')
+include(':cics-java-liberty-restapp-cicsbundle')