Merge pull request #15 from cicsdev/aj-6.1

AaronJhaj · web-flow · commit 7ee29e438ab4 · 2025-05-09T10:58:23.000+01:00
6.1 Fixes and readme update
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -10,29 +10,18 @@ on:
 
 jobs:
   check-copyright:
-    name: Check Copyright
     runs-on: ubuntu-latest
+    name: Check Copyright
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Check Copyright
-        env:
-          EXTENSIONS: "*.java"
-          COPYRIGHT_STATEMENT: "/**\n * Copyright IBM Corp. 2025\n */"
-        run: |
-          for ext in $EXTENSIONS; do
-            for file in $(find . -type f -name "$ext" ! -path "cics-java-osgi-jdbc-app/*"); do
-              if ! grep -q "Copyright" "$file"; then
-                echo -e "$COPYRIGHT_STATEMENT\n$(cat "$file")" > "$file"
-              fi
-            done
-          done
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+      - uses: actions/checkout@v4
+      - id: copyright-action
+        uses: cicsdev/.github/.github/actions/samples-copyright-checker@139edd8dc23af7f4f7dd9afe4d56a1053fe426a7
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ github.head_ref }}
+          directory: './cics-java-osgi-jdbc-app/'
+          file-extensions: '*.java'
+          base-copyright: 'Copyright IBM Corp. 2025'
+          token: ${{ secrets.GITHUB_TOKEN }}          
+
 
   build-mvnw:
     name: Build Maven Wrapper
diff --git a/.gitignore b/.gitignore
@@ -13,15 +13,15 @@ buildNumber.properties
 
 # Eclipse m2e generated files
 # Eclipse Core
-.project
+#.project
 # JDT-specific (Eclipse Java Development Tools)
-.classpath
+#.classpath
 
 # Eclipse Gradle plugin generated files
 # Eclipse Core
-.project
+#.project
 # JDT-specific (Eclipse Java Development Tools)
-.classpath
+#.classpath
 
 
 # Java ignores
