|
8 | 8 |
|
9 | 9 | SPDX-License-Identifier: EPL-2.0 |
10 | 10 | --> |
11 | | -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
| 11 | +<project xmlns="http://maven.apache.org/POM/4.0.0" |
| 12 | + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
12 | 13 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
13 | 14 | <modelVersion>4.0.0</modelVersion> |
14 | 15 |
|
|
28 | 29 | <properties> |
29 | 30 | <!-- maven core version --> |
30 | 31 | <maven-core.version>3.9.9</maven-core.version> |
31 | | - <!-- NOTE: When maven-core.version changes, this may impact the versions of the maven-resolver-* |
32 | | - jars that export the org.eclipse.aether.* packages in the org.eclipse.m2e.maven.runtime |
33 | | - bundle. So make sure the following variable has the value of the maven-resolver-* jars |
34 | | - https://bugs.eclipse.org/bugs/show_bug.cgi?id=529540 --> |
35 | | - <maven-resolver.version>1.9.22</maven-resolver.version> |
36 | | - <apache-commons-codec.version>1.16.1</apache-commons-codec.version><!-- Keep in sync with what maven includes--> |
37 | 32 | <!-- below are m2e-specific addons --> |
38 | 33 | <plexus-build-api.version>1.2.0</plexus-build-api.version> |
39 | 34 | <jars.directory>target/jars</jars.directory> |
|
42 | 37 | <buildqualifier.format>%Y%m%d-%H%M</buildqualifier.format> |
43 | 38 | </properties> |
44 | 39 | <dependencies> |
| 40 | + <!-- Excluded dependencies (or those that are 'provided' to effectivly remove |
| 41 | + them from the bundle) are fulfilled via the OSGi requirements specified below |
| 42 | + as Import-Package/Require-Bundle and therefore don't have to be |
| 43 | + embedded. Or they are not required. --> |
45 | 44 | <dependency> |
46 | 45 | <groupId>org.apache.maven</groupId> |
47 | 46 | <artifactId>maven-core</artifactId> |
48 | 47 | <exclusions> |
49 | | - <!-- Excluded dependencies are fulfilled via the OSGi requirements specified below as Import-Package/Require-Bundle and |
50 | | - therefore don't have to be embedded. Or they are not required. --> |
51 | 48 | <exclusion> |
52 | 49 | <groupId>org.checkerframework</groupId> |
53 | 50 | <artifactId>checker-compat-qual</artifactId> |
|
96 | 93 | <dependency> |
97 | 94 | <groupId>org.apache.maven.resolver</groupId> |
98 | 95 | <artifactId>maven-resolver-transport-http</artifactId> |
| 96 | + <exclusions> |
| 97 | + <exclusion> |
| 98 | + <groupId>commons-codec</groupId> |
| 99 | + <artifactId>commons-codec</artifactId> |
| 100 | + </exclusion> |
| 101 | + </exclusions> |
99 | 102 | </dependency> |
100 | 103 | <dependency> |
101 | 104 | <groupId>org.apache.maven.wagon</groupId> |
|
137 | 140 | <dependency> |
138 | 141 | <groupId>org.slf4j</groupId> |
139 | 142 | <artifactId>slf4j-api</artifactId> |
140 | | - <version>2.0.7</version> |
141 | | - <scope>provided</scope> |
142 | | - </dependency> |
143 | | - <dependency> |
144 | | - <groupId>commons-codec</groupId> |
145 | | - <artifactId>commons-codec</artifactId> |
146 | | - <version>${apache-commons-codec.version}</version> |
| 143 | + <version>2.0.16</version> |
147 | 144 | <scope>provided</scope> |
148 | 145 | </dependency> |
149 | 146 | <dependency> |
|
196 | 193 | org.apache.maven.*;provider=m2e;mandatory:=provider,\ |
197 | 194 | org.codehaus.plexus.*;provider=m2e;mandatory:=provider,\ |
198 | 195 | org.sonatype.plexus.*;provider=m2e;mandatory:=provider,\ |
199 | | - org.eclipse.aether.*;provider=m2e;mandatory:=provider;version=${maven-resolver.version},\ |
| 196 | + org.eclipse.aether.*;provider=m2e;mandatory:=provider,\ |
200 | 197 | com.google.inject.*;provider=m2e;mandatory:=provider,\ |
201 | 198 | org.apache.maven.wagon.*;provider=m2e;mandatory:=provider,\ |
202 | | - org.eclipse.sisu.*;provider=m2e;mandatory:=provider;version=${maven-resolver.version} |
| 199 | + org.eclipse.sisu.*;provider=m2e;mandatory:=provider |
203 | 200 | Import-Package: \ |
204 | 201 | org.slf4j;version="[1.7.31,3.0.0)",\ |
205 | 202 | org.slf4j.*;version="[1.7.31,3.0.0)",\ |
|
0 commit comments