Skip to content

Commit 7db4711

Browse files
AaronJhajAaronJhaj
authored
Merge pull request #1 from cicsdev/aj-changes
5.5 branch
2 parents d1b8e5e + ace3bb4 commit 7db4711

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1609
-14
lines changed

‎.github/workflows/java.yaml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Build
2+
3+
on:
4+
push:
5+
branches: ["cicsts/v5.5"]
6+
pull_request:
7+
branches: ["cicsts/v5.5"]
8+
9+
jobs:
10+
check-copyright:
11+
runs-on: ubuntu-latest
12+
name: Check Copyright
13+
steps:
14+
- uses: actions/checkout@v4
15+
- id: copyright-action
16+
uses: cicsdev/.github/.github/actions/samples-copyright-checker@139edd8dc23af7f4f7dd9afe4d56a1053fe426a7
17+
with:
18+
directory: './cics-java-osgi-hello-app/'
19+
file-extensions: '*.java'
20+
base-copyright: 'Copyright IBM Corp. 2025'
21+
token: ${{ secrets.GITHUB_TOKEN }}
22+
23+
build-mvnw:
24+
name: Build Maven Wrapper
25+
26+
runs-on: ubuntu-latest
27+
strategy:
28+
matrix:
29+
jdk: [8, 11, 17, 21]
30+
steps:
31+
- uses: actions/checkout@v3
32+
- name: Set up JDK ${{ matrix.jdk }}
33+
uses: actions/setup-java@v3
34+
with:
35+
java-version: ${{ matrix.jdk }}
36+
distribution: "semeru"
37+
cache: maven
38+
- name: Build with Maven
39+
run: ./mvnw --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} verify
40+
41+
42+
build-gradlew:
43+
name: Build Gradle Wrapper
44+
45+
runs-on: ubuntu-latest
46+
strategy:
47+
matrix:
48+
jdk: [8, 11, 17, 21]
49+
steps:
50+
- uses: actions/checkout@v3
51+
- name: Set up JDK ${{ matrix.jdk }}
52+
uses: actions/setup-java@v4
53+
with:
54+
java-version: ${{ matrix.jdk }}
55+
distribution: 'semeru'
56+
- uses: gradle/actions/setup-gradle@v3
57+
with:
58+
gradle-version: 8.6
59+
- name: Build with Gradle
60+
run: ./gradlew clean build -Pjava_version=${{ matrix.jdk }}

‎.gitignore

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# Maven ignores
2+
target/
3+
pom.xml.tag
4+
pom.xml.releaseBackup
5+
pom.xml.versionsBackup
6+
pom.xml.next
7+
release.properties
8+
dependency-reduced-pom.xml
9+
buildNumber.properties
10+
.mvn/timing.properties
11+
# https://github.com/takari/maven-wrapper#usage-without-binary-jar
12+
.mvn/wrapper/maven-wrapper.jar
13+
14+
# Eclipse m2e generated files
15+
# Eclipse Core
16+
#.project
17+
# JDT-specific (Eclipse Java Development Tools)
18+
#.classpath
19+
20+
21+
# Gradle ignores
22+
.gradle
23+
**/build/
24+
!src/**/build/
25+
26+
# Ignore Gradle GUI config
27+
gradle-app.setting
28+
29+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
30+
!gradle-wrapper.jar
31+
32+
# Avoid ignore Gradle wrappper properties
33+
!gradle-wrapper.properties
34+
35+
# Cache of project
36+
.gradletasknamecache
37+
38+
# Eclipse Gradle plugin generated files
39+
# Eclipse Core
40+
#.project
41+
# JDT-specific (Eclipse Java Development Tools)
42+
#.classpath
43+
44+
45+
# Java ignores
46+
# Compiled class file
47+
*.class
48+
49+
# Log file
50+
*.log
51+
52+
# BlueJ files
53+
*.ctxt
54+
55+
# Mobile Tools for Java (J2ME)
56+
.mtj.tmp/
57+
58+
# Package Files #
59+
*.jar
60+
*.war
61+
*.nar
62+
*.ear
63+
*.zip
64+
*.tar.gz
65+
*.rar
66+
67+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
68+
hs_err_pid*
69+
replay_pid*
70+
71+
72+
# VSCode ignores
73+
.vscode/*
74+
!.vscode/settings.json
75+
!.vscode/tasks.json
76+
!.vscode/launch.json
77+
!.vscode/extensions.json
78+
!.vscode/*.code-snippets
79+
80+
# Local History for Visual Studio Code
81+
.history/
82+
83+
# Built Visual Studio Code Extensions
84+
*.vsix

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

‎.project

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>cics-java-osgi-hello</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
22+
</natures>
23+
</projectDescription>

‎.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=true
13+
show.executions.view=true

‎MAINTAINERS.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Maintainers
2+
3+
- Aaron Jhaj [@AaronJhaj](https://github.com/AaronJhaj)
4+
5+
*Last reviewed:* June 2025

0 commit comments

Comments
 (0)