From d3f881142493edeb26c9c34220d2cbba26da3704 Mon Sep 17 00:00:00 2001
From: Peter Most <pmost@pera-software.com>
Date: Tue, 7 Nov 2023 13:57:42 +0100
Subject: [PATCH] build: Store jar dependencies in manifest class path

---
 java_indexer/pom.xml                 | 95 ++++++++++++++++------------
 project/.gitignore                   |  1 +
 src/lib_java/utility/utilityJava.cpp | 20 +-----
 3 files changed, 56 insertions(+), 60 deletions(-)

diff --git a/java_indexer/pom.xml b/java_indexer/pom.xml
index 148756923..435d993ee 100644
--- a/java_indexer/pom.xml
+++ b/java_indexer/pom.xml
@@ -11,7 +11,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
-    <build>
+	<build>
 		<!-- The Java indexer expects the name 'java-indexer.jar' (no underscore) in the 'lib' directory! -->
 		<finalName>java-indexer</finalName>
 		<plugins>
@@ -44,6 +44,17 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
 			<plugin>
 				<!-- Update/Check dependencies/plugins with:
 				Update dependencies: "mvn versions:use-latest-releases"
@@ -54,7 +65,7 @@
 				<version>2.15.0</version>
 			</plugin>
 		</plugins>
-    </build>
+	</build>
 
 	<repositories>
 		<repository>
@@ -68,7 +79,7 @@
 			<url>https://repo.gradle.org/gradle/libs-releases-local</url>
 		</repository>
 	</repositories>
-	
+
 	<dependencies>
 		<dependency>
 			<groupId>org.gradle</groupId>
@@ -76,59 +87,59 @@
 			<version>6.7.1</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.eclipse.platform</groupId>
-		    <artifactId>org.eclipse.core.commands</artifactId>
-		    <version>3.9.800</version>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.core.commands</artifactId>
+			<version>3.9.800</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.eclipse.platform</groupId>
-		    <artifactId>org.eclipse.core.contenttype</artifactId>
-		    <version>3.7.800</version>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.core.contenttype</artifactId>
+			<version>3.7.800</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.eclipse.platform</groupId>
-		    <artifactId>org.eclipse.core.expressions</artifactId>
-		    <version>3.7.0</version>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.core.expressions</artifactId>
+			<version>3.7.0</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.eclipse.platform</groupId>
-		    <artifactId>org.eclipse.core.filesystem</artifactId>
-		    <version>1.7.700</version>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.core.filesystem</artifactId>
+			<version>1.7.700</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.eclipse.platform</groupId>
-		    <artifactId>org.eclipse.core.jobs</artifactId>
-		    <version>3.10.1000</version>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.core.jobs</artifactId>
+			<version>3.10.1000</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.eclipse.platform</groupId>
-		    <artifactId>org.eclipse.core.resources</artifactId>
-		    <version>3.13.900</version>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.core.resources</artifactId>
+			<version>3.13.900</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.eclipse.platform</groupId>
-		    <artifactId>org.eclipse.core.runtime</artifactId>
-		    <version>3.20.0</version>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.core.runtime</artifactId>
+			<version>3.20.0</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.eclipse.platform</groupId>
-		    <artifactId>org.eclipse.equinox.app</artifactId>
-		    <version>1.5.0</version>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.equinox.app</artifactId>
+			<version>1.5.0</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.eclipse.platform</groupId>
-		    <artifactId>org.eclipse.equinox.common</artifactId>
-		    <version>3.14.0</version>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.equinox.common</artifactId>
+			<version>3.14.0</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.eclipse.platform</groupId>
-		    <artifactId>org.eclipse.equinox.preferences</artifactId>
-		    <version>3.8.100</version>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.equinox.preferences</artifactId>
+			<version>3.8.100</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.eclipse.platform</groupId>
-		    <artifactId>org.eclipse.equinox.registry</artifactId>
-		    <version>3.10.0</version>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.equinox.registry</artifactId>
+			<version>3.10.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
@@ -136,14 +147,14 @@
 			<version>3.24.0</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.eclipse.platform</groupId>
-		    <artifactId>org.eclipse.osgi</artifactId>
-		    <version>3.16.100</version>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<version>3.16.100</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.eclipse.platform</groupId>
-		    <artifactId>org.eclipse.text</artifactId>
-		    <version>3.10.400</version>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.text</artifactId>
+			<version>3.10.400</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
diff --git a/project/.gitignore b/project/.gitignore
index 2c9d9e8ac..c408bfe0a 100644
--- a/project/.gitignore
+++ b/project/.gitignore
@@ -1,2 +1,3 @@
 *.srctrlbm
 *.srctrldb
+sourcetrail_dependencies
diff --git a/src/lib_java/utility/utilityJava.cpp b/src/lib_java/utility/utilityJava.cpp
index 2ea12a833..fefb56d23 100644
--- a/src/lib_java/utility/utilityJava.cpp
+++ b/src/lib_java/utility/utilityJava.cpp
@@ -18,24 +18,8 @@ namespace utility
 std::vector<std::wstring> getRequiredJarNames()
 {
 	return {
-		L"gradle-tooling-api-6.7.1.jar",
-		L"java-indexer.jar",
-		L"org.eclipse.core.commands-3.9.800.jar",
-		L"org.eclipse.core.contenttype-3.7.800.jar",
-		L"org.eclipse.core.expressions-3.7.0.jar",
-		L"org.eclipse.core.filesystem-1.7.700.jar",
-		L"org.eclipse.core.jobs-3.10.1000.jar",
-		L"org.eclipse.core.resources-3.13.900.jar",
-		L"org.eclipse.core.runtime-3.20.0.jar",
-		L"org.eclipse.equinox.app-1.5.0.jar",
-		L"org.eclipse.equinox.common-3.14.0.jar",
-		L"org.eclipse.equinox.preferences-3.8.100.jar",
-		L"org.eclipse.equinox.registry-3.10.0.jar",
-		L"org.eclipse.jdt.core-3.24.0.jar",
-		L"org.eclipse.osgi-3.16.100.jar",
-		L"org.eclipse.text-3.10.400.jar",
-		L"slf4j-api-1.7.28.jar",
-		L"slf4j-simple-1.7.30.jar"};
+		L"java-indexer.jar"
+	};
 }
 
 std::string prepareJavaEnvironment()