Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2022-02-01 15:08:25 +0000
committerMickael Istria2022-02-01 15:29:40 +0000
commit9904c7b88ffdb457e05145c5c9f5601bcf6ed882 (patch)
tree664a37abf2c9f91bb054e56d64886e87bdadb5ff
parenta74c8f02483606912faf8269d8068b1bd8c5846b (diff)
downloadeclipse.platform.text-9904c7b88ffdb457e05145c5c9f5601bcf6ed882.tar.gz
eclipse.platform.text-9904c7b88ffdb457e05145c5c9f5601bcf6ed882.tar.xz
eclipse.platform.text-9904c7b88ffdb457e05145c5c9f5601bcf6ed882.zip
Bug 578449 - Use same groupId in production pom than in consumerI20220201-1800
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>
-rw-r--r--org.eclipse.core.filebuffers.tests/pom.xml5
-rw-r--r--org.eclipse.jface.text.examples/pom.xml2
-rw-r--r--org.eclipse.jface.text.tests/pom.xml4
-rw-r--r--org.eclipse.search.tests/pom.xml5
-rw-r--r--org.eclipse.text.quicksearch.tests/pom.xml5
-rw-r--r--org.eclipse.text.tests/pom.xml5
-rw-r--r--org.eclipse.ui.editors.tests/pom.xml5
-rw-r--r--org.eclipse.ui.genericeditor.tests/pom.xml5
-rw-r--r--org.eclipse.ui.workbench.texteditor.tests/pom.xml5
-rw-r--r--pom.xml2
-rw-r--r--tests-pom/pom.xml4
11 files changed, 20 insertions, 27 deletions
diff --git a/org.eclipse.core.filebuffers.tests/pom.xml b/org.eclipse.core.filebuffers.tests/pom.xml
index fb161315a91..35ffef035b7 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 58c3f6d90e9..7d28eae0762 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 85221c5d35a..130811feda9 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 2a3f2b21f48..1a31352af5c 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 9f387a0b5bc..c8284e02ad0 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 a13c84cafd5..bf5ef11759b 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 dbbbfe803a2..55cd057fb9c 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 735c35c4ccd..82f2dc63ff8 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 a5f5953118f..1e991db2e65 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 ba5c2ee007e..7720bd211a8 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 370a322c202..40957891b9b 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>

Back to the top