Merge pull request #978 from OWASP/feature-node-20

Feature: update node to version 20 as checkout v4 standard operates with v20

.github/workflows/container_test.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup Maven Action
         uses: "s4u/[email protected]"
         with:
-          java-version: 19
+          java-version: 17
           maven-version: 3.8.5
       - uses: actions/checkout@v4
       - name: Navigate to test script and run

.github/workflows/pre-commit.yml

@@ -25,12 +25,12 @@ jobs:
           python-version: "3.9"
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
           cache: "npm"
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '19'
+          java-version: '17'
       - name: Install npm dependencies
         run: npm install
       - uses: actions/cache@v3

README.md

@@ -413,11 +413,11 @@ You can use the OWASP Dependency-checker by calling `mvn dependency-check:aggreg
 
 ### Get the project started in IntelliJ IDEA
 
-Requirements: make sure you have the following tools installed: [Docker](https://www.docker.com/products/docker-desktop/), [Java19 JDK](https://jdk.java.net/19/), [NodeJS 18](https://nodejs.org/dist/v18.12.1/node-v18.12.1-x86.msi) and [IntelliJ IDEA](https://www.jetbrains.com/idea/download).
+Requirements: make sure you have the following tools installed: [Docker](https://www.docker.com/products/docker-desktop/), [Java17 JDK](https://jdk.java.net/17/), [NodeJS 20](https://nodejs.org/en/download/current) and [IntelliJ IDEA](https://www.jetbrains.com/idea/download).
 
 1. Fork and clone the project as described in the [documentation](https://github.com/OWASP/wrongsecrets/blob/master/CONTRIBUTING.md).
 2. Import the project in IntelliJ (e.g. import as mvn project / local sources)
-3. Go to the project settings and make sure it uses Java19 (And that the JDK can be found)
+3. Go to the project settings and make sure it uses Java17 (And that the JDK can be found)
 4. Go to the IDE settings>Language & Frameworks > Lombok and make sure Lombok processing is enabled
 5. Open the Maven Tab in your IDEA and run "Reload All Maven Projects" to make the system sync and download everything. Next, in that same tab use the "install" option as part of the OWASP WrongSecrets Lifecycle to genereate the asciidoc and such.
 6. Now run the `main` method in `org.owasp.wrongsecrets.WrongSecretsApplication.java`. This should fail with a stack trace.

config/fbctf.yml

@@ -92,3 +92,18 @@ ctf:
     challenge30:
       name: Panama
       code: PA
+    challenge31:
+      name: Netherlands
+      code: NL
+    challenge32:
+      name: Germany
+      code: DE
+    challenge33:
+      name: Israel
+      code: IL
+    challenge34:
+      name: Brazil
+      code: BR
+    challenge35:
+      name: Japan
+      code: JP

pom.xml

@@ -431,7 +431,7 @@
             </goals>
             <phase>generate-resources</phase>
             <configuration>
-              <nodeVersion>v18.16.0</nodeVersion>
+              <nodeVersion>v20.6.0</nodeVersion>
               <!-- download node from https://nodejs.org/dist/ -->
               <workingDirectory>js</workingDirectory>
             </configuration>