From 24a3efec15118149ef88df1ea7a30ca3c7ce4f83 Mon Sep 17 00:00:00 2001
From: Martin Lippert <lippertm@vmware.com>
Date: Thu, 5 Jan 2023 14:26:05 +0100
Subject: [PATCH] updating language server plugin builds to tycho 3.0.0

---
 eclipse-distribution/pom.xml                  |  2 +-
 .../META-INF/MANIFEST.MF                      |  6 +--
 eclipse-language-servers/pom.xml              | 39 +++++++------------
 headless-services/jdt-ls-extension/pom.xml    | 35 +++++++----------
 4 files changed, 32 insertions(+), 50 deletions(-)

diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 45633033b..2c825abeb 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -1032,7 +1032,7 @@
 								<arch>aarch64</arch>
 							</environment>
 						</environments>
-			</configuration>
+					</configuration>
 				</plugin>
 
 				<plugin>
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF
index 29d952344..c861b06ef 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@ Bundle-Vendor: VMware, Inc.
 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
  org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.lsp4e;bundle-version="0.9.0",
- org.eclipse.lsp4j.jsonrpc;bundle-version="0.6.0",
- org.eclipse.lsp4j;bundle-version="0.6.0",
+ org.eclipse.lsp4e;bundle-version="0.16.0",
+ org.eclipse.lsp4j.jsonrpc;bundle-version="0.19.0",
+ org.eclipse.lsp4j;bundle-version="0.19.0",
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.jface.text,
  com.google.guava,
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index dbc68e7db..9c53fa06a 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -87,7 +87,7 @@
 		<!-- OSX app signing -->
 		<skip.osx.signing>true</skip.osx.signing>
 
-		<tycho-version>2.7.5</tycho-version>
+		<tycho-version>3.0.1</tycho-version>
 		<encoding>UTF-8</encoding>
 
 		<dist.accessKey>${env.bamboo_tools_s3_accesskey_password}</dist.accessKey>
@@ -282,16 +282,16 @@
 				<package.qualifierPrefix>e426</package.qualifierPrefix>
 			</properties>
 			<repositories>
-<!--				<repository>
+				<repository>
 					<id>2022-12</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/releases/2022-12/</url>
-				</repository> -->
-				<repository>
+				</repository>
+<!--				<repository>
 					<id>2022-12-staging</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/staging/2022-12/</url>
-				</repository>
+				</repository> -->
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
@@ -368,11 +368,11 @@
 			<name>Spring Repository</name>
 			<url>https://repo.spring.io/release/</url>
 		</pluginRepository>
-		<pluginRepository>
+<!--		<pluginRepository>
 			<id>spring-maven-plugin-release</id>
 			<name>Spring Repository</name>
 			<url>https://repo.spring.io/plugins-release/</url>
-		</pluginRepository>
+		</pluginRepository> -->
 
 		<pluginRepository>
 			<id>springsource-maven-release</id>
@@ -380,10 +380,10 @@
 			<url>https://repository.springsource.com/maven/bundles/release</url>
 		</pluginRepository>
 
-		<pluginRepository>
+<!--		<pluginRepository>
 			<id>sonatype.snapshots</id>
 			<url>https://repository.sonatype.org/content/repositories/snapshots/</url>
-		</pluginRepository>
+		</pluginRepository> -->
 	</pluginRepositories>
 
 	<build>
@@ -397,21 +397,6 @@
 
 		<plugins>
 
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>source-feature</id>
-						<phase>package</phase>
-						<goals>
-							<goal>source-feature</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
@@ -423,6 +408,12 @@
 							<goal>plugin-source</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>feature-source</id>
+						<goals>
+							<goal>feature-source</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/headless-services/jdt-ls-extension/pom.xml b/headless-services/jdt-ls-extension/pom.xml
index 36efa8d08..78530cd88 100644
--- a/headless-services/jdt-ls-extension/pom.xml
+++ b/headless-services/jdt-ls-extension/pom.xml
@@ -45,7 +45,7 @@
 	</modules>
 
 	<properties>
-		<tycho-version>2.7.5</tycho-version>
+		<tycho-version>3.0.1</tycho-version>
 
 		<!-- Signing -->
 		<signing.skip>true</signing.skip>
@@ -66,9 +66,9 @@
 	<repositories>
 		<!-- composite update site contains http references, using exact https urls instead -->
 		<repository>
-			<id>eclipse-2020-09</id>
+			<id>eclipse-2022-09</id>
 			<layout>p2</layout>
-			<url>https://download.eclipse.org/releases/2022-12</url>
+			<url>https://download.eclipse.org/releases/2022-09</url>
 		</repository>
 
 		<repository>
@@ -83,15 +83,15 @@
 		<repository>
 			<id>specific orbit</id>
 			<layout>p2</layout>
-			<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository</url>
+			<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository</url>
 		</repository>
 
-		<repository>
+<!--		<repository>
 			<id>jboss-apt</id>
 			<layout>p2</layout>
-			<!--URL copied from jdt.ls target platform file, needed to satisfy some of its dependencies -->
+			URL copied from jdt.ls target platform file, needed to satisfy some of its dependencies
 			<url>https://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.0-2018-08-14_20-24-39-H12/</url>
-		</repository>
+		</repository> -->
 		<repository>
 			<id>p2-thirdparty-bundles</id>
 			<layout>p2</layout>
@@ -101,21 +101,6 @@
 	<build>
 		<plugins>
 
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>source-feature</id>
-						<phase>package</phase>
-						<goals>
-							<goal>source-feature</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
@@ -127,6 +112,12 @@
 							<goal>plugin-source</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>feature-source</id>
+						<goals>
+							<goal>feature-source</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>