Skip to content

Commit cda130d

Browse files
committed
Upgrade pom versions
1 parent 944de3e commit cda130d

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

org.eclipse.m2e.maven.runtime/pom.xml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@
2121
</parent>
2222

2323
<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
24-
<version>3.9.1100-SNAPSHOT</version>
24+
<version>4.0.0-SNAPSHOT</version>
2525
<packaging>jar</packaging>
2626

2727
<name>M2E Embedded Maven Runtime (includes Incubating components)</name>
2828

2929
<properties>
3030
<!-- maven core version -->
31-
<maven-core.version>3.9.11</maven-core.version>
31+
<maven-core.version>4.0.0-rc-4</maven-core.version>
32+
<!-- Maven 4 uses resolver 2.0.9 -->
33+
<resolver.version>2.0.9</resolver.version>
3234
<!-- below are m2e-specific addons -->
3335
<plexus-build-api.version>1.2.0</plexus-build-api.version>
3436
<jars.directory>target/jars</jars.directory>
@@ -77,22 +79,27 @@
7779
<dependency>
7880
<groupId>org.apache.maven.resolver</groupId>
7981
<artifactId>maven-resolver-impl</artifactId>
82+
<version>${resolver.version}</version>
8083
</dependency>
8184
<dependency>
8285
<groupId>org.apache.maven.resolver</groupId>
8386
<artifactId>maven-resolver-connector-basic</artifactId>
87+
<version>${resolver.version}</version>
8488
</dependency>
8589
<dependency>
8690
<groupId>org.apache.maven.resolver</groupId>
8791
<artifactId>maven-resolver-transport-wagon</artifactId>
92+
<version>${resolver.version}</version>
8893
</dependency>
8994
<dependency>
9095
<groupId>org.apache.maven.resolver</groupId>
9196
<artifactId>maven-resolver-transport-file</artifactId>
97+
<version>${resolver.version}</version>
9298
</dependency>
9399
<dependency>
94100
<groupId>org.apache.maven.resolver</groupId>
95-
<artifactId>maven-resolver-transport-http</artifactId>
101+
<artifactId>maven-resolver-transport-jdk</artifactId>
102+
<version>${resolver.version}</version>
96103
<exclusions>
97104
<exclusion>
98105
<groupId>commons-codec</groupId>
@@ -109,14 +116,14 @@
109116
<artifactId>wagon-file</artifactId>
110117
</dependency>
111118
<dependency>
112-
<groupId>org.fusesource.jansi</groupId>
113-
<artifactId>jansi</artifactId>
119+
<groupId>org.jline</groupId>
120+
<artifactId>jansi-core</artifactId>
114121
</dependency>
115122
<dependency>
116123
<!-- SLF4J-binding only used by a launched Maven-runtime.
117124
Keep the BND-instructions below in sync with this jar's name. -->
118125
<groupId>org.apache.maven</groupId>
119-
<artifactId>maven-slf4j-provider</artifactId>
126+
<artifactId>maven-logging</artifactId>
120127
</dependency>
121128
<!-- globally excluded transitive dependencies (set their scope to 'provided') -->
122129
<dependency>
@@ -135,6 +142,7 @@
135142
<dependency>
136143
<groupId>com.google.guava</groupId>
137144
<artifactId>failureaccess</artifactId>
145+
<version>1.0.1</version>
138146
<scope>provided</scope>
139147
</dependency>
140148
<dependency>
@@ -181,7 +189,7 @@
181189
# However when the this Maven runtime is used within the Eclipse-IDE(-JVM) we don't want it to use the embedded SLF4J-binding
182190
# but instead use the SLF4J-binding provided by the Eclipse runtime. This is achived by making the embedded SLF4J-binding invisible
183191
# for OSGi, by simply NOT placing the binding's jar on the Bundle-ClassPath.
184-
slf4jBinding=maven-slf4j-provider-${maven-core.version}.jar
192+
slf4jBinding=maven-logging-${maven-core.version}.jar
185193
M2E-SLF4JBinding=jars/${slf4jBinding}
186194
-includeresource: \
187195
jars/=${jars.directory}/;recursive:=false;lib:=true;filter:=!${slf4jBinding},\

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<dependency>
100100
<groupId>org.eclipse.m2e</groupId>
101101
<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
102-
<version>3.9.1100-SNAPSHOT</version>
102+
<version>4.0.0-SNAPSHOT</version>
103103
</dependency>
104104
</dependencies>
105105

0 commit comments

Comments
 (0)