Skip to content

Commit

Permalink
Merge pull request #978 from OWASP/feature-node-20
Browse files Browse the repository at this point in the history
Feature: update node to version 20 as checkout v4 standard operates with v20
  • Loading branch information
commjoen authored Sep 5, 2023
2 parents 6cde2b8 + 07cb422 commit a046564
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/container_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Maven Action
uses: "s4u/setup-maven-action@v1.9.0"
with:
java-version: 19
java-version: 17
maven-version: 3.8.5
- uses: actions/checkout@v4
- name: Navigate to test script and 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 @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
15 changes: 15 additions & 0 deletions config/fbctf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 9 additions & 8 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 pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit a046564

Please sign in to comment.