diff --git a/.project b/.project
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>cics-java-osgi-link</name>
+	<name>cics-java-osgi-jdbc</name>
+	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.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-osgi-jdbc-app
+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/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +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.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+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.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -5,4 +5,4 @@
 - Phil Wakelin [@PhilWakelin](https://github.com/PhilWakelin)
 - Aaron Jhaj [@AaronJhaj](https://github.com/AaronJhaj)
 
-*Last reviewed:* December 2024
+*Last reviewed:* April 2025
diff --git a/README.md b/README.md
diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,11 @@
 
-allprojects {
+allprojects 
+{
     group = 'com.ibm.cicsdev'
     version = '1.0.0'
 
-    repositories {
+    repositories 
+    {
         mavenCentral()
     }
 }
diff --git a/cics-java-osgi-jdbc-app/.classpath b/cics-java-osgi-jdbc-app/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<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.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path=".apt_generated">
+		<attributes>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin/"/>
+</classpath>
diff --git a/cics-java-osgi-jdbc-app/.project b/cics-java-osgi-jdbc-app/.project
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>cics-java-osgi-jdbc-app</name>
+	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
@@ -19,10 +20,21 @@
 			<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>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>
diff --git a/cics-java-osgi-jdbc-app/.settings/org.eclipse.buildship.core.prefs b/cics-java-osgi-jdbc-app/.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-osgi-jdbc-app/.settings/org.eclipse.core.resources.prefs b/cics-java-osgi-jdbc-app/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,3 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/cics-java-osgi-jdbc-app/.settings/org.eclipse.jdt.apt.core.prefs b/cics-java-osgi-jdbc-app/.settings/org.eclipse.jdt.apt.core.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
 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
+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-osgi-jdbc-app/.settings/org.eclipse.jdt.core.prefs b/cics-java-osgi-jdbc-app/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +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.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
+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.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.processAnnotations=enabled
+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
diff --git a/cics-java-osgi-jdbc-app/META-INF/MANIFEST.MF b/cics-java-osgi-jdbc-app/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Automatic-Module-Name: com.ibm.cicsdev.java.osgi.jdbc
+Bundle-Name: CICS OSGi JDBC application - Application
+Bundle-SymbolicName: com.ibm.cicsdev.java.osgi.jdbc
+Bundle-Version: 1.0.0
+Import-Package: com.ibm.cics.server;version="[2.0.0,3.0.0)",
+ com.ibm.cics.server.invocation;version="[1.500.0,2.0.0)",
+ com.ibm.cicsdev.java.osgi.jdbc;version="1.0.0",
+ com.ibm.db2.jcc;resolution:=optional
+Export-Package: com.ibm.cicsdev.java.osgi.jdbc;version="1.0.0"
diff --git a/cics-java-osgi-jdbc-app/build.gradle b/cics-java-osgi-jdbc-app/build.gradle
@@ -1,8 +1,29 @@
-plugins {
+plugins 
+{
     id 'java'
+    id 'eclipse'
 }
 
-dependencies {
+
+java
+{
+	sourceCompatibility = JavaVersion.VERSION_1_8
+	targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+
+// If in Eclipse, add Javadoc to the local project classpath
+eclipse 
+{
+    classpath 
+    {
+        downloadJavadoc = true
+    }
+}
+
+
+dependencies 
+{
     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")
@@ -11,8 +32,10 @@ dependencies {
 
 description = 'CICS OSGi JDBC application - OSGi bundle'
 
-jar {
-    manifest {
-        from "src/main/resources/META-INF/MANIFEST.MF"
+jar 
+{
+    manifest 
+    {
+        from "META-INF/MANIFEST.MF"
     }
 }
diff --git a/cics-java-osgi-jdbc-app/build.properties b/cics-java-osgi-jdbc-app/build.properties
@@ -0,0 +1,5 @@
+bin.includes = META-INF/,\
+               .
+source.. = src/main/java/
+jre.compilation.profile = JavaSE-1.8
+output.. = bin/
diff --git a/cics-java-osgi-jdbc-app/pom.xml b/cics-java-osgi-jdbc-app/pom.xml
@@ -22,29 +22,15 @@
     </dependencies>
 
     <build>
-        <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>
+        <plugins>            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.3.0</version>
                 <configuration>
                     <archive>
-                        <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
+                        <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                    </archive>                                	
                 </configuration>
             </plugin>
         </plugins>
diff --git a/cics-java-osgi-jdbc-app/src/main/resources/META-INF/MANIFEST.MF b/cics-java-osgi-jdbc-app/src/main/resources/META-INF/MANIFEST.MF
diff --git a/cics-java-osgi-jdbc-bundle/.project b/cics-java-osgi-jdbc-bundle/.project
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>cics-java-osgi-jdbc-bundle</name>
+	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
diff --git a/cics-java-osgi-jdbc-bundle/.settings/org.eclipse.buildship.core.prefs b/cics-java-osgi-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-osgi-jdbc-app
+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-osgi-jdbc-bundle/.settings/org.eclipse.ltk.core.refactoring.prefs b/cics-java-osgi-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-osgi-jdbc-bundle/build.gradle b/cics-java-osgi-jdbc-bundle/build.gradle
@@ -1,13 +1,17 @@
-plugins {
+plugins 
+{
     id 'com.ibm.cics.bundle' version "1.0.7"
 }
 
-dependencies {
+dependencies 
+{
     cicsBundlePart project(path: ':cics-java-osgi-jdbc-app', configuration: 'archives')
 }
 
-cicsBundle {
-    build {
+cicsBundle 
+{
+    build 
+    {
         defaultJVMServer = project.findProperty("cics.jvmserver") ?: "DFHOSGI"
     }
 }
diff --git a/cics-java-osgi-jdbc-bundle/src/main/bundleParts/JODB.transaction b/cics-java-osgi-jdbc-bundle/src/main/bundleParts/JODB.transaction
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<cicsdefinitiontransaction name="JODB" program="CDEVCPCL"
+<cicsdefinitiontransaction name="JODB" program="CDEVJODB"
     description="Runs OSGi JDBC program." />
diff --git a/etc/eclipse_projects/com.ibm.cics.server.examples.osgi.jdbc.bundle/.project b/etc/eclipse_projects/com.ibm.cics.server.examples.osgi.jdbc.bundle/.project
diff --git a/etc/eclipse_projects/com.ibm.cics.server.examples.osgi.jdbc.bundle/.settings/org.eclipse.core.resources.prefs b/etc/eclipse_projects/com.ibm.cics.server.examples.osgi.jdbc.bundle/.settings/org.eclipse.core.resources.prefs
diff --git a/etc/eclipse_projects/com.ibm.cics.server.examples.osgi.jdbc.bundle/JODB.transaction b/etc/eclipse_projects/com.ibm.cics.server.examples.osgi.jdbc.bundle/JODB.transaction
diff --git a/etc/eclipse_projects/com.ibm.cics.server.examples.osgi.jdbc.bundle/META-INF/cics.xml b/etc/eclipse_projects/com.ibm.cics.server.examples.osgi.jdbc.bundle/META-INF/cics.xml
diff --git a/etc/eclipse_projects/com.ibm.cics.server.examples.osgi.jdbc.bundle/cics-java-osgi-jdbc-app.osgibundle b/etc/eclipse_projects/com.ibm.cics.server.examples.osgi.jdbc.bundle/cics-java-osgi-jdbc-app.osgibundle
diff --git a/pom.xml b/pom.xml
diff --git a/settings.gradle b/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+eclipse.preferences.version=1`
	`2`	`+encoding/<project>=UTF-8`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`	`1`
`2`		`-allprojects {`
	`2`	`+allprojects`
	`3`	`+{`
`3`	`4`	`group = 'com.ibm.cicsdev'`
`4`	`5`	`version = '1.0.0'`
`5`	`6`
`6`		`- repositories {`
	`7`	`+ repositories`
	`8`	`+ {`
`7`	`9`	`mavenCentral()`
`8`	`10`	`}`
`9`	`11`	`}`