From 30e768ace8137d5da8f689ff5720c41e600be4b8 Mon Sep 17 00:00:00 2001
From: elchananarb <elchanan.arbiv@checkmarx.com>
Date: Sun, 9 Feb 2025 17:58:35 +0200
Subject: [PATCH 1/2] Eclipse Wrapper Support - Version Compatibility Update

---
 checkmarx-ast-eclipse-plugin-tests/pom.xml | 31 +++++++++++++++++++---
 pom.xml                                    | 16 ++++++-----
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/checkmarx-ast-eclipse-plugin-tests/pom.xml b/checkmarx-ast-eclipse-plugin-tests/pom.xml
index 09e8ebd4..adc8db52 100644
--- a/checkmarx-ast-eclipse-plugin-tests/pom.xml
+++ b/checkmarx-ast-eclipse-plugin-tests/pom.xml
@@ -29,14 +29,39 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>target-platform-configuration</artifactId>
+                <version>${tycho.version}</version>
+                <configuration>
+                    <executionEnvironment>JavaSE-17</executionEnvironment>
+                    <dependency-resolution>
+                        <extraRequirements>
+                            <requirement>
+                                <type>eclipse-plugin</type>
+                                <id>org.eclipse.equinox.event</id>
+                                <versionRange>0.0.0</versionRange>
+                            </requirement>
+                        </extraRequirements>
+                    </dependency-resolution>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.eclipse.tycho</groupId>
                 <artifactId>tycho-surefire-plugin</artifactId>
                 <version>${tycho.version}</version>
                 <configuration>
-                    <includes>
-                        <include>${test.includes}</include>
-                    </includes>
+                    <useUIHarness>true</useUIHarness>
+                    <useUIThread>false</useUIThread>
+                    <product>org.eclipse.sdk.ide</product>
+                    <application>org.eclipse.ui.ide.workbench</application>
+                    <dependencies>
+                        <dependency>
+                            <type>eclipse-plugin</type>
+                            <artifactId>org.eclipse.equinox.event</artifactId>
+                            <version>0.0.0</version>
+                        </dependency>
+                    </dependencies>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/pom.xml b/pom.xml
index 0eaf6fd2..1ea25341 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,10 +18,10 @@
 	</modules>
 
 	<properties>
-		<tycho.version>1.7.0</tycho.version>
+		<tycho.version>2.7.5</tycho.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 	</properties>
 
 	<build>
@@ -94,7 +94,7 @@
 				<artifactId>target-platform-configuration</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
-					<executionEnvironment>JavaSE-1.8</executionEnvironment>
+					<executionEnvironment>JavaSE-17</executionEnvironment>
 					<pomDependencies>consider</pomDependencies>
 					<environments>
 						<environment>
@@ -113,6 +113,8 @@
 							<arch>x86_64</arch>
 						</environment>
 					</environments>
+					<resolver>p2</resolver>
+					<ignoreTychoRepositories>true</ignoreTychoRepositories>
 				</configuration>
 			</plugin>
 
@@ -121,9 +123,9 @@
 
 	<repositories>
 		<repository>
-			<id>2019-09</id>
+			<id>2023-12</id>
 			<layout>p2</layout>
-			<url>https://download.eclipse.org/releases/2019-09</url>
+			<url>https://download.eclipse.org/releases/2023-12</url>
 		</repository>
 	</repositories>
 
@@ -131,7 +133,7 @@
 		<dependency>
 			<groupId>jakarta.inject</groupId>
 			<artifactId>jakarta.inject-api</artifactId>
-			<version>1.0.5</version>
+			<version>2.0.1</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.osgi</groupId>

From 11b6d504f2a0451d17bd5491b5dd05e14db8e6aa Mon Sep 17 00:00:00 2001
From: elchananarb <elchanan.arbiv@checkmarx.com>
Date: Sun, 9 Feb 2025 18:06:49 +0200
Subject: [PATCH 2/2] Update release.yml

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 66d21707..8c753e2c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -66,11 +66,11 @@ jobs:
           # Set outputs for future steps
           echo "TAG_NAME=$GH_RELEASE_TAG_NAME" >> $GITHUB_OUTPUT
 
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 8
+          java-version: 11
           
       - name: Cache local Maven repository
         uses: actions/cache@v3