Skip to content

Commit 27a0b62

Browse files
davewichersdavewichers
committed
Merge remote-tracking branch 'origin/main' into feature/command-line-tests
2 parents 90e3b60 + 9f9a878 commit 27a0b62

File tree

8 files changed

+115
-13
lines changed

8 files changed

+115
-13
lines changed

‎plugin/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>com.google.guava</groupId>
5555
<artifactId>guava</artifactId>
56-
<version>33.4.8-jre</version>
56+
<version>33.5.0-jre</version>
5757
</dependency>
5858

5959
<!-- The following dependency might be an upgrade/replacement for jaxb.xml.bind.JAXBContext,
@@ -97,19 +97,19 @@
9797
<dependency>
9898
<groupId>org.apache.commons</groupId>
9999
<artifactId>commons-lang3</artifactId>
100-
<version>3.18.0</version>
100+
<version>3.19.0</version>
101101
</dependency>
102102

103103
<dependency>
104104
<groupId>org.apache.httpcomponents.client5</groupId>
105105
<artifactId>httpclient5</artifactId>
106-
<version>5.5</version>
106+
<version>5.5.1</version>
107107
</dependency>
108108

109109
<dependency>
110110
<groupId>org.apache.httpcomponents.core5</groupId>
111111
<artifactId>httpcore5</artifactId>
112-
<version>5.3.5</version>
112+
<version>5.3.6</version>
113113
</dependency>
114114

115115
<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/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: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,29 @@
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

20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertTrue;
22+
323
import org.junit.jupiter.api.BeforeEach;
424
import org.junit.jupiter.api.Test;
525
import org.owasp.benchmarkutils.score.*;
626

7-
import static org.junit.jupiter.api.Assertions.assertEquals;
8-
import static org.junit.jupiter.api.Assertions.assertTrue;
9-
1027
class VeracodeReaderTest extends ReaderTestBase {
1128

1229
private ResultFile resultFile;

‎pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<plugin>
107107
<groupId>org.apache.maven.plugins</groupId>
108108
<artifactId>maven-dependency-plugin</artifactId>
109-
<version>3.8.1</version>
109+
<version>3.9.0</version>
110110
</plugin>
111111
<plugin>
112112
<groupId>org.apache.maven.plugins</groupId>
@@ -157,7 +157,7 @@
157157
<plugin>
158158
<groupId>org.apache.maven.plugins</groupId>
159159
<artifactId>maven-compiler-plugin</artifactId>
160-
<version>3.14.0</version>
160+
<version>3.14.1</version>
161161
<configuration>
162162
<fork>true</fork>
163163
<meminitial>1000m</meminitial>
@@ -175,12 +175,12 @@
175175
<plugin>
176176
<groupId>org.apache.maven.plugins</groupId>
177177
<artifactId>maven-enforcer-plugin</artifactId>
178-
<version>3.6.1</version>
178+
<version>3.6.2</version>
179179
<dependencies>
180180
<dependency>
181181
<groupId>org.codehaus.mojo</groupId>
182182
<artifactId>extra-enforcer-rules</artifactId>
183-
<version>1.10.0</version>
183+
<version>1.11.0</version>
184184
</dependency>
185185
</dependencies>
186186
<executions>
@@ -264,13 +264,13 @@
264264
<plugin>
265265
<groupId>org.apache.maven.plugins</groupId>
266266
<artifactId>maven-surefire-plugin</artifactId>
267-
<version>3.5.3</version>
267+
<version>3.5.4</version>
268268
</plugin>
269269

270270
<plugin>
271271
<groupId>org.codehaus.mojo</groupId>
272272
<artifactId>versions-maven-plugin</artifactId>
273-
<version>2.18.0</version>
273+
<version>2.19.1</version>
274274
</plugin>
275275

276276
<plugin>

0 commit comments

Comments
 (0)