Skip to content

Commit ebc7385

Browse files
kariannakarianna
authored
Merge pull request #28 from karianna/update_deps_Jul_19_2025
Update all dependencies and fix all build warnings
2 parents f238fd5 + c22783e commit ebc7385

File tree

6 files changed

+57
-23
lines changed

6 files changed

+57
-23
lines changed

‎.actrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest
2+

‎.github/workflows/build.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,28 @@ jobs:
1515
jdk: ['11']
1616
os: [ubuntu-latest]
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4.2.2
1919
- name: Set up JDK ${{ matrix.jdk }}
20-
uses: actions/setup-java@v1
20+
uses: actions/setup-java@v4.7.1
2121
with:
22+
distribution: 'temurin'
2223
java-version: ${{ matrix.jdk }}
24+
- name: Install Maven
25+
run: |
26+
sudo apt-get update
27+
sudo apt-get install -y maven
2328
- name: Cache Maven packages
24-
uses: actions/cache@v3
29+
uses: actions/cache@v4.2.3
2530
with:
2631
path: ~/.m2
2732
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
2833
restore-keys: ${{ runner.os }}-m2
34+
- name: Cache OWASP NVD data
35+
uses: actions/[email protected]
36+
with:
37+
path: ~/.m2/repository/org/owasp/dependency-check-data
38+
key: owasp-nvd-cache-${{ runner.os }}
39+
restore-keys: |
40+
owasp-nvd-cache-
2941
- name: Build with Maven
3042
run: mvn -B -U verify

‎README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Patrick Reinhart <https://github.com/reinhapa[@reinhapa]>
44
:group-name: org.adoptopenjdk.maven.plugins
55
:project-full-path: AdoptOpenJDK/{project-name}
66
:github-branch: master
7-
:jdk-version: 12
7+
:jdk-version: 11
88
:jdk-url: https://jdk.java.net/{jdk-version}
99
:adoptopenjdk-url: https://adoptopenjdk.net
1010

‎pom.xml

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@
5252
</distributionManagement>
5353

5454
<properties>
55-
<junit.version>4.13.2</junit.version>
5655
<mockito.version>3.8.0</mockito.version>
5756
<easymock.version>4.2</easymock.version>
58-
<mavenVersion>3.9.8</mavenVersion>
57+
<mavenVersion>3.9.11</mavenVersion>
5958
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6059
</properties>
6160

