Skip to content

Commit 3179bc2

Browse files
authored
yaml,gitignore and web.xml changes
2 parents e325462 + 89c500c commit 3179bc2

3 files changed

Lines changed: 51 additions & 58 deletions

File tree

.github/workflows/java.yaml

Lines changed: 43 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,51 +8,54 @@ on:
88
schedule:
99
- cron: '0 0 * * *'
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
15+
check-copyright:
16+
runs-on: ubuntu-latest
17+
name: Check Copyright
18+
steps:
19+
- uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 0
22+
- id: copyright-action
23+
uses: cicsdev/.github/.github/actions/samples-copyright-checker@4134522d8109169bb8c460db841f94167ec2802f
24+
with:
25+
directory: './cics-java-liberty-springboot-link/'
26+
file-extensions: '*.java'
27+
base-copyright: 'Copyright IBM Corp. 2025'
28+
token: ${{ secrets.GITHUB_TOKEN }}
29+
1230
build-maven:
1331
name: Build Maven
1432

1533
runs-on: ubuntu-latest
16-
continue-on-error: ${{ matrix.experimental }}
1734
strategy:
1835
matrix:
19-
jdk: [8, 11]
20-
experimental: [false]
21-
include:
22-
- jdk: 17
23-
experimental: true
36+
jdk: [17, 21, 25]
2437
steps:
25-
- uses: actions/checkout@v3
38+
- uses: actions/checkout@v4
2639
- name: Set up JDK ${{ matrix.jdk }}
27-
uses: actions/setup-java@v3
40+
uses: actions/setup-java@v4
2841
with:
2942
java-version: ${{ matrix.jdk }}
3043
distribution: "semeru"
3144
cache: maven
3245
- name: Build with Maven
3346
run: mvn --batch-mode --update-snapshots --file pom.xml -Djava.version=${{ matrix.jdk }} package
34-
- run: mkdir staging && cp target/*.war staging
35-
- uses: actions/upload-artifact@v4
36-
with:
37-
name: cics-java-liberty-sprintboot-link (Maven, Java ${{ matrix.jdk }})
38-
path: staging
3947

4048
build-mvnw:
4149
name: Build Maven Wrapper
4250

4351
runs-on: ubuntu-latest
44-
continue-on-error: ${{ matrix.experimental }}
4552
strategy:
4653
matrix:
47-
jdk: [8, 11]
48-
experimental: [false]
49-
include:
50-
- jdk: 17
51-
experimental: true
54+
jdk: [17, 21, 25]
5255
steps:
53-
- uses: actions/checkout@v3
56+
- uses: actions/checkout@v4
5457
- name: Set up JDK ${{ matrix.jdk }}
55-
uses: actions/setup-java@v3
58+
uses: actions/setup-java@v4
5659
with:
5760
java-version: ${{ matrix.jdk }}
5861
distribution: "semeru"
@@ -64,47 +67,38 @@ jobs:
6467
name: Build Gradle
6568

6669
runs-on: ubuntu-latest
67-
continue-on-error: ${{ matrix.experimental }}
6870
strategy:
6971
matrix:
70-
jdk: [8, 11]
71-
experimental: [false]
72-
include:
73-
- jdk: 17
74-
experimental: true
72+
jdk: [17, 21, 25]
7573
steps:
76-
- uses: actions/checkout@v3
74+
- uses: actions/checkout@v4
7775
- name: Set up JDK ${{ matrix.jdk }}
7876
uses: actions/setup-java@v4
7977
with:
8078
java-version: ${{ matrix.jdk }}
8179
distribution: 'semeru'
80+
- name: Setup Gradle
81+
uses: gradle/actions/setup-gradle@v4
8282
- name: Build with Gradle
83-
uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
84-
with:
85-
arguments: bootWar -Pjava_version=${{ matrix.jdk }}
86-
83+
run: ./gradlew build -Pjava_version=${{ matrix.jdk }}
84+
8785
build-gradlew:
88-
name: Build Gradle Wrapper
89-
86+
name: Build Gradle wrapper
87+
9088
runs-on: ubuntu-latest
91-
continue-on-error: ${{ matrix.experimental }}
9289
strategy:
9390
matrix:
94-
jdk: [8, 11]
95-
experimental: [false]
96-
include:
97-
- jdk: 17
98-
experimental: true
91+
jdk: [17, 21, 25]
9992
steps:
100-
- uses: actions/checkout@v3
101-
- name: Set up JDK ${{ matrix.jdk }}
102-
uses: actions/setup-java@v3
103-
with:
104-
java-version: ${{ matrix.jdk }}
105-
distribution: "semeru"
106-
cache: maven
107-
- name: Build with Maven
108-
run: ./gradlew bootWar -Pjava_version=${{ matrix.jdk }}
93+
- uses: actions/checkout@v4
94+
- name: Set up JDK ${{ matrix.jdk }}
95+
uses: actions/setup-java@v4
96+
with:
97+
java-version: ${{ matrix.jdk }}
98+
distribution: 'semeru'
99+
- name: Setup Gradle
100+
uses: gradle/actions/setup-gradle@v4
101+
- name: Build with Gradle
102+
run: ./gradlew build -Pjava_version=${{ matrix.jdk }}
109103

110104

.gitignore

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
/.apt_generated/
2-
/.apt_generated_tests/
3-
/.gradle/
4-
/target/
5-
/build/
6-
/bin/
1+
.gradle/
2+
target/
3+
build/
4+
bin/

src/main/webapp/WEB-INF/web.xml renamed to cics-java-liberty-springboot-link-app/src/main/webapp/WEB-INF/web.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd"
4-
version="3.1">
2+
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
5+
version="6.0">
56
<display-name>com.ibm.cicsdev.springboot.link</display-name>
67
<login-config>
78
<auth-method>BASIC</auth-method>

0 commit comments

Comments
 (0)