Bug 578449 - Use same groupId in production pom than in consumer
Platform artifacts are published on Maven Central with
org.eclipse.platform
groupId.
To facilitate further work which could allow deploying to p2 and Maven
as
part of the same build, let's use the target/expected buildId directly
so
we don't have to generate a new one later.
artifactId is already 1-1 mapping.
Only versions would then be different between Maven (-SNAPSHOT) and p2
metadata
(.yyyyMMddhhmm)
Change-Id: Ibab8f4c3ce77d57784654b6a5a9abbb63a110228
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.runtime/+/190244
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Mickael Istria <mistria@redhat.com>
diff --git a/bundles/org.eclipse.core.jobs/pom.xml b/bundles/org.eclipse.core.jobs/pom.xml
index 6b9e53f..34bc3fb 100644
--- a/bundles/org.eclipse.core.jobs/pom.xml
+++ b/bundles/org.eclipse.core.jobs/pom.xml
@@ -14,11 +14,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>eclipse.platform.runtime</artifactId>
- <groupId>eclipse.platform.runtime</groupId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
- <groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.jobs</artifactId>
<version>3.12.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
diff --git a/pom.xml b/pom.xml
index 1da802c..decf832 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<relativePath>../eclipse-platform-parent</relativePath>
</parent>
- <groupId>eclipse.platform.runtime</groupId>
+ <groupId>org.eclipse.platform</groupId>
<artifactId>eclipse.platform.runtime</artifactId>
<packaging>pom</packaging>
diff --git a/tests/org.eclipse.core.contenttype.tests/pom.xml b/tests/org.eclipse.core.contenttype.tests/pom.xml
index ffd6658..e5104c1 100644
--- a/tests/org.eclipse.core.contenttype.tests/pom.xml
+++ b/tests/org.eclipse.core.contenttype.tests/pom.xml
@@ -14,10 +14,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>eclipse.platform.runtime.tests</artifactId>
- <groupId>eclipse.platform.runtime</groupId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
</parent>
- <groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.contenttype.tests</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
diff --git a/tests/org.eclipse.core.expressions.tests/pom.xml b/tests/org.eclipse.core.expressions.tests/pom.xml
index 52175e8..00177e9 100644
--- a/tests/org.eclipse.core.expressions.tests/pom.xml
+++ b/tests/org.eclipse.core.expressions.tests/pom.xml
@@ -14,10 +14,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>eclipse.platform.runtime.tests</artifactId>
- <groupId>eclipse.platform.runtime</groupId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
</parent>
- <groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.expressions.tests</artifactId>
<version>3.6.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
diff --git a/tests/org.eclipse.core.tests.harness/pom.xml b/tests/org.eclipse.core.tests.harness/pom.xml
index e5f8e7d..cafe313 100644
--- a/tests/org.eclipse.core.tests.harness/pom.xml
+++ b/tests/org.eclipse.core.tests.harness/pom.xml
@@ -14,10 +14,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>eclipse.platform.runtime.tests</artifactId>
- <groupId>eclipse.platform.runtime</groupId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
</parent>
- <groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.tests.harness</artifactId>
<version>3.12.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
diff --git a/tests/org.eclipse.core.tests.runtime/pom.xml b/tests/org.eclipse.core.tests.runtime/pom.xml
index 4768a7f..9f6deb8 100644
--- a/tests/org.eclipse.core.tests.runtime/pom.xml
+++ b/tests/org.eclipse.core.tests.runtime/pom.xml
@@ -15,10 +15,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>eclipse.platform.runtime.tests</artifactId>
- <groupId>eclipse.platform.runtime</groupId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
</parent>
- <groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.tests.runtime</artifactId>
<version>3.20.100-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
diff --git a/tests/org.eclipse.e4.core.tests/pom.xml b/tests/org.eclipse.e4.core.tests/pom.xml
index a8d5d66..a118e0c 100644
--- a/tests/org.eclipse.e4.core.tests/pom.xml
+++ b/tests/org.eclipse.e4.core.tests/pom.xml
@@ -14,10 +14,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>eclipse.platform.runtime.tests</artifactId>
- <groupId>eclipse.platform.runtime</groupId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
</parent>
- <groupId>org.eclipse.e4</groupId>
<artifactId>org.eclipse.e4.core.tests</artifactId>
<version>1.2.300-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
diff --git a/tests/pom.xml b/tests/pom.xml
index 06db5da..b972d49 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -13,7 +13,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>eclipse.platform.runtime</groupId>
+ <groupId>org.eclipse.platform</groupId>
<artifactId>eclipse.platform.runtime</artifactId>
<version>4.23.0-SNAPSHOT</version>
</parent>
