Skip to content

Commit a65ccea

Browse files
author
Dave Wichers
committed
Merge remote-tracking branch 'origin/main' into generalizeScoring
2 parents 4cf692f + 9f9a878 commit a65ccea

File tree

10 files changed

+146
-10
lines changed

10 files changed

+146
-10
lines changed

‎plugin/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>com.google.guava</groupId>
4949
<artifactId>guava</artifactId>
50-
<version>33.4.8-jre</version>
50+
<version>33.5.0-jre</version>
5151
</dependency>
5252

5353
<dependency>
@@ -83,19 +83,19 @@
8383
<dependency>
8484
<groupId>org.apache.commons</groupId>
8585
<artifactId>commons-lang3</artifactId>
86-
<version>3.18.0</version>
86+
<version>3.19.0</version>
8787
</dependency>
8888

8989
<dependency>
9090
<groupId>org.apache.httpcomponents.client5</groupId>
9191
<artifactId>httpclient5</artifactId>
92-
<version>5.5</version>
92+
<version>5.5.1</version>
9393
</dependency>
9494

9595
<dependency>
9696
<groupId>org.apache.httpcomponents.core5</groupId>
9797
<artifactId>httpcore5</artifactId>
98-
<version>5.3.5</version>
98+
<version>5.3.6</version>
9999
</dependency>
100100

101101
<dependency>

‎plugin/src/main/java/org/owasp/benchmarkutils/score/parsers/ScnrReader.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/**
2+
* OWASP Benchmark Project
3+
*
4+
* <p>This file is part of the Open Web Application Security Project (OWASP) Benchmark Project For
5+
* details, please see <a
6+
* href="https://owasp.org/www-project-benchmark/">https://owasp.org/www-project-benchmark/</a>.
7+
*
8+
* <p>The OWASP Benchmark is free software: you can redistribute it and/or modify it under the terms
9+
* of the GNU General Public License as published by the Free Software Foundation, version 2.
10+
*
11+
* <p>The OWASP Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY
12+
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
13+
* PURPOSE. See the GNU General Public License for more details
14+
*
15+
* @author Sascha Knoop
16+
* @created 2024
17+
*/
118
package org.owasp.benchmarkutils.score.parsers;
219

320
import static java.lang.Integer.parseInt;

‎plugin/src/main/java/org/owasp/benchmarkutils/tools/Logger.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/**
2+
* OWASP Benchmark Project
3+
*
4+
* <p>This file is part of the Open Web Application Security Project (OWASP) Benchmark Project For
5+
* details, please see <a
6+
* href="https://owasp.org/www-project-benchmark/">https://owasp.org/www-project-benchmark/</a>.
7+
*
8+
* <p>The OWASP Benchmark is free software: you can redistribute it and/or modify it under the terms
9+
* of the GNU General Public License as published by the Free Software Foundation, version 2.
10+
*
11+
* <p>The OWASP Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY
12+
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
13+
* PURPOSE. See the GNU General Public License for more details
14+
*
15+
* @author Dave Wichers
16+
* @created 2021
17+
*/
118
package org.owasp.benchmarkutils.tools;
219

