From 534382a86dfc10c53b655667bcb314c1c888beef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Sun, 10 Nov 2024 14:58:45 +0100
Subject: [PATCH] Embed the google cache dependency in the bundle
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Guava is known as a bit "problematic" dependency, as lemminx only uses
guava-cache, this can be embedded in the bundle and be made embedded
package.

This changes the used felix-bundle to bnd-maven-plugin with the
conditionalpackage to include the caching api in the generated bundle

Signed-off-by: Christoph Läubrich <laeubi@laeubi-soft.de>
---
 org.eclipse.lemminx/pom.xml                   | 19 +++++++++++++++---
 .../src/main/resources/about.html             | 15 ++++++++++++++
 pom.xml                                       | 20 +++----------------
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/org.eclipse.lemminx/pom.xml b/org.eclipse.lemminx/pom.xml
index cb2518148..3060131c8 100644
--- a/org.eclipse.lemminx/pom.xml
+++ b/org.eclipse.lemminx/pom.xml
@@ -72,13 +72,26 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>bnd-process</id>
+						<goals>
+							<goal>bnd-process</goal>
+						</goals>
+						<configuration>
+							<bnd><![CDATA[ 
+							Bundle-SymbolicName: ${project.artifactId}
+							-conditionalpackage: com.google.common.cache
+							]]></bnd>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<goals>
diff --git a/org.eclipse.lemminx/src/main/resources/about.html b/org.eclipse.lemminx/src/main/resources/about.html
index b31348652..b1fc5739e 100644
--- a/org.eclipse.lemminx/src/main/resources/about.html
+++ b/org.eclipse.lemminx/src/main/resources/about.html
@@ -32,6 +32,21 @@ <h3>License</h3>
 		code in the Content and such source code may be obtained at <a
 			href="https://www.eclipse.org/">https://www.eclipse.org</a>.
 	</p>
+	
+	<p>
+		The content in the package <code>com.google.common.cache</code> is 
+		licensed under the Apache License, Version 2.0 (the "License");
+		you may not use this except in compliance with the License.
+		You may obtain a copy of the License at
+
+		    http://www.apache.org/licenses/LICENSE-2.0
+
+		Unless required by applicable law or agreed to in writing, software
+		distributed under the License is distributed on an "AS IS" BASIS,
+		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+		See the License for the specific language governing permissions and
+		limitations under the License.
+	</p>
 
 </body>
 
diff --git a/pom.xml b/pom.xml
index 99b9ebfe5..1c51d8bdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,23 +159,9 @@
 					</configuration>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.felix</groupId>
-					<artifactId>maven-bundle-plugin</artifactId>
-					<version>5.1.9</version>
-					<executions>
-						<execution>
-							<id>bundle-manifest</id>
-							<phase>process-classes</phase>
-							<goals>
-								<goal>manifest</goal>
-							</goals>
-							<configuration>
-								<instructions>
-									<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-								</instructions>
-							</configuration>
-						</execution>
-					</executions>
+				    <groupId>biz.aQute.bnd</groupId>
+				    <artifactId>bnd-maven-plugin</artifactId>
+				    <version>6.4.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>