Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ on:

jobs:
label_issues:
uses: cap-java/.github/.github/workflows/issue.yml@296573b55e906f5c77a1855bcfe4285cbbc5cac4 # main
uses: cap-java/.github/.github/workflows/issue.yml@9fc20a42d6556aa4cab5fcfe0f58002aa4851103 # main
10 changes: 5 additions & 5 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
- uses: actions/checkout@v6
- name: Set up JDK 21
uses: actions/setup-java@v5
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'

- name: Run Checkstyle
# This command will automatically fail the build if style issues are found
# because of the <failsOnError>true</failsOnError> config in the pom.xml
run: mvn checkstyle:check
run: mvn checkstyle:check
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

- name: Scan With Black Duck
uses: cap-java/.github/actions/scan-with-blackduck@296573b55e906f5c77a1855bcfe4285cbbc5cac4 # main
uses: cap-java/.github/actions/scan-with-blackduck@9fc20a42d6556aa4cab5fcfe0f58002aa4851103 # main
with:
blackduck_token: ${{ secrets.BLACK_DUCK_TOKEN }}
maven-version: ${{ env.MAVEN_VERSION }}
Expand Down Expand Up @@ -50,6 +50,6 @@ jobs:
uses: cap-java/.github/actions/scan-with-codeql@296573b55e906f5c77a1855bcfe4285cbbc5cac4 # main
with:
maven-version: ${{ env.MAVEN_VERSION }}
java-version: '17'
java-version: '21'
language: java-kotlin
queries: security-extended
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

- name: Scan With Black Duck
uses: cap-java/.github/actions/scan-with-blackduck@296573b55e906f5c77a1855bcfe4285cbbc5cac4 # main
uses: cap-java/.github/actions/scan-with-blackduck@9fc20a42d6556aa4cab5fcfe0f58002aa4851103 # main
with:
blackduck_token: ${{ secrets.BLACK_DUCK_TOKEN }}
maven-version: ${{ env.MAVEN_VERSION }}
Expand Down Expand Up @@ -55,9 +55,9 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

- name: Scan With CodeQL
uses: cap-java/.github/actions/scan-with-codeql@296573b55e906f5c77a1855bcfe4285cbbc5cac4 # main
uses: cap-java/.github/actions/scan-with-codeql@9fc20a42d6556aa4cab5fcfe0f58002aa4851103 # main
with:
maven-version: ${{ env.MAVEN_VERSION }}
java-version: '17'
java-version: '21'
language: java-kotlin
queries: security-extended
2 changes: 1 addition & 1 deletion .github/workflows/prevent-issue-labeling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ on:

jobs:
remove_new_label:
uses: cap-java/.github/.github/workflows/prevent-issue-labeling.yml@296573b55e906f5c77a1855bcfe4285cbbc5cac4 # main
uses: cap-java/.github/.github/workflows/prevent-issue-labeling.yml@9fc20a42d6556aa4cab5fcfe0f58002aa4851103 # main
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java-version: [17, 21]
java-version: [21,25]
name: Test (Java ${{ matrix.java-version }})

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Test CAP Projects
uses: ./.github/actions/test
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Change Log

- **Remove existing changelog entries when using this template for a new plugin!**
- All notable changes to this project are documented in this file.
- The format is based on [Keep a Changelog](https://keepachangelog.com/).
- This project adheres to [Semantic Versioning](https://semver.org/).
Expand All @@ -10,6 +11,11 @@

### Changed

- Updated `jdk.version` to 21 and relaxed `requireJavaVersion` enforcer rule to `[21,)` in root and bookshop sample `pom.xml`
- Pinned SAPUI5 to version `1.148.2` in `samples/bookshop/app/index.html`
- Fixed `maven-compiler-plugin` version from non-existent `3.15` to `3.14.0`
- Added `spring-boot-starter-webmvc-test` dependency and updated `@AutoConfigureMockMvc` import to new Spring Boot 4 package in bookshop sample tests

### Fixed

### Removed
### Removed
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# SAP Repository Template
# SAP CAP Java Repository Template

Default templates for SAP open source repositories, including LICENSE, .reuse/dep5, Code of Conduct, etc... All repositories on github.com/SAP will be created based on this template.
This template is a good start for repositories on github.com/cap-java.

## To-Do

In case you are the maintainer of a new SAP open source project, these are the steps to do with the template files:
In case you are the maintainer of a new SAP open source project, these are the steps to do with the license files, contribution guidelines:

- Check if the default license (Apache 2.0) also applies to your project. A license change should only be required in exceptional cases. If this is the case, please change the [license file](LICENSE).
- Enter the correct metadata for the REUSE tool. See our [wiki page](https://wiki.one.int.sap/wiki/display/ospodocs/Using+the+Reuse+Tool+of+FSFE+for+Copyright+and+License+Information) for details how to do it. You can find an initial .reuse/dep5 file to build on. Please replace the parts inside the single angle quotation marks < > by the specific information for your repository and be sure to run the REUSE tool to validate that the metadata is correct.
Expand Down
Loading
Loading