Skip to content

Commit 83dc188

Browse files
sgammonsgammon
committed
fix: apply latest fixes from maven-resolver
Signed-off-by: Sam Gammon <sam@elide.ventures>
1 parent 4ffcdad commit 83dc188

23 files changed

+92
-90
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export PROTOBUF_VERSION ?= 4.26.1-jpms
4848
export GEANTYREF_VERSION ?= 1.3.15-jpms
4949
export KOTLINX_COLLECTIONS_VERSION ?= 0.4.1
5050
export KOTLINX_COLLECTIONS_POSTFIX ?= jpms
51-
export MAVEN_RESOLVER_VERSION ?= 2.10.0-alpha-10-jpms-b2
51+
export MAVEN_RESOLVER_VERSION ?= 2.10.0-alpha-10-jpms-b3
5252
endif
5353

5454
export PROJECT ?= $(shell pwd)

‎org.apache.maven.resolver

‎tools/catalog/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ catalog {
5454
"maven-resolver-api",
5555
"maven-resolver-spi",
5656
"maven-resolver-impl",
57+
"maven-resolver-connector-basic",
5758
"maven-resolver-named-locks",
5859
"maven-resolver-supplier-mvn3",
5960
"maven-resolver-supplier-mvn4",

‎tools/poms/maven-resolver-api.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
<parent>
2323
<groupId>org.apache.maven.resolver</groupId>
2424
<artifactId>maven-resolver</artifactId>
25-
<version>2.10.0-alpha-10-jpms-b2</version>
25+
<version>2.10.0-alpha-10-jpms-b3</version>
2626
</parent>
2727
<groupId>org.apache.maven.resolver</groupId>
2828
<artifactId>maven-resolver-api</artifactId>
29-
<version>2.10.0-alpha-10-jpms-b2</version>
29+
<version>2.10.0-alpha-10-jpms-b3</version>
3030
<name>Maven Artifact Resolver API</name>
3131
<description>The application programming interface for the repository system.</description>
3232
<dependencies>

‎tools/poms/maven-resolver-connector-basic.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<parent>
2424
<groupId>org.apache.maven.resolver</groupId>
2525
<artifactId>maven-resolver</artifactId>
26-
<version>2.10.0-alpha-10-jpms-b2</version>
26+
<version>2.10.0-alpha-10-jpms-b3</version>
2727
</parent>
2828

2929
<groupId>org.apache.maven.resolver</groupId>
3030
<artifactId>maven-resolver-connector-basic</artifactId>
31-
<version>2.10.0-alpha-10-jpms-b2</version>
31+
<version>2.10.0-alpha-10-jpms-b3</version>
3232
<name>Maven Artifact Resolver Connector Basic</name>
3333
<description>A repository connector implementation for repositories using URI-based layouts.</description>
3434

@@ -40,17 +40,17 @@
4040
<dependency>
4141
<groupId>org.apache.maven.resolver</groupId>
4242
<artifactId>maven-resolver-api</artifactId>
43-
<version>2.10.0-alpha-10-jpms-b2</version>
43+
<version>2.10.0-alpha-10-jpms-b3</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.apache.maven.resolver</groupId>
4747
<artifactId>maven-resolver-spi</artifactId>
48-
<version>2.10.0-alpha-10-jpms-b2</version>
48+
<version>2.10.0-alpha-10-jpms-b3</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>org.apache.maven.resolver</groupId>
5252
<artifactId>maven-resolver-util</artifactId>
53-
<version>2.10.0-alpha-10-jpms-b2</version>
53+
<version>2.10.0-alpha-10-jpms-b3</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>jakarta.inject</groupId>

‎tools/poms/maven-resolver-generator-gnupg.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<parent>
2424
<groupId>org.apache.maven.resolver</groupId>
2525
<artifactId>maven-resolver</artifactId>
26-
<version>2.10.0-alpha-10-jpms-b2</version>
26+
<version>2.10.0-alpha-10-jpms-b3</version>
2727
</parent>
2828

2929
<groupId>org.apache.maven.resolver</groupId>
3030
<artifactId>maven-resolver-generator-gnupg</artifactId>
31-
<version>2.10.0-alpha-10-jpms-b2</version>
31+
<version>2.10.0-alpha-10-jpms-b3</version>
3232

3333
<name>Maven Artifact Resolver GnuPG Signer Generator</name>
3434
<description>A generator implementation for GnuPG signatures.</description>
@@ -44,17 +44,17 @@
4444
<dependency>
4545
<groupId>org.apache.maven.resolver</groupId>
4646
<artifactId>maven-resolver-api</artifactId>
47-
<version>2.10.0-alpha-10-jpms-b2</version>
47+
<version>2.10.0-alpha-10-jpms-b3</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>org.apache.maven.resolver</groupId>
5151
<artifactId>maven-resolver-spi</artifactId>
52-
<version>2.10.0-alpha-10-jpms-b2</version>
52+
<version>2.10.0-alpha-10-jpms-b3</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.apache.maven.resolver</groupId>
5656
<artifactId>maven-resolver-util</artifactId>
57-
<version>2.10.0-alpha-10-jpms-b2</version>
57+
<version>2.10.0-alpha-10-jpms-b3</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>org.slf4j</groupId>

‎tools/poms/maven-resolver-impl.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<parent>
2424
<groupId>org.apache.maven.resolver</groupId>
2525
<artifactId>maven-resolver</artifactId>
26-
<version>2.10.0-alpha-10-jpms-b2</version>
26+
<version>2.10.0-alpha-10-jpms-b3</version>
2727
</parent>
2828

2929
<groupId>org.apache.maven.resolver</groupId>
3030
<artifactId>maven-resolver-impl</artifactId>
31-
<version>2.10.0-alpha-10-jpms-b2</version>
31+
<version>2.10.0-alpha-10-jpms-b3</version>
3232
<name>Maven Artifact Resolver Implementation</name>
3333
<description>An implementation of the repository system.</description>
3434
<properties>
@@ -39,22 +39,22 @@
3939
<dependency>
4040
<groupId>org.apache.maven.resolver</groupId>
4141
<artifactId>maven-resolver-api</artifactId>
42-
<version>2.10.0-alpha-10-jpms-b2</version>
42+
<version>2.10.0-alpha-10-jpms-b3</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>org.apache.maven.resolver</groupId>
4646
<artifactId>maven-resolver-spi</artifactId>
47-
<version>2.10.0-alpha-10-jpms-b2</version>
47+
<version>2.10.0-alpha-10-jpms-b3</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>org.apache.maven.resolver</groupId>
5151
<artifactId>maven-resolver-named-locks</artifactId>
52-
<version>2.10.0-alpha-10-jpms-b2</version>
52+
<version>2.10.0-alpha-10-jpms-b3</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.apache.maven.resolver</groupId>
5656
<artifactId>maven-resolver-util</artifactId>
57-
<version>2.10.0-alpha-10-jpms-b2</version>
57+
<version>2.10.0-alpha-10-jpms-b3</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>jakarta.inject</groupId>

‎tools/poms/maven-resolver-named-locks.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<parent>
2424
<groupId>org.apache.maven.resolver</groupId>
2525
<artifactId>maven-resolver</artifactId>
26-
<version>2.10.0-alpha-10-jpms-b2</version>
26+
<version>2.10.0-alpha-10-jpms-b3</version>
2727
</parent>
2828

2929
<groupId>org.apache.maven.resolver</groupId>
3030
<artifactId>maven-resolver-named-locks</artifactId>
31-
<version>2.10.0-alpha-10-jpms-b2</version>
31+
<version>2.10.0-alpha-10-jpms-b3</version>
3232

3333
<name>Maven Artifact Resolver Named Locks</name>
3434
<description>A synchronization utility implementation using Named locks.</description>

‎tools/poms/maven-resolver-parent.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<groupId>org.apache.maven.resolver</groupId>
3131
<artifactId>maven-resolver</artifactId>
32-
<version>2.10.0-alpha-10-jpms-b2</version>
32+
<version>2.10.0-alpha-10-jpms-b3</version>
3333
<packaging>pom</packaging>
3434

3535
<name>Maven Artifact Resolver</name>

‎tools/poms/maven-resolver-spi.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
<parent>
2323
<groupId>org.apache.maven.resolver</groupId>
2424
<artifactId>maven-resolver</artifactId>
25-
<version>2.10.0-alpha-10-jpms-b2</version>
25+
<version>2.10.0-alpha-10-jpms-b3</version>
2626
</parent>
2727
<groupId>org.apache.maven.resolver</groupId>
2828
<artifactId>maven-resolver-spi</artifactId>
29-
<version>2.10.0-alpha-10-jpms-b2</version>
29+
<version>2.10.0-alpha-10-jpms-b3</version>
3030
<name>Maven Artifact Resolver SPI</name>
3131
<description>The service provider interface for repository system implementations and repository connectors.</description>
3232
<dependencies>
3333
<dependency>
3434
<groupId>org.apache.maven.resolver</groupId>
3535
<artifactId>maven-resolver-api</artifactId>
36-
<version>2.10.0-alpha-10-jpms-b2</version>
36+
<version>2.10.0-alpha-10-jpms-b3</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>org.junit.jupiter</groupId>

‎tools/poms/maven-resolver-supplier-mvn3.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<parent>
2424
<groupId>org.apache.maven.resolver</groupId>
2525
<artifactId>maven-resolver</artifactId>
26-
<version>2.10.0-alpha-10-jpms-b2</version>
26+
<version>2.10.0-alpha-10-jpms-b3</version>
2727
</parent>
2828

2929
<groupId>org.apache.maven.resolver</groupId>
3030
<artifactId>maven-resolver-supplier-mvn3</artifactId>
31-
<version>2.10.0-alpha-10-jpms-b2</version>
31+
<version>2.10.0-alpha-10-jpms-b3</version>
3232

3333
<name>Maven Artifact Resolver Instance Supplier Maven3</name>
3434
<description>A helper module to provide RepositorySystem instances.</description>
@@ -42,42 +42,42 @@
4242
<dependency>
4343
<groupId>org.apache.maven.resolver</groupId>
4444
<artifactId>maven-resolver-api</artifactId>
45-
<version>2.10.0-alpha-10-jpms-b2</version>
45+
<version>2.10.0-alpha-10-jpms-b3</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>org.apache.maven.resolver</groupId>
4949
<artifactId>maven-resolver-util</artifactId>
50-
<version>2.10.0-alpha-10-jpms-b2</version>
50+
<version>2.10.0-alpha-10-jpms-b3</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.apache.maven.resolver</groupId>
5454
<artifactId>maven-resolver-spi</artifactId>
55-
<version>2.10.0-alpha-10-jpms-b2</version>
55+
<version>2.10.0-alpha-10-jpms-b3</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>org.apache.maven.resolver</groupId>
5959
<artifactId>maven-resolver-named-locks</artifactId>
60-
<version>2.10.0-alpha-10-jpms-b2</version>
60+
<version>2.10.0-alpha-10-jpms-b3</version>
6161
</dependency>
6262
<dependency>
6363
<groupId>org.apache.maven.resolver</groupId>
6464
<artifactId>maven-resolver-impl</artifactId>
65-
<version>2.10.0-alpha-10-jpms-b2</version>
65+
<version>2.10.0-alpha-10-jpms-b3</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>org.apache.maven.resolver</groupId>
6969
<artifactId>maven-resolver-connector-basic</artifactId>
70-
<version>2.10.0-alpha-10-jpms-b2</version>
70+
<version>2.10.0-alpha-10-jpms-b3</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>org.apache.maven.resolver</groupId>
7474
<artifactId>maven-resolver-transport-file</artifactId>
75-
<version>2.10.0-alpha-10-jpms-b2</version>
75+
<version>2.10.0-alpha-10-jpms-b3</version>
7676
</dependency>
7777
<dependency>
7878
<groupId>org.apache.maven.resolver</groupId>
7979
<artifactId>maven-resolver-transport-apache</artifactId>
80-
<version>2.10.0-alpha-10-jpms-b2</version>
80+
<version>2.10.0-alpha-10-jpms-b3</version>
8181
</dependency>
8282

8383
<dependency>

‎tools/poms/maven-resolver-supplier-mvn4.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<parent>
2424
<groupId>org.apache.maven.resolver</groupId>
2525
<artifactId>maven-resolver</artifactId>
26-
<version>2.10.0-alpha-10-jpms-b2</version>
26+
<version>2.10.0-alpha-10-jpms-b3</version>
2727
</parent>
2828

2929
<groupId>org.apache.maven.resolver</groupId>
3030
<artifactId>maven-resolver-supplier-mvn4</artifactId>
31-
<version>2.10.0-alpha-10-jpms-b2</version>
31+
<version>2.10.0-alpha-10-jpms-b3</version>
3232

3333
<name>Maven Artifact Resolver Instance Supplier Maven4</name>
3434
<description>A helper module to provide RepositorySystem instances.</description>
@@ -44,37 +44,37 @@
4444
<dependency>
4545
<groupId>org.apache.maven.resolver</groupId>
4646
<artifactId>maven-resolver-api</artifactId>
47-
<version>2.10.0-alpha-10-jpms-b2</version>
47+
<version>2.10.0-alpha-10-jpms-b3</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>org.apache.maven.resolver</groupId>
5151
<artifactId>maven-resolver-util</artifactId>
52-
<version>2.10.0-alpha-10-jpms-b2</version>
52+
<version>2.10.0-alpha-10-jpms-b3</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.apache.maven.resolver</groupId>
5656
<artifactId>maven-resolver-spi</artifactId>
57-
<version>2.10.0-alpha-10-jpms-b2</version>
57+
<version>2.10.0-alpha-10-jpms-b3</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>org.apache.maven.resolver</groupId>
6161
<artifactId>maven-resolver-named-locks</artifactId>
62-
<version>2.10.0-alpha-10-jpms-b2</version>
62+
<version>2.10.0-alpha-10-jpms-b3</version>
6363
</dependency>
6464
<dependency>
6565
<groupId>org.apache.maven.resolver</groupId>
6666
<artifactId>maven-resolver-impl</artifactId>
67-
<version>2.10.0-alpha-10-jpms-b2</version>
67+
<version>2.10.0-alpha-10-jpms-b3</version>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.maven.resolver</groupId>
7171
<artifactId>maven-resolver-connector-basic</artifactId>
72-
<version>2.10.0-alpha-10-jpms-b2</version>
72+
<version>2.10.0-alpha-10-jpms-b3</version>
7373
</dependency>
7474
<dependency>
7575
<groupId>org.apache.maven.resolver</groupId>
7676
<artifactId>maven-resolver-transport-file</artifactId>
77-
<version>2.10.0-alpha-10-jpms-b2</version>
77+
<version>2.10.0-alpha-10-jpms-b3</version>
7878
</dependency>
7979

8080
<dependency>

‎tools/poms/maven-resolver-transport-apache.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<parent>
2424
<groupId>org.apache.maven.resolver</groupId>
2525
<artifactId>maven-resolver</artifactId>
26-
<version>2.10.0-alpha-10-jpms-b2</version>
26+
<version>2.10.0-alpha-10-jpms-b3</version>
2727
</parent>
2828

2929
<groupId>org.apache.maven.resolver</groupId>
3030
<artifactId>maven-resolver-transport-apache</artifactId>
31-
<version>2.10.0-alpha-10-jpms-b2</version>
31+
<version>2.10.0-alpha-10-jpms-b3</version>
3232

3333
<name>Maven Artifact Resolver Transport Apache</name>
3434
<description>A transport implementation for repositories using http:// and https:// URLs.</description>
@@ -42,17 +42,17 @@
4242
<dependency>
4343
<groupId>org.apache.maven.resolver</groupId>
4444
<artifactId>maven-resolver-api</artifactId>
45-
<version>2.10.0-alpha-10-jpms-b2</version>
45+
<version>2.10.0-alpha-10-jpms-b3</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>org.apache.maven.resolver</groupId>
4949
<artifactId>maven-resolver-spi</artifactId>
50-
<version>2.10.0-alpha-10-jpms-b2</version>
50+
<version>2.10.0-alpha-10-jpms-b3</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.apache.maven.resolver</groupId>
5454
<artifactId>maven-resolver-util</artifactId>
55-
<version>2.10.0-alpha-10-jpms-b2</version>
55+
<version>2.10.0-alpha-10-jpms-b3</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>org.apache.httpcomponents</groupId>

‎tools/poms/maven-resolver-transport-classpath.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<parent>
2424
<groupId>org.apache.maven.resolver</groupId>
2525
<artifactId>maven-resolver</artifactId>
26-
<version>2.10.0-alpha-10-jpms-b2</version>
26+
<version>2.10.0-alpha-10-jpms-b3</version>
2727
</parent>
2828

2929
<groupId>org.apache.maven.resolver</groupId>
3030
<artifactId>maven-resolver-transport-classpath</artifactId>
31-
<version>2.10.0-alpha-10-jpms-b2</version>
31+
<version>2.10.0-alpha-10-jpms-b3</version>
3232
<name>Maven Artifact Resolver Transport Classpath</name>
3333
<description>A transport implementation for repositories using classpath:// URLs.</description>
3434

@@ -40,17 +40,17 @@
4040
<dependency>
4141
<groupId>org.apache.maven.resolver</groupId>
4242
<artifactId>maven-resolver-api</artifactId>
43-
<version>2.10.0-alpha-10-jpms-b2</version>
43+
<version>2.10.0-alpha-10-jpms-b3</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.apache.maven.resolver</groupId>
4747
<artifactId>maven-resolver-spi</artifactId>
48-
<version>2.10.0-alpha-10-jpms-b2</version>
48+
<version>2.10.0-alpha-10-jpms-b3</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>org.apache.maven.resolver</groupId>
5252
<artifactId>maven-resolver-util</artifactId>
53-
<version>2.10.0-alpha-10-jpms-b2</version>
53+
<version>2.10.0-alpha-10-jpms-b3</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>jakarta.inject</groupId>

0 commit comments

Comments
 (0)