@@ -79,16 +78,19 @@
7978
<groupId>org.apache.maven</groupId>
8079
<artifactId>maven-plugin-api</artifactId>
8180
<version>${mavenVersion}</version>
81+
<scope>provided</scope>
8282
</dependency>
8383
<dependency>
8484
<groupId>org.apache.maven</groupId>
8585
<artifactId>maven-core</artifactId>
8686
<version>${mavenVersion}</version>
87+
<scope>provided</scope>
8788
</dependency>
8889
<dependency>
8990
<groupId>org.apache.maven</groupId>
9091
<artifactId>maven-model</artifactId>
9192
<version>${mavenVersion}</version>
93+
<scope>provided</scope>
9294
</dependency>
9395
<dependency>
9496
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -160,36 +162,35 @@
160162
<plugin>
161163
<groupId>org.apache.maven.plugins</groupId>
162164
<artifactId>maven-clean-plugin</artifactId>
163-
<version>3.1.0</version>
165+
<version>3.5.0</version>
164166
</plugin>
165167
<plugin>
166168
<groupId>org.apache.maven.plugins</groupId>
167169
<artifactId>maven-compiler-plugin</artifactId>
168-
<version>3.8.1</version>
170+
<version>3.14.0</version>
169171
<configuration>
170-
<source>11</source>
171-
<target>11</target>
172+
<release>11</release>
172173
</configuration>
173174
</plugin>
174175
<plugin>
175176
<groupId>org.apache.maven.plugins</groupId>
176177
<artifactId>maven-deploy-plugin</artifactId>
177-
<version>3.0.0-M1</version>
178+
<version>3.1.4</version>
178179
</plugin>
179180
<plugin>
180181
<groupId>org.apache.maven.plugins</groupId>
181182
<artifactId>maven-install-plugin</artifactId>
182-
<version>3.0.0-M1</version>
183+
<version>3.1.4</version>
183184
</plugin>
184185
<plugin>
185186
<groupId>org.apache.maven.plugins</groupId>
186187
<artifactId>maven-jar-plugin</artifactId>
187-
<version>3.2.0</version>
188+
<version>3.4.2</version>
188189
</plugin>
189190
<plugin>
190191
<groupId>org.apache.maven.plugins</groupId>
191192
<artifactId>maven-javadoc-plugin</artifactId>
192-
<version>3.2.0</version>
193+
<version>3.11.2</version>
193194
<executions>
194195
<execution>
195196
<id>attach-javadocs</id>
@@ -202,7 +203,7 @@
202203
<plugin>
203204
<groupId>org.apache.maven.plugins</groupId>
204205
<artifactId>maven-plugin-plugin</artifactId>
205-
<version>3.6.0</version>
206+
<version>3.15.1</version>
206207
<configuration>
207208
<goalPrefix>jsplitpkgscan</goalPrefix>
208209
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
@@ -211,17 +212,17 @@
211212
<plugin>
212213
<groupId>org.apache.maven.plugins</groupId>
213214
<artifactId>maven-resources-plugin</artifactId>
214-
<version>3.2.0</version>
215+
<version>3.3.1</version>
215216
</plugin>
216217
<plugin>
217218
<groupId>org.apache.maven.plugins</groupId>
218219
<artifactId>maven-site-plugin</artifactId>
219-
<version>3.9.1</version>
220+
<version>3.21.0</version>
220221
</plugin>
221222
<plugin>
222223
<groupId>org.apache.maven.plugins</groupId>
223224
<artifactId>maven-source-plugin</artifactId>
224-
<version>3.2.1</version>
225+
<version>3.3.1</version>
225226
<executions>
226227
<execution>
227228
<id>attach-sources</id>
@@ -234,17 +235,20 @@
234235
<plugin>
235236
<groupId>org.apache.maven.plugins</groupId>
236237
<artifactId>maven-surefire-plugin</artifactId>
237-
<version>3.0.0-M5</version>
238+
<version>3.5.3</version>
238239
</plugin>
239240
<plugin>
240241
<groupId>org.apache.maven.plugins</groupId>
241242
<artifactId>maven-gpg-plugin</artifactId>
242-
<version>1.6</version>
243+
<version>3.2.8</version>
243244
</plugin>
244245
<plugin>
245246
<groupId>org.owasp</groupId>
246247
<artifactId>dependency-check-maven</artifactId>
247-
<version>6.1.1</version>
248+
<version>12.1.3</version>
249+
<configuration>
250+
<nvdApiKey>a1c5057d-457c-4e4f-959d-13c98786a664</nvdApiKey>
251+
</configuration>
248252
<executions>
249253
<execution>
250254
<goals>
@@ -292,7 +296,7 @@
292296
<plugin>
293297
<groupId>org.apache.maven.plugins</groupId>
294298
<artifactId>maven-invoker-plugin</artifactId>
295-
<version>3.2.0</version>
299+
<version>3.9.1</version>
296300
<configuration>
297301
<debug>true</debug>
298302
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>

‎src/main/java/org/adoptopenjdk/maven/plugins/JsplitpkgscanMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class JsplitpkgscanMojo extends AbstractMojo {
4848
/**
4949
* Execute jsplitpgkscan tool for the projects artifact against all it's dependencies.
5050
*
51-
* @throws MojoExecutionException
51+
* @throws MojoExecutionException General exception thrown if the mojo execution fails.
5252
*/
5353
@Override
5454
public void execute() throws MojoExecutionException {

‎src/main/java/org/adoptopenjdk/maven/plugins/OutputParser.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,29 @@
1010
import java.util.regex.Matcher;
1111
import java.util.regex.Pattern;
1212

13+
/**
14+
* Parses the output of the jsplitpkgscan tool and provides a callback with the results.
15+
* The output is expected to be in a specific format where each line contains a package name
16+
* followed by module details.
17+
*/
1318
public class OutputParser {
1419
private final BiConsumer<String, Set<ModuleDetail>> consumer;
1520

21+
/**
22+
* Constructs an OutputParser with a consumer that will handle the parsed results.
23+
*
24+
* @param consumer a BiConsumer that takes a package name and a set of ModuleDetail objects
25+
*/
1626
public OutputParser(BiConsumer<String, Set<ModuleDetail>> consumer) {
1727
this.consumer = consumer;
1828
}
1929

30+
/**
31+
* Parses the provided output data and invokes the consumer with the package name and module details.
32+
*
33+
* @param outputData the byte array containing the output data to parse
34+
* @throws IOException if an I/O error occurs while reading the output data
35+
*/
2036
public void parse(byte[] outputData) throws IOException {
2137
Pattern pattern = Pattern.compile("^[\\s]+([0-9]+)[\\s]+(.*)$");
2238
try (BufferedReader reader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(outputData)))) {

0 commit comments

Comments
 (0)