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
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ jobs:
#- run: |
# make bootstrap
# make release
- name: Set up JDK 25
- name: Set up JDK 26
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
- name: run mvn clean package
run: ./mvnw clean package -Ddependency-check.skip=true -Dmaven.test.skip=true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/container_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- uses: actions/checkout@v5
- name: Set up JDK 25
- name: Set up JDK 26
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
cache: "maven"
- name: Navigate to test script and run
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dast-zap-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- name: Set up JDK 25
- name: Set up JDK 26
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
- name: Clean install
run: ./mvnw --no-transfer-progress clean install -DskipTests -Ddependency-check.skip -Dcyclonedx.skip=true -Dexec.skip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/desktop-container-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v5

- name: Set up JDK 25
- name: Set up JDK 26
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
cache: "maven"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/github-pages-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v5

- name: Set up JDK 25
- name: Set up JDK 26
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
cache: "maven"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/java_swagger_doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- name: Set up JDK 25
- name: Set up JDK 26
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
- name: Clean install
run: ./mvnw --no-transfer-progress clean install -DskipTests -Ddependency-check.skip -Dcyclonedx.skip=true -Dexec.skip
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- name: Set up JDK 25
- name: Set up JDK 26
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
cache: "maven"
- name: checkstyle with Maven
Expand All @@ -39,10 +39,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- name: Set up JDK 25
- name: Set up JDK 26
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
cache: "maven"
- name: spotbugs with Maven
Expand All @@ -55,10 +55,10 @@ jobs:
contents: read
steps:
- uses: actions/checkout@v5
- name: Set up JDK 25
- name: Set up JDK 26
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
cache: "maven"
- name: Test with Maven
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/master-container-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v5

- name: Set up JDK 25
- name: Set up JDK 26
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
cache: "maven"

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pr-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v5

- name: Set up JDK 25
- name: Set up JDK 26
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
cache: "maven"

Expand Down Expand Up @@ -245,10 +245,10 @@ jobs:
ref: master
path: main-code

- name: Set up JDK 25 for PR build
- name: Set up JDK 26 for PR build
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
cache: "maven"

Expand All @@ -274,10 +274,10 @@ jobs:
docker build --build-arg argBasedVersion="${{ steps.extract-pr-version.outputs.docker_version }}" -t wrongsecrets-pr .
echo "PR Docker image built successfully"

- name: Set up JDK 25 for main
- name: Set up JDK 26 for main
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
cache: "maven"

Expand Down Expand Up @@ -335,7 +335,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'

- name: Install Playwright
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
uses: psf/black@stable
- uses: actions/setup-node@v6
with:
node-version: 24
node-version: 26
cache: "npm"
- uses: actions/setup-java@v5
with:
distribution: "temurin"
java-version: "25"
java-version: "26"
- name: Install npm dependencies
run: npm install
- uses: actions/cache@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/version-sync-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v5

- name: Set up JDK 25
- name: Set up JDK 26
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
cache: "maven"

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/visual-diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
ref: master
path: main-code

- name: Set up JDK 25 for PR build
- name: Set up JDK 26 for PR build
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
cache: "maven"

Expand All @@ -49,10 +49,10 @@ jobs:
docker build --build-arg argBasedVersion="${{ steps.extract-pr-version.outputs.docker_version }}" -t wrongsecrets-pr .
echo "PR Docker image built successfully"

- name: Set up JDK 25 for main build
- name: Set up JDK 26 for main build
uses: actions/setup-java@v5
with:
java-version: "25"
java-version: "26"
distribution: "temurin"
cache: "maven"

Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v6
with:
node-version: '24'
node-version: '26'

- name: Install Playwright
run: |
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,9 @@ Select **_google-java-format Settings_** and click enable.

Open **_File > Project structure _**.

