Skip to content

Commit 9ce19b3

Browse files
authored
Merge pull request #2649 from SatyamPandey-07/bugfix/sync-maven-compiler-java-version
fix: align maven compiler plugin configuration and docs with Java 26
2 parents 3ba4692 + 87a8546 commit 9ce19b3

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ Pull requests should be as small/atomic as possible. Large, wide-sweeping change
189189
5. Choose what to work on, based on any of the outstanding [issues](https://github.com/OWASP/wrongsecrets/issues "WrongSecrets Issues").
190190
6. Create a branch so that you can cleanly work on the chosen issue: `git checkout -b fix/Issue66`
191191
7. Open your favorite editor and start making modifications. We recommend using the [IntelliJ Idea](https://www.jetbrains.com/idea/).
192-
8. Install [pre-commit](https://pre-commit.com/#install) the dependencies for our pre-commit configuration to make sure your code complies with standards used in the project. This requires terraform, [terraform-docs](https://github.com/terraform-docs/terraform-docs#installation), [tflint](https://github.com/terraform-linters/tflint#installation), and [commitlint](https://commitlint.js.org/#/guides-local-setup). For commitlint, you need [NodeJS 24](https://nodejs.org/en/download/) installed, after which you you can use `npm install` in the root folder of this project.
192+
8. Install [pre-commit](https://pre-commit.com/#install) the dependencies for our pre-commit configuration to make sure your code complies with standards used in the project. This requires terraform, [terraform-docs](https://github.com/terraform-docs/terraform-docs#installation), [tflint](https://github.com/terraform-linters/tflint#installation), and [commitlint](https://commitlint.js.org/#/guides-local-setup). For commitlint, you need [NodeJS 26](https://nodejs.org/en/download/) installed, after which you you can use `npm install` in the root folder of this project.
193193
9. Install the pre-commit hook using `pre-commit install --hook-type commit-msg`. We recommend to run `pre-commit run -a` every so often if you're working on a bigger change.
194194
10. After your modifications are done, push them to your forked repository. This can be done by executing the command `git add MYFILE` for every file you have modified, followed by `git commit -m 'your commit message here'` to commit the modifications and `git push` to push your modifications to GitHub.
195195
11. Create a Pull Request (PR) by going to your fork, <https://github.com/Your_Github_Handle/wrongsecrets> and click on the "New Pull Request" button. The target branch should typically be the Master branch. When submitting a PR, be sure to follow the checklist that is provided in the PR template. The checklist itself will be filled out by the reviewer.
@@ -230,11 +230,11 @@ Please be sure to take a careful look at our [Code of Conduct](https://github.co
230230
1. **Docker**
231231
[_Docker_](https://www.docker.com/) is a software platform that allows you to build, test, and deploy applications quickly and in a more efficient manner.
232232
233-
2. **Node.Js 24**
233+
2. **Node.Js 26**
234234
[_Node.Js_](https://nodejs.org/en/) is an open-source library and a cross-platform JavaScript **runtime environment** specifically for running web applications outside one's browser.
235235

236-
3. **JDK-25**
237-
[_JDK_](https://www.oracle.com/java/technologies/downloads/#java25) is a tool used in development and testing programs written in the Java programming language.
236+
3. **JDK-26**
237+
[_JDK_](https://www.oracle.com/java/technologies/downloads/#java26) is a tool used in development and testing programs written in the Java programming language.
238238

239239
4. **IntelliJ IDEA**
240240
[_IntelliJ IDEA_](https://www.jetbrains.com/idea/download) is an integrated development environment basically an **IDE** written in Java for developing software written in Java, Kotlin, Groovy etc.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -660,11 +660,11 @@ See [Dependency-Check Maven Plugin Documentation](https://jeremylong.github.io/D
660660

661661
### Get the project started in IntelliJ IDEA
662662

663-
Requirements: make sure you have the following tools installed: [Docker](https://www.docker.com/products/docker-desktop/), [Java25 JDK](https://jdk.java.net/25/), [NodeJS 24](https://nodejs.org/en/download/current) and [IntelliJ IDEA](https://www.jetbrains.com/idea/download).
663+
Requirements: make sure you have the following tools installed: [Docker](https://www.docker.com/products/docker-desktop/), [Java26 JDK](https://jdk.java.net/26/), [NodeJS 26](https://nodejs.org/en/download/current) and [IntelliJ IDEA](https://www.jetbrains.com/idea/download).
664664

665665
1. Fork and clone the project as described in the [documentation](https://github.com/OWASP/wrongsecrets/blob/master/CONTRIBUTING.md).
666666
2. Import the project in IntelliJ (e.g. import as mvn project / local sources)
667-
3. Go to the project settings and make sure it uses Java25 (And that the JDK can be found)
667+
3. Go to the project settings and make sure it uses Java26 (And that the JDK can be found)
668668
4. Go to the IDE settings>Language & Frameworks > Lombok and make sure Lombok processing is enabled
669669
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.
670670
6. Now run the `main` method in `org.owasp.wrongsecrets.WrongSecretsApplication.java`. This should fail with a stack trace.

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
<maven.compiler.proc>full</maven.compiler.proc>
7575
<maven.compiler.source>26</maven.compiler.source>
7676
<maven.compiler.target>26</maven.compiler.target>
77-
<node.version>v26.0.0</node.version>
78-
<npm.version>11.8.0</npm.version>
77+
<node.version>v26.8.1</node.version>
78+
<npm.version>11.19.0</npm.version>
7979
<spotbugs-maven.version>4.10.4.0</spotbugs-maven.version>
8080
<spotbugs.version>4.10.4</spotbugs.version>
8181
<spotless-maven-plugin.version>3.10.1</spotless-maven-plugin.version>
@@ -597,8 +597,8 @@
597597
<artifactId>maven-compiler-plugin</artifactId>
598598
<version>${maven-compiler-plugin.version}</version>
599599
<configuration>
600-
<source>25</source>
601-
<target>25</target>
600+
<source>${maven.compiler.source}</source>
601+
<target>${maven.compiler.target}</target>
602602
<compilerArgs>
603603
<arg>-Xlint:deprecation</arg>
604604
</compilerArgs>

0 commit comments

Comments
 (0)