From 6183ee96aea9dbf03ae9cedc241d269882e41f4b Mon Sep 17 00:00:00 2001
From: Gunnar Wagenknecht <gunnar@wagenknecht.org>
Date: Mon, 11 Nov 2024 10:53:04 +0100
Subject: [PATCH] Relocate to subfolder

---
 .github/workflows/ci.yml                      |  4 +--
 releng/mavenparent/pom.xml                    | 29 ++++++-------------
 .../scip-bazel-language-server.product        |  0
 3 files changed, 11 insertions(+), 22 deletions(-)
 rename releng/products/{ => scip-bazel-ls}/scip-bazel-language-server.product (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e93ca3a3..7634d81d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -111,8 +111,8 @@ jobs:
         with:
           name: products
           path: |
-            releng/products/target/products/*.tar.gz
-            releng/products/target/products/*.zip
+            releng/products/scip-bazel-ls/target/products/*.tar.gz
+            releng/products/scip-bazel-ls/target/products/*.zip
           if-no-files-found: error
             
   event_file:
diff --git a/releng/mavenparent/pom.xml b/releng/mavenparent/pom.xml
index efa5fb48..73a701b2 100644
--- a/releng/mavenparent/pom.xml
+++ b/releng/mavenparent/pom.xml
@@ -42,17 +42,6 @@
 		<jgit.dirtyWorkingTree>error</jgit.dirtyWorkingTree>
 	</properties>
 
-	<!-- common plug-in repos for all modules -->
-	<pluginRepositories>
-		<!--
-    <pluginRepository>
-      <id>tycho-snapshots</id>
-      <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
-    </pluginRepository>
-    -->
-	</pluginRepositories>
-
-
 	<profiles>
 		<profile>
 			<!-- default buildType when running in CI -->
@@ -101,8 +90,7 @@
 							<artifactId>tycho-compiler-plugin</artifactId>
 							<version>${tycho.version}</version>
 							<configuration>
-								<!-- Note, BREE libraries and toolchain.xml must
-								be setup for this to work (it's done outside) -->
+								<!-- Note, BREE libraries and toolchain.xml must be setup for this to work (it's done outside) -->
 								<useJDK>BREE</useJDK>
 							</configuration>
 						</plugin>
@@ -175,8 +163,7 @@
 				<artifactId>target-platform-configuration</artifactId>
 				<configuration>
 					<target>
-						<!-- use target platform defined in
-						releng/target-platforms Git repo -->
+						<!-- use target platform defined in target-platform module -->
 						<!-- (note: name of target file must match artifactId) -->
 						<artifact>
 							<groupId>${project.groupId}</groupId>
@@ -282,8 +269,7 @@
 						fine in the IDE) -->
 						<compilerArgument>-warn:none</compilerArgument>
 						<compilerArguments>
-							<!-- use compiler settings from project (if
-							available) -->
+							<!-- use compiler settings from project (if available) -->
 							<properties>
 								${project.basedir}/.settings/org.eclipse.jdt.core.prefs</properties>
 							<verbose />
@@ -292,8 +278,6 @@
 							<encoding>${project.build.sourceEncoding}</encoding>
 							<log>${project.build.directory}/@dot.xml</log>
 							<!-- <proceedOnError/> -->
-							<!--
-							<annotationpath>${bazel-eclipse-feature-maven-parent.basedir}/../../.settings/non-null-annotations/</annotationpath> -->
 						</compilerArguments>
 						<showWarnings>true</showWarnings>
 						<excludeResources>
@@ -357,7 +341,7 @@
 					<configuration>
 						<products>
 							<product>
-								<!-- adjust configuration of products (https://github.com/eclipse-tycho/tycho/issues/913#issuecomment-1122529505) -->
+								<!-- adjust configuration of the language server product (https://github.com/eclipse-tycho/tycho/issues/913#issuecomment-1122529505) -->
 								<id>scip-bazel-language-server.product</id>
 								<archiveFileName>scip-bazel-ls</archiveFileName>
 								<rootFolder>scip-bazel-ls</rootFolder>
@@ -453,6 +437,11 @@
 					<artifactId>jacoco-maven-plugin</artifactId>
 					<version>${jacoco.version}</version>
 				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>build-helper-maven-plugin</artifactId>
+					<version>3.6.0</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
diff --git a/releng/products/scip-bazel-language-server.product b/releng/products/scip-bazel-ls/scip-bazel-language-server.product
similarity index 100%
rename from releng/products/scip-bazel-language-server.product
rename to releng/products/scip-bazel-ls/scip-bazel-language-server.product