From 220abf33999b2208ea9d48a19a79707712550ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Sun, 4 Feb 2024 12:06:57 +0100
Subject: [PATCH] Adjust maven metadata to the ones actually published to
 central

Currently the project is configured to use the org.eclipse.equinox.p2
group id but it is actually published to org.eclipse.platform. That is
both confusing and makes the metadata in p2 pointless and not allows to
use local build artifacts (e.g. for Tycho).

This changes the group id and configures the update-consumer-pom to
create a pom that can be used in a local maven setup similar to one
published on maven central.
---
 .gitignore                                   |  1 +
 .mvn/maven.config                            |  1 +
 bundles/org.eclipse.equinox.p2.tests/pom.xml |  4 ++--
 examples/pom.xml                             |  2 +-
 pom.xml                                      | 14 +++++++++++++-
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 74484d40d3..4fdf5c5632 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ bin/
 .META-INF_*
 pom.tycho
 .tycho-consumer-pom.xml
+.flattened-pom.xml
 apiAnalyzer-workspace/
\ No newline at end of file
diff --git a/.mvn/maven.config b/.mvn/maven.config
index 8b6bb37cc3..55539b0bd9 100644
--- a/.mvn/maven.config
+++ b/.mvn/maven.config
@@ -1,2 +1,3 @@
 -Pbuild-individual-bundles
 -Dtycho.surefire.deleteWorkDir=true
+-Dtycho.localArtifacts=ignore
diff --git a/bundles/org.eclipse.equinox.p2.tests/pom.xml b/bundles/org.eclipse.equinox.p2.tests/pom.xml
index 41df5dfeac..c9b3ebafe2 100644
--- a/bundles/org.eclipse.equinox.p2.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/pom.xml
@@ -8,7 +8,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.eclipse.equinox.p2</groupId>
+		<groupId>org.eclipse.platform</groupId>
 		<artifactId>rt.equinox.p2</artifactId>
 		<version>${releaseVersion}${qualifier}</version>
 		<relativePath>../../</relativePath>
@@ -39,7 +39,7 @@
 	<dependencies>
 		<!-- The tests require the reconciler product -->
 		<dependency>
-			<groupId>org.eclipse.equinox.p2</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>org.eclipse.equinox.p2.reconciler</artifactId>
 			<version>1.1.0-SNAPSHOT</version>
 			<type>pom</type>
diff --git a/examples/pom.xml b/examples/pom.xml
index 5cdc27872f..e5110a62c8 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.equinox.p2</groupId>
+    <groupId>org.eclipse.platform</groupId>
     <artifactId>rt.equinox.p2</artifactId>
     <version>${releaseVersion}${qualifier}</version>
     <relativePath>../pom.xml</relativePath>
diff --git a/pom.xml b/pom.xml
index 030bb67d15..7cbc22851f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <relativePath>../eclipse-platform-parent</relativePath>
   </parent>
 
-  <groupId>org.eclipse.equinox.p2</groupId>
+  <groupId>org.eclipse.platform</groupId>
   <artifactId>rt.equinox.p2</artifactId>
   <packaging>pom</packaging>
   <version>${releaseVersion}${qualifier}</version>
@@ -128,6 +128,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-packaging-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-update-consumer-pom</id>
+            <configuration>
+				<skipPomGeneration>false</skipPomGeneration>
+			</configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>