From 921c8e8ef7c1fb90d31d2a9f882d935cba9e5e94 Mon Sep 17 00:00:00 2001
From: Jonathan Breedlove <breedloj@amazon.com>
Date: Tue, 25 Feb 2025 14:17:03 -0800
Subject: [PATCH 1/3] Fix build path issues due to conflict with Tycho and OSGI
 builds

---
 plugin/build.properties          |  1 -
 plugin/build/syncDependencies.sh |  2 +-
 plugin/pom.xml                   | 17 ++++++++++++++++-
 pom.xml                          |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/plugin/build.properties b/plugin/build.properties
index 0668b00f..cb3ad8c7 100644
--- a/plugin/build.properties
+++ b/plugin/build.properties
@@ -3,7 +3,6 @@ output.. = target/classes
 bin.includes = plugin.xml,\
                META-INF/,\
                icons/,\
-               target/classes/,\
                webview/build/,\
                target/dependency/,\
                codegen-resources/
diff --git a/plugin/build/syncDependencies.sh b/plugin/build/syncDependencies.sh
index d9a46cc4..2e6ce98a 100755
--- a/plugin/build/syncDependencies.sh
+++ b/plugin/build/syncDependencies.sh
@@ -19,7 +19,7 @@ if [ ! -f "$manifest_file" ]; then
 fi
 
 # Initialize the Bundle-Classpath entry
-bundle_classpath="Bundle-Classpath: target/classes/,\n"
+bundle_classpath="Bundle-Classpath: .,\n"
 
 # Loop through the JAR files in the dependency directory
 for jar in "$dependency_dir"/*.jar; do
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 5ec2d85a..846c3f36 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -17,7 +17,7 @@
         <aws.java.sdk.version>2.28.26</aws.java.sdk.version>
         <node.version>v20.9.0</node.version>
         <npm.version>10.1.0</npm.version>
-        <jackson.version>2.17.2</jackson.version>
+        <jackson.version>2.17.3</jackson.version>
         <maven.compiler.release>17</maven.compiler.release>
         <junit.version>5.11.3</junit.version>
     </properties>
@@ -137,6 +137,21 @@
                     <pomDependencies>consider</pomDependencies>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-packaging-plugin</artifactId>
+                <version>${tycho.version}</version>
+                <configuration>
+                    <additionalFileSets>
+                     <fileSet>
+                      <directory>${project.build.directory}/classes/</directory>
+                      <includes>
+                       <include>**/*</include>
+                      </includes>
+                     </fileSet>
+                    </additionalFileSets>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <version>3.8.0</version>
diff --git a/pom.xml b/pom.xml
index 0190ac67..8b1a1dc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <tycho.version>4.0.8</tycho.version>
+        <tycho.version>4.0.11</tycho.version>
         <maven.resource.version>3.3.1</maven.resource.version>
     </properties>
 

From e4313f576e905f5793ceb0c5bfa669cc197f0d9d Mon Sep 17 00:00:00 2001
From: Jonathan Breedlove <breedloj@amazon.com>
Date: Tue, 25 Feb 2025 16:16:28 -0800
Subject: [PATCH 2/3] Add tst to sources

---
 plugin/.classpath           | 63 ++++++++++++++++++++++++++++++-------
 plugin/META-INF/MANIFEST.MF |  2 +-
 plugin/build.properties     |  2 +-
 pom.xml                     |  1 -
 4 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/plugin/.classpath b/plugin/.classpath
index d541b7d8..1e9ec8ec 100644
--- a/plugin/.classpath
+++ b/plugin/.classpath
@@ -1,35 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
-			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="src" output="target/classes" path="src">
 		<attributes>
+			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+	<classpathentry kind="src" output="target/classes" path="target/generated-sources">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="tst">
 		<attributes>
 			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+	<classpathentry exported="true" kind="lib" path="target/dependency/annotations.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/apache-client.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/auth.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/aws-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/aws-json-protocol.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/checksums-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/checksums.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/cognitoidentity.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/commons-codec.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/delight-rhino-sandbox.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/endpoints-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/http-auth-aws-eventstream.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/http-auth-aws.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/http-auth-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/http-auth.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/http-client-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/httpclient.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/httpcore.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/identity-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/jackson-annotations.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/jackson-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/jackson-databind.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/jakarta.inject-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/jna-platform.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/jna.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/json-utils.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/maven-artifact.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/metrics-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/netty-nio-client.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/nimbus-jose-jwt.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/profiles.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/protocol-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/proxy-vole.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/reactive-streams.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/regions.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/retries-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/retries.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/rxjava.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/sdk-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/slf4j-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/third-party-jackson-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/dependency/utils.jar"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
