Skip to content

Commit 852385b

Browse files
AaronJhajAaronJhaj
authored
Merge pull request #16 from cicsdev/aj-5.5
5.5/5.6 fixes
2 parents 4e9f8e4 + 16cda2b commit 852385b

29 files changed

+351
-80
lines changed

‎.github/workflows/java.yml‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,17 @@ on:
1010

1111
jobs:
1212
check-copyright:
13-
name: Check Copyright
1413
runs-on: ubuntu-latest
14+
name: Check Copyright
1515
steps:
16-
- uses: actions/checkout@v3
17-
18-
- name: Check Copyright
19-
env:
20-
EXTENSIONS: "*.java"
21-
COPYRIGHT_STATEMENT: "/**\n * Copyright IBM Corp. 2025\n */"
22-
run: |
23-
for ext in $EXTENSIONS; do
24-
for file in $(find . -type f -name "$ext" ! -path "cics-java-osgi-jdbc-app/*"); do
25-
if ! grep -q "Copyright" "$file"; then
26-
echo -e "$COPYRIGHT_STATEMENT\n$(cat "$file")" > "$file"
27-
fi
28-
done
29-
done
30-
31-
- name: Create Pull Request
32-
uses: peter-evans/create-pull-request@v7
16+
- uses: actions/checkout@v4
17+
- id: copyright-action
18+
uses: cicsdev/.github/.github/actions/samples-copyright-checker@139edd8dc23af7f4f7dd9afe4d56a1053fe426a7
3319
with:
20+
directory: './cics-java-osgi-jdbc-app/'
21+
file-extensions: '*.java'
22+
base-copyright: 'Copyright IBM Corp. 2025'
3423
token: ${{ secrets.GITHUB_TOKEN }}
35-
base: ${{ github.head_ref }}
3624

3725
build-mvnw:
3826
name: Build Maven Wrapper

‎.gitignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ buildNumber.properties
1313

1414
# Eclipse m2e generated files
1515
# Eclipse Core
16-
.project
16+
#.project
1717
# JDT-specific (Eclipse Java Development Tools)
18-
.classpath
18+
#.classpath
1919

2020
# Eclipse Gradle plugin generated files
2121
# Eclipse Core
22-
.project
22+
#.project
2323
# JDT-specific (Eclipse Java Development Tools)
24-
.classpath
24+
#.classpath
2525

2626

2727
# Java ignores

‎.project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>cics-java-osgi-link</name>
3+
<name>cics-java-osgi-jdbc</name>
44
<projects>
55
</projects>
66
<buildSpec>

‎.settings/org.eclipse.buildship.core.prefs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
arguments=
2+
auto.sync=false
3+
build.scans.enabled=false
4+
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
5+
connection.project.dir=cics-java-osgi-jdbc-app
6+
eclipse.preferences.version=1
7+
gradle.user.home=
8+
java.home=
9+
jvm.arguments=
10+
offline.mode=false
11+
override.workspace.settings=false
12+
show.console.view=false
13+
show.executions.view=false

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3+
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
5+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6+
org.eclipse.jdt.core.compiler.compliance=1.8
7+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
9+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
10+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
12+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
13+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
14+
org.eclipse.jdt.core.compiler.release=disabled
15+
org.eclipse.jdt.core.compiler.source=1.8

‎README.md‎

Lines changed: 159 additions & 43 deletions
Large diffs are not rendered by default.

‎cics-java-osgi-jdbc-app/.classpath‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src/main/java"/>
4+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
5+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6+
<classpathentry kind="src" path=".apt_generated">
7+
<attributes>
8+
<attribute name="optional" value="true"/>
9+
</attributes>
10+
</classpathentry>
11+
<classpathentry kind="output" path="bin/"/>
12+
</classpath>

‎cics-java-osgi-jdbc-app/.project‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
33
<name>cics-java-osgi-jdbc-app</name>
4+
<comment></comment>
45
<projects>
56
</projects>
67
<buildSpec>
@@ -19,10 +20,21 @@
1920
<arguments>
2021
</arguments>
2122
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.pde.ManifestBuilder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
28+
<buildCommand>
29+
<name>org.eclipse.pde.SchemaBuilder</name>
30+
<arguments>
31+
</arguments>
32+
</buildCommand>
2233
</buildSpec>
2334
<natures>
2435
<nature>org.eclipse.jdt.core.javanature</nature>
2536
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2637
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
38+
<nature>org.eclipse.pde.PluginNature</nature>
2739
</natures>
2840
</projectDescription>

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
arguments=
2+
auto.sync=false
3+
build.scans.enabled=false
4+
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
5+
connection.project.dir=
6+
eclipse.preferences.version=1
7+
gradle.user.home=
8+
java.home=
9+
jvm.arguments=
10+
offline.mode=false
11+
override.workspace.settings=false
12+
show.console.view=false
13+
show.executions.view=false

0 commit comments

Comments
 (0)