320
public interface Logger {

‎plugin/src/main/java/org/owasp/benchmarkutils/tools/LoggerConfigurationException.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/**
2+
* OWASP Benchmark Project
3+
*
4+
* <p>This file is part of the Open Web Application Security Project (OWASP) Benchmark Project For
5+
* details, please see <a
6+
* href="https://owasp.org/www-project-benchmark/">https://owasp.org/www-project-benchmark/</a>.
7+
*
8+
* <p>The OWASP Benchmark is free software: you can redistribute it and/or modify it under the terms
9+
* of the GNU General Public License as published by the Free Software Foundation, version 2.
10+
*
11+
* <p>The OWASP Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY
12+
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
13+
* PURPOSE. See the GNU General Public License for more details
14+
*
15+
* @author Dave Wichers
16+
* @created 2021
17+
*/
118
package org.owasp.benchmarkutils.tools;
219

320
public class LoggerConfigurationException extends Exception {

‎plugin/src/test/java/org/owasp/benchmarkutils/score/builder/ToolResultsBuilder.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/**
2+
* OWASP Benchmark Project
3+
*
4+
* <p>This file is part of the Open Web Application Security Project (OWASP) Benchmark Project For
5+
* details, please see <a
6+
* href="https://owasp.org/www-project-benchmark/">https://owasp.org/www-project-benchmark/</a>.
7+
*
8+
* <p>The OWASP Benchmark is free software: you can redistribute it and/or modify it under the terms
9+
* of the GNU General Public License as published by the Free Software Foundation, version 2.
10+
*
11+
* <p>The OWASP Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY
12+
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
13+
* PURPOSE. See the GNU General Public License for more details
14+
*
15+
* @author Sascha Knoop
16+
* @created 2024
17+
*/
118
package org.owasp.benchmarkutils.score.builder;
219

320
import java.util.HashSet;

‎plugin/src/test/java/org/owasp/benchmarkutils/score/parsers/ReaderTest.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/**
2+
* OWASP Benchmark Project
3+
*
4+
* <p>This file is part of the Open Web Application Security Project (OWASP) Benchmark Project For
5+
* details, please see <a
6+
* href="https://owasp.org/www-project-benchmark/">https://owasp.org/www-project-benchmark/</a>.
7+
*
8+
* <p>The OWASP Benchmark is free software: you can redistribute it and/or modify it under the terms
9+
* of the GNU General Public License as published by the Free Software Foundation, version 2.
10+
*
11+
* <p>The OWASP Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY
12+
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
13+
* PURPOSE. See the GNU General Public License for more details
14+
*
15+
* @author Sascha Knoop
16+
* @created 2022
17+
*/
118
package org.owasp.benchmarkutils.score.parsers;
219

320
import static org.junit.jupiter.api.Assertions.assertEquals;

‎plugin/src/test/java/org/owasp/benchmarkutils/score/parsers/ReaderTestBase.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/**
2+
* OWASP Benchmark Project
3+
*
4+
* <p>This file is part of the Open Web Application Security Project (OWASP) Benchmark Project For
5+
* details, please see <a
6+
* href="https://owasp.org/www-project-benchmark/">https://owasp.org/www-project-benchmark/</a>.
7+
*
8+
* <p>The OWASP Benchmark is free software: you can redistribute it and/or modify it under the terms
9+
* of the GNU General Public License as published by the Free Software Foundation, version 2.
10+
*
11+
* <p>The OWASP Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY
12+
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
13+
* PURPOSE. See the GNU General Public License for more details
14+
*
15+
* @author Sascha Knoop
16+
* @created 2022
17+
*/
118
package org.owasp.benchmarkutils.score.parsers;
219

320
import static java.util.Collections.singletonList;

‎plugin/src/test/java/org/owasp/benchmarkutils/score/parsers/ScnrReaderTest.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/**
2+
* OWASP Benchmark Project
3+
*
4+
* <p>This file is part of the Open Web Application Security Project (OWASP) Benchmark Project For
5+
* details, please see <a
6+
* href="https://owasp.org/www-project-benchmark/">https://owasp.org/www-project-benchmark/</a>.
7+
*
8+
* <p>The OWASP Benchmark is free software: you can redistribute it and/or modify it under the terms
9+
* of the GNU General Public License as published by the Free Software Foundation, version 2.
10+
*
11+
* <p>The OWASP Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY
12+
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
13+
* PURPOSE. See the GNU General Public License for more details
14+
*
15+
* @author Sascha Knoop
16+
* @created 2024
17+
*/
118
package org.owasp.benchmarkutils.score.parsers;
219

320
import static org.junit.jupiter.api.Assertions.assertEquals;

‎plugin/src/test/java/org/owasp/benchmarkutils/score/parsers/VeracodeReaderTest.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/**
2+
* OWASP Benchmark Project
3+
*
4+
* <p>This file is part of the Open Web Application Security Project (OWASP) Benchmark Project For
5+
* details, please see <a
6+
* href="https://owasp.org/www-project-benchmark/">https://owasp.org/www-project-benchmark/</a>.
7+
*
8+
* <p>The OWASP Benchmark is free software: you can redistribute it and/or modify it under the terms
9+
* of the GNU General Public License as published by the Free Software Foundation, version 2.
10+
*
11+
* <p>The OWASP Benchmark is distributed in the hope that it will be useful, but WITHOUT ANY
12+
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
13+
* PURPOSE. See the GNU General Public License for more details
14+
*
15+
* @author Barath Raj
16+
* @created 2023
17+
*/
118
package org.owasp.benchmarkutils.score.parsers;
219

320
import static org.junit.jupiter.api.Assertions.assertEquals;

‎pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<plugin>
4949
<groupId>org.apache.maven.plugins</groupId>
5050
<artifactId>maven-dependency-plugin</artifactId>
51-
<version>3.8.1</version>
51+
<version>3.9.0</version>
5252
</plugin>
5353
<plugin>
5454
<groupId>org.apache.maven.plugins</groupId>
@@ -99,7 +99,7 @@
9999
<plugin>
100100
<groupId>org.apache.maven.plugins</groupId>
101101
<artifactId>maven-compiler-plugin</artifactId>
102-
<version>3.14.0</version>
102+
<version>3.14.1</version>
103103
<configuration>
104104
<fork>true</fork>
105105
<meminitial>1000m</meminitial>
@@ -117,12 +117,12 @@
117117
<plugin>
118118
<groupId>org.apache.maven.plugins</groupId>
119119
<artifactId>maven-enforcer-plugin</artifactId>
120-
<version>3.6.1</version>
120+
<version>3.6.2</version>
121121
<dependencies>
122122
<dependency>
123123
<groupId>org.codehaus.mojo</groupId>
124124
<artifactId>extra-enforcer-rules</artifactId>
125-
<version>1.10.0</version>
125+
<version>1.11.0</version>
126126
</dependency>
127127
</dependencies>
128128
<executions>
@@ -206,13 +206,13 @@
206206
<plugin>
207207
<groupId>org.apache.maven.plugins</groupId>
208208
<artifactId>maven-surefire-plugin</artifactId>
209-
<version>3.5.3</version>
209+
<version>3.5.4</version>
210210
</plugin>
211211

212212
<plugin>
213213
<groupId>org.codehaus.mojo</groupId>
214214
<artifactId>versions-maven-plugin</artifactId>
215-
<version>2.18.0</version>
215+
<version>2.19.1</version>
216216
</plugin>
217217

218218
<plugin>

0 commit comments

Comments
 (0)