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: I601d2d9ec1a016f84806eeb13aa6673c5473a8b4
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.text/+/190242
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Mickael Istria <mistria@redhat.com>
diff --git a/org.eclipse.core.filebuffers.tests/pom.xml b/org.eclipse.core.filebuffers.tests/pom.xml
index fb16131..35ffef0 100644
--- a/org.eclipse.core.filebuffers.tests/pom.xml
+++ b/org.eclipse.core.filebuffers.tests/pom.xml
@@ -12,12 +12,11 @@
<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>
- <artifactId>tests-pom</artifactId>
- <groupId>eclipse.platform.text</groupId>
+ <artifactId>text-tests-pom</artifactId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
<relativePath>../tests-pom/</relativePath>
</parent>
- <groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.filebuffers.tests</artifactId>
<version>3.12.100-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
diff --git a/org.eclipse.jface.text.examples/pom.xml b/org.eclipse.jface.text.examples/pom.xml
index 58c3f6d..7d28eae 100644
--- a/org.eclipse.jface.text.examples/pom.xml
+++ b/org.eclipse.jface.text.examples/pom.xml
@@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>eclipse.platform.text</artifactId>
- <groupId>eclipse.platform.text</groupId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.core</groupId>
diff --git a/org.eclipse.jface.text.tests/pom.xml b/org.eclipse.jface.text.tests/pom.xml
index 85221c5..130811f 100644
--- a/org.eclipse.jface.text.tests/pom.xml
+++ b/org.eclipse.jface.text.tests/pom.xml
@@ -12,8 +12,8 @@
<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>
- <artifactId>tests-pom</artifactId>
- <groupId>eclipse.platform.text</groupId>
+ <artifactId>text-tests-pom</artifactId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
<relativePath>../tests-pom/</relativePath>
</parent>
diff --git a/org.eclipse.search.tests/pom.xml b/org.eclipse.search.tests/pom.xml
index 2a3f2b2..1a31352 100644
--- a/org.eclipse.search.tests/pom.xml
+++ b/org.eclipse.search.tests/pom.xml
@@ -12,12 +12,11 @@
<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>
- <artifactId>tests-pom</artifactId>
- <groupId>eclipse.platform.text</groupId>
+ <artifactId>text-tests-pom</artifactId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
<relativePath>../tests-pom/</relativePath>
</parent>
- <groupId>org.eclipse.search</groupId>
<artifactId>org.eclipse.search.tests</artifactId>
<version>3.10.100-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
diff --git a/org.eclipse.text.quicksearch.tests/pom.xml b/org.eclipse.text.quicksearch.tests/pom.xml
index 9f387a0..c8284e0 100644
--- a/org.eclipse.text.quicksearch.tests/pom.xml
+++ b/org.eclipse.text.quicksearch.tests/pom.xml
@@ -17,12 +17,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>tests-pom</artifactId>
- <groupId>eclipse.platform.text</groupId>
+ <artifactId>text-tests-pom</artifactId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
<relativePath>../tests-pom/</relativePath>
</parent>
- <groupId>org.eclipse.text</groupId>
<artifactId>org.eclipse.text.quicksearch.tests</artifactId>
<version>1.1.200-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
diff --git a/org.eclipse.text.tests/pom.xml b/org.eclipse.text.tests/pom.xml
index a13c84c..bf5ef11 100644
--- a/org.eclipse.text.tests/pom.xml
+++ b/org.eclipse.text.tests/pom.xml
@@ -12,12 +12,11 @@
<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>
- <artifactId>tests-pom</artifactId>
- <groupId>eclipse.platform.text</groupId>
+ <artifactId>text-tests-pom</artifactId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
<relativePath>../tests-pom/</relativePath>
</parent>
- <groupId>org.eclipse.text</groupId>
<artifactId>org.eclipse.text.tests</artifactId>
<version>3.13.100-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
diff --git a/org.eclipse.ui.editors.tests/pom.xml b/org.eclipse.ui.editors.tests/pom.xml
index dbbbfe8..55cd057 100644
--- a/org.eclipse.ui.editors.tests/pom.xml
+++ b/org.eclipse.ui.editors.tests/pom.xml
@@ -12,12 +12,11 @@
<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>
- <artifactId>tests-pom</artifactId>
- <groupId>eclipse.platform.text</groupId>
+ <artifactId>text-tests-pom</artifactId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
<relativePath>../tests-pom/</relativePath>
</parent>
- <groupId>org.eclipse.ui</groupId>
<artifactId>org.eclipse.ui.editors.tests</artifactId>
<version>3.12.400-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
diff --git a/org.eclipse.ui.genericeditor.tests/pom.xml b/org.eclipse.ui.genericeditor.tests/pom.xml
index 735c35c..82f2dc6 100644
--- a/org.eclipse.ui.genericeditor.tests/pom.xml
+++ b/org.eclipse.ui.genericeditor.tests/pom.xml
@@ -12,12 +12,11 @@
<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>
- <artifactId>tests-pom</artifactId>
- <groupId>eclipse.platform.text</groupId>
+ <artifactId>text-tests-pom</artifactId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
<relativePath>../tests-pom/</relativePath>
</parent>
- <groupId>org.eclipse.ui</groupId>
<artifactId>org.eclipse.ui.genericeditor.tests</artifactId>
<version>1.2.100-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
diff --git a/org.eclipse.ui.workbench.texteditor.tests/pom.xml b/org.eclipse.ui.workbench.texteditor.tests/pom.xml
index a5f5953..1e991db 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/pom.xml
+++ b/org.eclipse.ui.workbench.texteditor.tests/pom.xml
@@ -12,12 +12,11 @@
<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>
- <artifactId>tests-pom</artifactId>
- <groupId>eclipse.platform.text</groupId>
+ <artifactId>text-tests-pom</artifactId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
<relativePath>../tests-pom/</relativePath>
</parent>
- <groupId>org.eclipse.ui</groupId>
<artifactId>org.eclipse.ui.workbench.texteditor.tests</artifactId>
<version>3.13.100-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
diff --git a/pom.xml b/pom.xml
index ba5c2ee..7720bd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<relativePath>../eclipse-platform-parent</relativePath>
</parent>
- <groupId>eclipse.platform.text</groupId>
+ <groupId>org.eclipse.platform</groupId>
<artifactId>eclipse.platform.text</artifactId>
<packaging>pom</packaging>
diff --git a/tests-pom/pom.xml b/tests-pom/pom.xml
index 370a322..4095789 100644
--- a/tests-pom/pom.xml
+++ b/tests-pom/pom.xml
@@ -13,10 +13,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>eclipse.platform.text</artifactId>
- <groupId>eclipse.platform.text</groupId>
+ <groupId>org.eclipse.platform</groupId>
<version>4.23.0-SNAPSHOT</version>
</parent>
- <artifactId>tests-pom</artifactId>
+ <artifactId>text-tests-pom</artifactId>
<packaging>pom</packaging>
<properties>
<code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings>