In the tab `Project` make sure that an SDK of version `25` is selected (e.g. `openjdk-25`, `oraclejdk-25` or just `25` depending on which Java JDK variant you installed).
In the tab `Project` make sure that an SDK of version `26` is selected (e.g. `openjdk-26`, `oraclejdk-26` or just `26` depending on which Java JDK variant you installed).

In the tab `SDKs` make sure that an SDK of version `25` is selected.
In the tab `SDKs` make sure that an SDK of version `26` is selected.


### Step 6: Reload the project
Expand Down Expand Up @@ -461,7 +461,7 @@ refer this block for reasons:
With this challenge, we basically aim to help new contributors to better understand the code and encourage them to add new challenges for our end-user.
```

Use this block as refrence for hints:
Use this block as reference for hints:

```adoc
Your secret is `Hello World`
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM bellsoft/liberica-openjre-debian:25-cds AS builder
FROM bellsoft/liberica-openjre-debian:26-cds AS builder
WORKDIR /builder

ARG argBasedVersion="1.13.5"

COPY --chown=wrongsecrets target/wrongsecrets-${argBasedVersion}-SNAPSHOT.jar application.jar
RUN java -Djarmode=tools -jar application.jar extract --layers --destination extracted

FROM eclipse-temurin:25.0.2_10-jre-alpine
FROM eclipse-temurin:26-jre-alpine
WORKDIR /application

ARG argBasedPassword="default"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ If you want to run WrongSecrets but without certain challenges you don't want to
*_NOTE_* Please note that we do not deliver any support to your fork when you follow the process below. Please understand that license and copyright of the original application remain intact for your Fork.

Requirements:
- Have the JDK of Java 25 installed;
- Have the JDK of Java 26 installed;
- Have an account at a registry to which you can push your variant of the WrongSecrets container;

Here are the steps you have to follow to create your own release of WrongSecrets with certain challenges disabled:
Expand Down
2 changes: 1 addition & 1 deletion docs/ARCHITECTURE_OVERVIEW.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ src/test/java/org/owasp/wrongsecrets/

### Prerequisites

- Java 25
- Java 26
- Maven 3.9+
- Docker
- Node.js (for frontend dependencies)
Expand Down
6 changes: 3 additions & 3 deletions docs/DEVELOPMENT_PATTERNS.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,13 +211,13 @@ jobs:
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: '21'
java-version: '26'
distribution: 'temurin'

- name: Cache Maven dependencies
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
2 changes: 1 addition & 1 deletion js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Examples with how to not use secrets",
"main": "index.js",
"engines": {
"node": ">=20.0.0"
"node": ">=26.0.0"
},
"scripts": {
"build": "./node_modules/.bin/javascript-obfuscator index.js --output ../target/classes/static/js/index.js"
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"engines": {
"node": ">=22.0.0"
"node": ">=26.0.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.25.9",
Expand Down
13 changes: 10 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,16 @@
<google.cloud.libraries-bom.version>26.86.0</google.cloud.libraries-bom.version>
<!-- Pin Groovy to 4.x for thymeleaf-layout-dialect compatibility (Spring Boot 4.0 manages 5.x) -->
<groovy.version>4.0.25</groovy.version>
<java.version>25</java.version>
<java.version>26</java.version>
<jquery.version>3.7.1</jquery.version>
<jruby.version>10.0.5.0</jruby.version>
<lombok.version>1.18.46</lombok.version>
<maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.5.6</maven-surefire-plugin.version>
<maven.compiler.proc>full</maven.compiler.proc>
<maven.compiler.target>25</maven.compiler.target>
<node.version>v24.14.0</node.version>
<maven.compiler.source>26</maven.compiler.source>
<maven.compiler.target>26</maven.compiler.target>
<node.version>v26.0.0</node.version>
<npm.version>11.8.0</npm.version>
<spotbugs-maven.version>4.10.3.0</spotbugs-maven.version>
<spotbugs.version>4.9.8</spotbugs.version>
Expand Down Expand Up @@ -298,6 +299,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.vaadin.external.google</groupId>
<artifactId>android-json</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
Loading
Loading