Skip to content

Commit 95df346

Browse files
author
Dave Wichers
committed
Merge branch 'main' into feature/command-line-tests and resolve merge
conflicts.
2 parents 84968a5 + 23439aa commit 95df346

File tree

105 files changed

+8135
-2838
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+8135
-2838
lines changed

‎.github/dependabot.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Please see the documentation for all configuration options:
2+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
3+
4+
version: 2
5+
updates:
6+
- package-ecosystem: "github-actions"
7+
directory: "/"
8+
schedule:
9+
interval: "daily"
10+
- package-ecosystem: "maven"
11+
directory: "/"
12+
schedule:
13+
interval: "daily"
14+
open-pull-requests-limit: 10
15+
labels:
16+
- dependencies

‎.github/workflows/maven.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ jobs:
1717
java-version: '11'
1818
distribution: 'adopt'
1919
cache: maven
20-
- name: Build and Install shared library
20+
- name: Build, test, and Install shared library
2121
run: mvn install
22-
- name: Run Spotless check
23-
run: mvn spotless:check
24-
- name: Run unit tests
25-
run: mvn test
22+

‎.mvn/jvm.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
2+
--add-opens java.base/java.lang=ALL-UNNAMED
3+

‎library/src/main/java/org/owasp/benchmarkutils/helpers/Categories.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,20 @@ public class Categories {
4646

4747
private static Categories _instance; // The Singleton instance of this class
4848

49+
// Statically load the categories definitions from the config file to instantiate the Category
50+
// singleton
51+
static {
52+
try {
53+
InputStream categoriesFileStream =
54+
Categories.class.getClassLoader().getResourceAsStream(Categories.FILENAME);
55+
new Categories(categoriesFileStream);
56+
} catch (ParserConfigurationException | SAXException | IOException e1) {
57+
System.out.println("ERROR: couldn't load categories from categories config file.");
58+
e1.printStackTrace();
59+
System.exit(-1);
60+
}
61+
}
62+
4963
/**
5064
* Initialize all the categories from the InputStream connected to the target XML file.
5165
*

‎plugin/pom.xml

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,6 @@
2020
<version>1.3</version>
2121
</dependency>
2222

23-
<dependency>
24-
<groupId>commons-cli</groupId>
25-
<artifactId>commons-cli</artifactId>
26-
<version>1.6.0</version>
27-
</dependency>
28-
29-
<dependency>
30-
<groupId>commons-io</groupId>
31-
<artifactId>commons-io</artifactId>
32-
<version>2.15.1</version>
33-
</dependency>
34-
35-
<dependency>
36-
<groupId>commons-lang</groupId>
37-
<artifactId>commons-lang</artifactId>
38-
</dependency>
39-
4023
<dependency>
4124
<groupId>com.contrastsecurity</groupId>
4225
<artifactId>java-sarif</artifactId>
@@ -70,6 +53,7 @@
7053
<dependency>
7154
<groupId>com.google.guava</groupId>
7255
<artifactId>guava</artifactId>
56+
<version>33.3.1-jre</version>
7357
</dependency>
7458

7559
<!-- The following dependency might be an upgrade/replacement for jaxb.xml.bind.JAXBContext,
@@ -83,41 +67,62 @@
8367
<dependency>
8468
<groupId>javax.xml.bind</groupId>
8569
<artifactId>jaxb-api</artifactId>
70+
<version>2.4.0-b180830.0359</version>
71+
</dependency>
72+
73+
<dependency>
74+
<groupId>commons-cli</groupId>
75+
<artifactId>commons-cli</artifactId>
76+
<version>1.9.0</version>
77+
</dependency>
78+
79+
<dependency>
80+
<groupId>commons-io</groupId>
81+
<artifactId>commons-io</artifactId>
82+
<version>2.18.0</version>
83+
</dependency>
84+
85+
<dependency>
86+
<groupId>commons-lang</groupId>
87+
<artifactId>commons-lang</artifactId>
88+
<version>2.6</version>
8689
</dependency>
8790

8891
<dependency>
8992
<groupId>org.apache.commons</groupId>
9093
<artifactId>commons-csv</artifactId>
91-
<version>1.10.0</version>
94+
<version>1.12.0</version>
9295
</dependency>
9396

9497
<dependency>
9598
<groupId>org.apache.commons</groupId>
9699
<artifactId>commons-lang3</artifactId>
97-
<version>3.14.0</version>
100+
<version>3.17.0</version>
98101
</dependency>
99102

100103
<dependency>
101104
<groupId>org.apache.httpcomponents.client5</groupId>
102105
<artifactId>httpclient5</artifactId>
106+
<version>5.4.1</version>
103107
</dependency>
104108

105109
<dependency>
106110
<groupId>org.apache.httpcomponents.core5</groupId>
107111
<artifactId>httpcore5</artifactId>
112+
<version>5.3.1</version>
108113
</dependency>
109114

110115
<dependency>
111116
<groupId>org.apache.maven</groupId>
112117
<artifactId>maven-plugin-api</artifactId>
113-
<version>3.9.6</version>
118+
<version>3.9.9</version>
114119
<scope>provided</scope>
115120
</dependency>
116121

117122
<dependency>
118123
<groupId>org.apache.maven.plugin-tools</groupId>
119124
<artifactId>maven-plugin-annotations</artifactId>
120-
<version>3.11.0</version>
125+
<version>3.15.1</version>
121126
<scope>provided</scope>
122127
</dependency>
123128

@@ -129,7 +134,7 @@
129134
<dependency>
130135
<groupId>org.jfree</groupId>
131136
<artifactId>jfreechart</artifactId>
132-
<version>1.5.4</version>
137+
<version>1.5.5</version>
133138
</dependency>
134139

135140
<dependency>
@@ -141,7 +146,7 @@
141146
<dependency>
142147
<groupId>org.yaml</groupId>
143148
<artifactId>snakeyaml</artifactId>
144-
<version>2.2</version>
149+
<version>2.3</version>
145150
</dependency>
146151

147152
<dependency>
@@ -188,10 +193,10 @@
188193
</build>
189194

190195
<properties>
191-
<version.fasterxml.jackson>2.17.0</version.fasterxml.jackson>
196+
<version.fasterxml.jackson>2.18.2</version.fasterxml.jackson>
192197
<!-- 3.0.3+ version of eclipse.persistence requires jakarta.xml.bind instead of jaxb -->
193-
<version.eclipse.persistence>2.7.14</version.eclipse.persistence>
194-
<version.junit.jupiter>5.10.2</version.junit.jupiter>
198+
<version.eclipse.persistence>2.7.15</version.eclipse.persistence>
199+
<version.junit.jupiter>5.11.3</version.junit.jupiter>
195200
</properties>
196201

197202
</project>

0 commit comments

Comments
 (0)