Skip to content

Commit 9f330d4

Browse files
nscuronscuro
authored
Maven tweaks (#61)
1 parent b8e0f34 commit 9f330d4

File tree

5 files changed

+67
-48
lines changed

5 files changed

+67
-48
lines changed

‎.mvn/maven.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--errors
2+
--no-transfer-progress

‎pom.xml‎

Lines changed: 61 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,106 +10,122 @@
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13+
14+
<!-- Dependency versions -->
15+
<lib.ae-security.version>0.138.0</lib.ae-security.version>
16+
<lib.cyclonedx-core-java.version>10.2.1</lib.cyclonedx-core-java.version>
17+
<lib.apache-httpclient5.version>5.5</lib.apache-httpclient5.version>
18+
<lib.cpe-parser.version>3.0.0</lib.cpe-parser.version>
19+
<lib.jackson.version>2.19.0</lib.jackson.version>
20+
<lib.jdbi.version>3.49.4</lib.jdbi.version>
21+
<lib.jspecify.version>1.0.0</lib.jspecify.version>
22+
<lib.logback.version>1.5.18</lib.logback.version>
23+
<lib.open-vulnerability-clients.version>8.0.0</lib.open-vulnerability-clients.version>
24+
<lib.packageurl-java.version>1.5.0</lib.packageurl-java.version>
25+
<lib.picocli.version>4.7.7</lib.picocli.version>
26+
<lib.slf4j.version>2.0.17</lib.slf4j.version>
27+
<lib.sqlite-jdbc.version>3.49.1.0</lib.sqlite-jdbc.version>
28+
<lib.versatile.version>0.12.0</lib.versatile.version>
1329
</properties>
1430

1531
<dependencies>
1632
<dependency>
1733
<groupId>org.metaeffekt.core</groupId>
1834
<artifactId>ae-security</artifactId>
19-
<version>0.138.0</version>
35+
<version>${lib.ae-security.version}</version>
2036
</dependency>
2137

2238
<dependency>
2339
<groupId>us.springett</groupId>
2440
<artifactId>cpe-parser</artifactId>
25-
<version>3.0.0</version>
41+
<version>${lib.cpe-parser.version}</version>
2642
</dependency>
2743

2844
<dependency>
2945
<groupId>org.cyclonedx</groupId>
3046
<artifactId>cyclonedx-core-java</artifactId>
31-
<version>10.2.1</version>
47+
<version>${lib.cyclonedx-core-java.version}</version>
3248
</dependency>
3349

3450
<dependency>
3551
<groupId>org.apache.httpcomponents.client5</groupId>
3652
<artifactId>httpclient5</artifactId>
37-
<version>5.5</version>
53+
<version>${lib.apache-httpclient5.version}</version>
3854
</dependency>
3955

4056
<dependency>
41-
<groupId>jakarta.annotation</groupId>
42-
<artifactId>jakarta.annotation-api</artifactId>
43-
<version>3.0.0</version>
57+
<groupId>com.fasterxml.jackson.core</groupId>
58+
<artifactId>jackson-databind</artifactId>
59+
<version>${lib.jackson.version}</version>
4460
</dependency>
45-
4661
<dependency>
47-
<groupId>ch.qos.logback</groupId>
48-
<artifactId>logback-classic</artifactId>
49-
<version>1.5.18</version>
62+
<groupId>com.fasterxml.jackson.datatype</groupId>
63+
<artifactId>jackson-datatype-jsr310</artifactId>
64+
<version>${lib.jackson.version}</version>
5065
</dependency>
5166

5267
<dependency>
53-
<groupId>com.github.package-url</groupId>
54-
<artifactId>packageurl-java</artifactId>
55-
<version>1.5.0</version>
68+
<groupId>org.jdbi</groupId>
69+
<artifactId>jdbi3-core</artifactId>
70+
<version>${lib.jdbi.version}</version>
5671
</dependency>
57-
5872
<dependency>
59-
<groupId>info.picocli</groupId>
60-
<artifactId>picocli</artifactId>
61-
<version>4.7.7</version>
73+
<groupId>org.jdbi</groupId>
74+
<artifactId>jdbi3-jackson2</artifactId>
75+
<version>${lib.jdbi.version}</version>
6276
</dependency>
63-
6477
<dependency>
65-
<groupId>io.github.nscuro</groupId>
66-
<artifactId>versatile-core</artifactId>
67-
<version>0.12.0</version>
78+
<groupId>org.jdbi</groupId>
79+
<artifactId>jdbi3-sqlite</artifactId>
80+
<version>${lib.jdbi.version}</version>
6881
</dependency>
6982

7083
<dependency>
71-
<groupId>io.github.jeremylong</groupId>
72-
<artifactId>open-vulnerability-clients</artifactId>
73-
<version>8.0.0</version>
84+
<groupId>org.jspecify</groupId>
85+
<artifactId>jspecify</artifactId>
86+
<version>${lib.jspecify.version}</version>
7487
</dependency>
7588

7689
<dependency>
77-
<groupId>com.fasterxml.jackson.core</groupId>
78-
<artifactId>jackson-databind</artifactId>
79-
<version>2.19.0</version>
90+
<groupId>ch.qos.logback</groupId>
91+
<artifactId>logback-classic</artifactId>
92+
<version>${lib.logback.version}</version>
8093
</dependency>
94+
8195
<dependency>
82-
<groupId>com.fasterxml.jackson.datatype</groupId>
83-
<artifactId>jackson-datatype-jsr310</artifactId>
84-
<version>2.19.0</version>
96+
<groupId>io.github.jeremylong</groupId>
97+
<artifactId>open-vulnerability-clients</artifactId>
98+
<version>${lib.open-vulnerability-clients.version}</version>
8599
</dependency>
86100

87101
<dependency>
88-
<groupId>org.jdbi</groupId>
89-
<artifactId>jdbi3-core</artifactId>
90-
<version>3.49.4</version>
102+
<groupId>com.github.package-url</groupId>
103+
<artifactId>packageurl-java</artifactId>
104+
<version>${lib.packageurl-java.version}</version>
91105
</dependency>
106+
92107
<dependency>
93-
<groupId>org.jdbi</groupId>
94-
<artifactId>jdbi3-jackson2</artifactId>
95-
<version>3.49.4</version>
108+
<groupId>info.picocli</groupId>
109+
<artifactId>picocli</artifactId>
110+
<version>${lib.picocli.version}</version>
96111
</dependency>
112+
97113
<dependency>
98-
<groupId>org.jdbi</groupId>
99-
<artifactId>jdbi3-sqlite</artifactId>
100-
<version>3.49.4</version>
114+
<groupId>org.slf4j</groupId>
115+
<artifactId>slf4j-api</artifactId>
116+
<version>${lib.slf4j.version}</version>
101117
</dependency>
102118

103119
<dependency>
104120
<groupId>org.xerial</groupId>
105121
<artifactId>sqlite-jdbc</artifactId>
106-
<version>3.49.1.0</version>
122+
<version>${lib.sqlite-jdbc.version}</version>
107123
</dependency>
108124

109125
<dependency>
110-
<groupId>org.slf4j</groupId>
111-
<artifactId>slf4j-api</artifactId>
112-
<version>2.0.17</version>
126+
<groupId>io.github.nscuro</groupId>
127+
<artifactId>versatile-core</artifactId>
128+
<version>${lib.versatile.version}</version>
113129
</dependency>
114130
</dependencies>
115131

@@ -123,7 +139,7 @@
123139
<path>
124140
<groupId>info.picocli</groupId>
125141
<artifactId>picocli-codegen</artifactId>
126-
<version>4.7.7</version>
142+
<version>${lib.picocli.version}</version>
127143
</path>
128144
</annotationProcessorPaths>
129145
<source>21</source>

‎src/main/java/org/dependencytrack/vulndb/store/SourceMetadataRecord.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.dependencytrack.vulndb.store;
22

3-
import jakarta.annotation.Nullable;
3+
import org.jspecify.annotations.Nullable;
4+
45
import java.time.Instant;
56

67
public record SourceMetadataRecord(

‎src/main/java/org/dependencytrack/vulndb/store/VulnerabilityDataRecord.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import org.dependencytrack.vulndb.api.Source;
44
import org.dependencytrack.vulndb.api.Vulnerability;
55
import org.jdbi.v3.json.Json;
6+
import org.jspecify.annotations.Nullable;
67

7-
import jakarta.annotation.Nullable;
88
import java.time.Instant;
99
import java.util.List;
1010

‎src/main/java/org/dependencytrack/vulndb/store/VulnerabilityRatingRecord.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import org.dependencytrack.vulndb.api.Rating;
44
import org.dependencytrack.vulndb.api.Source;
5+
import org.jspecify.annotations.Nullable;
56

6-
import jakarta.annotation.Nullable;
77
import java.time.Instant;
88

99
public record VulnerabilityRatingRecord(

0 commit comments

Comments
 (0)