Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
contents: write
pull-requests: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
fetch-depth: 0
- id: copyright-action
Expand All @@ -38,9 +38,9 @@ jobs:
matrix:
jdk: [17, 21, 25]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v4
uses: actions/setup-java@v6
with:
java-version: ${{ matrix.jdk }}
distribution: "semeru"
Expand All @@ -56,9 +56,9 @@ jobs:
matrix:
jdk: [17, 21, 25]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v4
uses: actions/setup-java@v6
with:
java-version: ${{ matrix.jdk }}
distribution: "semeru"
Expand All @@ -73,17 +73,17 @@ jobs:
matrix:
jdk: [17, 21, 25]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v4
uses: actions/setup-java@v6
with:
java-version: ${{ matrix.jdk }}
distribution: 'semeru'
- name: Setup Gradle
# Use setup-gradle to install a specific Gradle version for direct 'gradle' command use
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v6
with:
gradle-version: 8.14.4
gradle-version: 8.14.7
- name: Build with Gradle
run: gradle clean build -Pjava_version=${{ matrix.jdk }}

Expand All @@ -95,9 +95,9 @@ jobs:
matrix:
jdk: [17, 21, 25]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v4
uses: actions/setup-java@v6
with:
java-version: ${{ matrix.jdk }}
distribution: 'semeru'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@ jobs:
name: Analyze (java)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v6
with:
java-version: '17'
distribution: 'semeru'
cache: maven

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@v4
with:
languages: java

- name: Build with Maven
run: mvn --batch-mode --update-snapshots --file pom.xml verify

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@v4
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Gradle
.gradle/
**/build/
!gradle/wrapper/gradle-wrapper.jar

# Maven
target/
Expand Down Expand Up @@ -60,3 +59,6 @@ Desktop.ini
*.zip
*.tar.gz
*.rar

# Gradle wrapper - must come after *.jar (git applies the last matching rule)
!gradle/wrapper/gradle-wrapper.jar
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// ============================================================================
plugins
{
id 'com.ibm.cics.bundle' version '1.0.8'
id 'com.ibm.cics.bundle' version '1.0.13'
}

// ============================================================================
Expand Down
2 changes: 1 addition & 1 deletion cics-java-liberty-springboot-link-cicsbundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<plugin>
<groupId>com.ibm.cics</groupId>
<artifactId>cics-bundle-maven-plugin</artifactId>
<version>1.0.8</version>
<version>2.0.5</version>
<extensions>true</extensions>
<configuration>
<defaultjvmserver>${cics.jvmserver}</defaultjvmserver>
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ org.gradle.parallel=true
org.gradle.java.installations.auto-detect=true
org.gradle.java.installations.auto-download=true

# Configuration cache disabled due to CICS Bundle Plugin 1.0.8 incompatibility
# Configuration cache disabled due to CICS Bundle Plugin incompatibility
# org.gradle.configuration-cache=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
41 changes: 26 additions & 15 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 15 additions & 12 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading