Upgrade to CICS TS 6.1

Author: SoftlySplinter

.github/workflows/java.yml

@@ -2,9 +2,9 @@ name: Build
 
 on:
   push:
-    branches: ["cicsts/v5.5"]
+    branches: ["cicsts/v6.1"]
   pull_request:
-    branches: ["cicsts/v5.5"]
+    branches: ["cicsts/v6.1"]
   schedule:
     - cron: '0 0 * * *'
 

cics-java-osgi-jdbc-app/.settings/org.eclipse.jdt.apt.core.prefs

@@ -1,2 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.apt.aptEnabled=false
+org.eclipse.jdt.apt.aptEnabled=true
+org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations
+org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations

cics-java-osgi-jdbc-app/.settings/org.eclipse.jdt.core.prefs

@@ -4,6 +4,6 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 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.processAnnotations=enabled
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

cics-java-osgi-jdbc-app/build.gradle

@@ -3,7 +3,9 @@ plugins {
 }
 
 dependencies {
-    compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:5.5-20200519131930-PH25409")
+    annotationProcessor enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:6.1-20220617120000")
+    annotationProcessor 'com.ibm.cics:com.ibm.cics.server.invocation'
+    compileOnly enforcedPlatform("com.ibm.cics:com.ibm.cics.ts.bom:6.1-20220617120000")
     compileOnly 'com.ibm.cics:com.ibm.cics.server'
 }
 

cics-java-osgi-jdbc-app/src/main/java/com/ibm/cicsdev/java/osgi/jdbc/JDBCQueryProgram.java

@@ -12,6 +12,7 @@
 
 import com.ibm.cics.server.Task;
 import com.ibm.cics.server.Terminal;
+import com.ibm.cics.server.invocation.CICSProgram;
 import com.ibm.cicsdev.java.osgi.jdbc.data.Employee;
 
 /**
@@ -60,26 +61,14 @@ private static Connection openConnection() throws SQLException
         return conn;
     }
 
-    /**
-     * Entry point of the CICS program.
-     * 
-     * @param args
-     *            Unused
-     * @throws SQLException
-     *             If Db2 interaction fails.
-     */
-    public static void main(String[] args) throws SQLException
-    {
-        // Create the channel and container.
-        Task task = Task.getTask();
-
-        JDBCQueryProgram app = new JDBCQueryProgram(task);
-        app.run();
-    }
-
     /** The current CICS task */
     private final Task task;
 
+    public JDBCQueryProgram()
+    {
+        this(Task.getTask());
+    }
+
     /**
      * Creates a new instance of the JDBC query program.
      * <p>
@@ -110,6 +99,7 @@ public JDBCQueryProgram(Task task)
      * 
      * @throws SQLException
      */
+    @CICSProgram("CDEVJODB")
     public void run() throws SQLException
     {
         // Query the database for the employees
@@ -119,7 +109,7 @@ public void run() throws SQLException
         boolean isTerminal = principalFacility != null && principalFacility instanceof Terminal;
 
         // Print the employees in tabular format to the terminal.
-        try (PrintWriter out = task.out)
+        try (PrintWriter out = task.getOut())
         {
             out.println();
 

cics-java-osgi-jdbc-bundle/src/main/bundleParts/CDEVJODB.program

@@ -38,7 +38,7 @@
         <dependency>
           <groupId>com.ibm.cics</groupId>
           <artifactId>com.ibm.cics.ts.bom</artifactId>
-          <version>5.5-20200519131930-PH25409</version>
+          <version>6.1-20220617120000</version>
           <scope>import</scope>
           <type>pom</type>
         </dependency>
@@ -59,6 +59,20 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.13.0</version>
+                    <configuration>
+                        <annotationProcessorPaths>
+                            <annotationProcessorPath>
+                                <groupId>com.ibm.cics</groupId>
+                                <artifactId>com.ibm.cics.server.invocation</artifactId>
+                                <version>6.1</version>
+                            </annotationProcessorPath>
+                        </annotationProcessorPaths>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>com.ibm.cics</groupId>
                     <artifactId>cics-bundle-maven-plugin</artifactId>