-			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="main/resources/|test/resources/" kind="src" path="src"/>
-	<classpathentry kind="src" path="target/generated-sources"/>
 	<classpathentry kind="output" path="target/classes"/>
-</classpath>
\ No newline at end of file
+</classpath>
diff --git a/plugin/META-INF/MANIFEST.MF b/plugin/META-INF/MANIFEST.MF
index 9ff16a34..d17c452f 100644
--- a/plugin/META-INF/MANIFEST.MF
+++ b/plugin/META-INF/MANIFEST.MF
@@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.31.0",
  org.apache.commons.logging;bundle-version="1.2.0",
  slf4j.api;bundle-version="2.0.13",
  org.apache.commons.lang3;bundle-version="3.14.0"
-Bundle-Classpath: target/classes/,
+Bundle-Classpath: .,
  target/dependency/annotations.jar,
  target/dependency/apache-client.jar,
  target/dependency/auth.jar,
diff --git a/plugin/build.properties b/plugin/build.properties
index cb3ad8c7..bc1bd6c9 100644
--- a/plugin/build.properties
+++ b/plugin/build.properties
@@ -1,4 +1,4 @@
-source.. = src/, target/generated-sources
+source.. = src/, target/generated-sources, tst/
 output.. = target/classes
 bin.includes = plugin.xml,\
                META-INF/,\
diff --git a/pom.xml b/pom.xml
index 8b1a1dc0..c1ac2fe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,6 @@
             <layout>p2</layout>
             <url>https://download.eclipse.org/releases/2024-06</url>
         </repository>
-
     </repositories>
 
     <build>

From f5d7c09edc725662c4302e66f8326d3c2ed8bf60 Mon Sep 17 00:00:00 2001
From: Jonathan Breedlove <breedloj@amazon.com>
Date: Tue, 25 Feb 2025 16:29:10 -0800
Subject: [PATCH 3/3] Remove explicit src mapping to tst directory

---
 plugin/.classpath       | 63 +++++++----------------------------------
 plugin/build.properties |  2 +-
 2 files changed, 12 insertions(+), 53 deletions(-)

diff --git a/plugin/.classpath b/plugin/.classpath
index 1e9ec8ec..d541b7d8 100644
--- a/plugin/.classpath
+++ b/plugin/.classpath
@@ -1,76 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" output="target/classes" path="src">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
-			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/classes" path="target/generated-sources">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
-			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="tst">
 		<attributes>
 			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="target/dependency/annotations.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/apache-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/auth.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/aws-core.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/aws-json-protocol.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/checksums-spi.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/checksums.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/cognitoidentity.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/commons-codec.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/delight-rhino-sandbox.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/endpoints-spi.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/http-auth-aws-eventstream.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/http-auth-aws.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/http-auth-spi.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/http-auth.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/http-client-spi.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/httpclient.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/httpcore.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/identity-spi.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/jackson-annotations.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/jackson-core.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/jackson-databind.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/jakarta.inject-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/jna-platform.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/jna.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/json-utils.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/maven-artifact.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/metrics-spi.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/netty-nio-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/nimbus-jose-jwt.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/profiles.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/protocol-core.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/proxy-vole.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/reactive-streams.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/regions.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/retries-spi.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/retries.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/rxjava.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/sdk-core.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/slf4j-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/third-party-jackson-core.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/dependency/utils.jar"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="main/resources/|test/resources/" kind="src" path="src"/>
+	<classpathentry kind="src" path="target/generated-sources"/>
 	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+</classpath>
\ No newline at end of file
diff --git a/plugin/build.properties b/plugin/build.properties
index bc1bd6c9..cb3ad8c7 100644
--- a/plugin/build.properties
+++ b/plugin/build.properties
@@ -1,4 +1,4 @@
-source.. = src/, target/generated-sources, tst/
+source.. = src/, target/generated-sources
 output.. = target/classes
 bin.includes = plugin.xml,\
                META-INF/,\