Skip to content

Commit 1741463

Browse files
author
Dave Wichers
committed
Merge remote-tracking branch 'origin/main' into feature/command-line-tests
2 parents 4f72c30 + 8241904 commit 1741463

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

.github/workflows/maven.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
- uses: actions/checkout@v6
1212
with:
1313
fetch-depth: 0
14-
- name: Set up JDK 11
14+
- name: Set up JDK 17
1515
uses: actions/setup-java@v5
1616
with:
17-
java-version: '11'
18-
distribution: 'adopt'
17+
java-version: '17'
18+
distribution: 'zulu'
1919
cache: maven
20-
- name: Build, test, and Install shared library
20+
- name: Build, test, and install shared library
2121
run: mvn install
2222

plugin/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.fasterxml.jackson.core</groupId>
3131
<artifactId>jackson-annotations</artifactId>
32-
<version>2.20</version>
32+
<version>2.21</version>
3333
</dependency>
3434

3535
<dependency>
@@ -103,7 +103,7 @@
103103
<dependency>
104104
<groupId>org.apache.httpcomponents.client5</groupId>
105105
<artifactId>httpclient5</artifactId>
106-
<version>5.5.1</version>
106+
<version>5.6</version>
107107
</dependency>
108108

109109
<dependency>
@@ -115,7 +115,7 @@
115115
<dependency>
116116
<groupId>org.apache.maven</groupId>
117117
<artifactId>maven-plugin-api</artifactId>
118-
<version>3.9.11</version>
118+
<version>3.9.12</version>
119119
<scope>provided</scope>
120120
</dependency>
121121

@@ -140,7 +140,7 @@
140140
<dependency>
141141
<groupId>org.json</groupId>
142142
<artifactId>json</artifactId>
143-
<version>20250517</version>
143+
<version>20251224</version>
144144
</dependency>
145145

146146
<dependency>
@@ -193,7 +193,7 @@
193193
</build>
194194

195195
<properties>
196-
<version.fasterxml.jackson>2.20.1</version.fasterxml.jackson>
196+
<version.fasterxml.jackson>2.21.0</version.fasterxml.jackson>
197197
<!-- 3.0.3+ version of eclipse.persistence requires jakarta.xml.bind instead of jaxb -->
198198
<version.eclipse.persistence>2.7.15</version.eclipse.persistence>
199199
<version.junit.jupiter>5.13.4</version.junit.jupiter>

plugin/src/main/java/org/owasp/benchmarkutils/tools/RegressionTesting.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,11 +400,13 @@ public static void verifyTestCase(TestCaseVerificationResults result)
400400
// Count this as "declared unverifiable" and return
401401
result.setUnverifiable(true);
402402
result.setDeclaredUnverifiable(true);
403+
uLogger.print("UNVERIFIABLE (declared): ");
404+
printTestCaseDetailsAsText(result, uLogger);
403405
} else if (testCase.getAttackSuccessString() == null) {
404406
// Count this as "undeclared unverifiable" and return
405407
result.setUnverifiable(true);
406408
result.setDeclaredUnverifiable(false);
407-
uLogger.print("UNVERIFIABLE: ");
409+
uLogger.print("UNVERIFIABLE (undeclared): ");
408410
printTestCaseDetailsAsText(result, uLogger);
409411
}
410412

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<plugin>
158158
<groupId>org.apache.maven.plugins</groupId>
159159
<artifactId>maven-compiler-plugin</artifactId>
160-
<version>3.14.1</version>
160+
<version>3.15.0</version>
161161
<configuration>
162162
<fork>true</fork>
163163
<meminitial>1000m</meminitial>
@@ -270,13 +270,13 @@
270270
<plugin>
271271
<groupId>org.codehaus.mojo</groupId>
272272
<artifactId>versions-maven-plugin</artifactId>
273-
<version>2.20.1</version>
273+
<version>2.21.0</version>
274274
</plugin>
275275

276276
<plugin>
277277
<groupId>com.diffplug.spotless</groupId>
278278
<artifactId>spotless-maven-plugin</artifactId>
279-
<version>2.46.1</version>
279+
<version>3.2.1</version>
280280
<configuration>
281281
<!-- optional: limit format enforcement to just the files changed by this
282282
feature branch -->

0 commit comments

Comments
 (0)