Skip to content

Commit 1011789

Browse files
committed
[Maven-Runtime] Ensure Guava is just referenced and not embedded
Since version 3.9 org.apache.maven:maven-embedder also references guava and therefore guava slipped again into the m2e.maven.runtime unnoticed. This change removes it again and ensures it cannot come back. This reduces the size of the (unzipped) m2e.maven.runtime about 3MB.
1 parent ebff32c commit 1011789

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

org.eclipse.m2e.feature/forceQualifierUpdate.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Update build-qualifier because maven-runtime components currently use the commit
33
Update build-qualifier because maven-runtime components now use again UTC+0-based qualifiers.
44
Move o.e.m2e.maven.runtime to m2e's git-repo root
55
Update build-qualifier because maven-runtime version update to Maven 3.9.4
6+
Ensure Guava is not embedded but referenced by the m2e.maven.runtime

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@
4949
<exclusions>
5050
<!-- Excluded dependencies are fulfilled via the OSGi requirements specified below as Import-Package/Require-Bundle and
5151
therefore don't have to be embedded. Or they are not required. -->
52-
<exclusion>
53-
<groupId>com.google.guava</groupId>
54-
<artifactId>guava</artifactId>
55-
</exclusion>
5652
<exclusion>
5753
<groupId>org.checkerframework</groupId>
5854
<artifactId>checker-compat-qual</artifactId>
@@ -128,6 +124,16 @@
128124
<version>[1.0.0,)</version>
129125
<scope>provided</scope>
130126
</dependency>
127+
<dependency>
128+
<groupId>com.google.guava</groupId>
129+
<artifactId>guava</artifactId>
130+
<scope>provided</scope>
131+
</dependency>
132+
<dependency>
133+
<groupId>com.google.guava</groupId>
134+
<artifactId>failureaccess</artifactId>
135+
<scope>provided</scope>
136+
</dependency>
131137
<dependency>
132138
<groupId>org.slf4j</groupId>
133139
<artifactId>slf4j-api</artifactId>

0 commit comments

Comments
 (0)