|
21 | 21 | </parent> |
22 | 22 |
|
23 | 23 | <artifactId>org.eclipse.m2e.maven.runtime</artifactId> |
24 | | - <version>3.9.1100-SNAPSHOT</version> |
| 24 | + <version>4.0.0-SNAPSHOT</version> |
25 | 25 | <packaging>jar</packaging> |
26 | 26 |
|
27 | 27 | <name>M2E Embedded Maven Runtime (includes Incubating components)</name> |
28 | 28 |
|
29 | 29 | <properties> |
30 | 30 | <!-- 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> |
32 | 34 | <!-- below are m2e-specific addons --> |
33 | 35 | <plexus-build-api.version>1.2.0</plexus-build-api.version> |
34 | 36 | <jars.directory>target/jars</jars.directory> |
|
77 | 79 | <dependency> |
78 | 80 | <groupId>org.apache.maven.resolver</groupId> |
79 | 81 | <artifactId>maven-resolver-impl</artifactId> |
| 82 | + <version>${resolver.version}</version> |
80 | 83 | </dependency> |
81 | 84 | <dependency> |
82 | 85 | <groupId>org.apache.maven.resolver</groupId> |
83 | 86 | <artifactId>maven-resolver-connector-basic</artifactId> |
| 87 | + <version>${resolver.version}</version> |
84 | 88 | </dependency> |
85 | 89 | <dependency> |
86 | 90 | <groupId>org.apache.maven.resolver</groupId> |
87 | 91 | <artifactId>maven-resolver-transport-wagon</artifactId> |
| 92 | + <version>${resolver.version}</version> |
88 | 93 | </dependency> |
89 | 94 | <dependency> |
90 | 95 | <groupId>org.apache.maven.resolver</groupId> |
91 | 96 | <artifactId>maven-resolver-transport-file</artifactId> |
| 97 | + <version>${resolver.version}</version> |
92 | 98 | </dependency> |
93 | 99 | <dependency> |
94 | 100 | <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> |
96 | 103 | <exclusions> |
97 | 104 | <exclusion> |
98 | 105 | <groupId>commons-codec</groupId> |
|
109 | 116 | <artifactId>wagon-file</artifactId> |
110 | 117 | </dependency> |
111 | 118 | <dependency> |
112 | | - <groupId>org.fusesource.jansi</groupId> |
113 | | - <artifactId>jansi</artifactId> |
| 119 | + <groupId>org.jline</groupId> |
| 120 | + <artifactId>jansi-core</artifactId> |
114 | 121 | </dependency> |
115 | 122 | <dependency> |
116 | 123 | <!-- SLF4J-binding only used by a launched Maven-runtime. |
117 | 124 | Keep the BND-instructions below in sync with this jar's name. --> |
118 | 125 | <groupId>org.apache.maven</groupId> |
119 | | - <artifactId>maven-slf4j-provider</artifactId> |
| 126 | + <artifactId>maven-logging</artifactId> |
120 | 127 | </dependency> |
121 | 128 | <!-- globally excluded transitive dependencies (set their scope to 'provided') --> |
122 | 129 | <dependency> |
|
135 | 142 | <dependency> |
136 | 143 | <groupId>com.google.guava</groupId> |
137 | 144 | <artifactId>failureaccess</artifactId> |
| 145 | + <version>1.0.1</version> |
138 | 146 | <scope>provided</scope> |
139 | 147 | </dependency> |
140 | 148 | <dependency> |
|
181 | 189 | # However when the this Maven runtime is used within the Eclipse-IDE(-JVM) we don't want it to use the embedded SLF4J-binding |
182 | 190 | # but instead use the SLF4J-binding provided by the Eclipse runtime. This is achived by making the embedded SLF4J-binding invisible |
183 | 191 | # 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 |
185 | 193 | M2E-SLF4JBinding=jars/${slf4jBinding} |
186 | 194 | -includeresource: \ |
187 | 195 | jars/=${jars.directory}/;recursive:=false;lib:=true;filter:=!${slf4jBinding},\ |
|
0 commit comments