Adjust Maven groupId to match the actual deployment - part 2

HannesWell · HannesWell · commit 33e1f6b1b9b4 · 2025-03-27T20:56:29.000+01:00
Follow-up on #1717
diff --git a/binaries/pom.xml b/binaries/pom.xml
@@ -17,12 +17,11 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>eclipse.platform.swt</groupId>
+		<groupId>org.eclipse.platform</groupId>
 		<artifactId>eclipse.platform.swt</artifactId>
 		<version>4.36.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.eclipse.swt</groupId>
 	<artifactId>eclipse.platform.swt.binaries</artifactId>
 	<packaging>pom</packaging>
 
diff --git a/bundles/org.eclipse.swt.tools.base/build.properties b/bundles/org.eclipse.swt.tools.base/build.properties
@@ -18,5 +18,4 @@ bin.includes = about.html,\
                .
 src.includes = about.html
 
-pom.model.groupId = org.eclipse.swt
 tycho.pomless.parent = ../../local-build/local-build-parent
diff --git a/bundles/org.eclipse.swt.tools.spies/build.properties b/bundles/org.eclipse.swt.tools.spies/build.properties
@@ -22,5 +22,4 @@ output.. = bin/
 source.. = src/
 src.includes = about.html
 
-pom.model.groupId = org.eclipse.swt
 tycho.pomless.parent = ../../local-build/local-build-parent
diff --git a/bundles/org.eclipse.swt.tools/build.properties b/bundles/org.eclipse.swt.tools/build.properties
@@ -27,5 +27,4 @@ source.. = src/,\
 src.includes = about.html
 bin.excludes = META-INF/p2.inf
 
-pom.model.groupId = org.eclipse.swt
 tycho.pomless.parent = ../../local-build/local-build-parent
diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml
@@ -14,12 +14,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>
+        <groupId>org.eclipse.platform</groupId>
         <artifactId>eclipse.platform.swt</artifactId>
-        <groupId>eclipse.platform.swt</groupId>
         <version>4.36.0-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
-    <groupId>org.eclipse.platform</groupId>
     <artifactId>org.eclipse.swt</artifactId>
     <version>3.130.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
diff --git a/examples/org.eclipse.swt.examples.browser.demos/build.properties b/examples/org.eclipse.swt.examples.browser.demos/build.properties
@@ -26,5 +26,4 @@ bin.includes = doc-html/,\
                META-INF/
 src.includes=about.html
 
-pom.model.groupId = org.eclipse.swt
 tycho.pomless.parent = ../../local-build/local-build-parent
diff --git a/examples/org.eclipse.swt.examples.launcher/build.properties b/examples/org.eclipse.swt.examples.launcher/build.properties
@@ -26,5 +26,4 @@ src.includes = about.html
 source.. = src/
 output.. = bin/
 
-pom.model.groupId = org.eclipse.swt
 tycho.pomless.parent = ../../local-build/local-build-parent
diff --git a/examples/org.eclipse.swt.examples.ole.win32/pom.xml b/examples/org.eclipse.swt.examples.ole.win32/pom.xml
@@ -14,12 +14,11 @@
   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.platform</groupId>
     <artifactId>eclipse.platform.swt</artifactId>
-    <groupId>eclipse.platform.swt</groupId>
     <version>4.36.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.platform</groupId>
   <artifactId>org.eclipse.swt.examples.ole.win32</artifactId>
   <version>3.109.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/examples/org.eclipse.swt.examples.views/build.properties b/examples/org.eclipse.swt.examples.views/build.properties
@@ -24,5 +24,4 @@ src.includes = about.html
 source.. = src/
 output.. = bin/
 
-pom.model.groupId = org.eclipse.swt
 tycho.pomless.parent = ../../local-build/local-build-parent
diff --git a/examples/org.eclipse.swt.examples/build.properties b/examples/org.eclipse.swt.examples/build.properties
@@ -24,5 +24,4 @@ src.includes = about.html,\
 source.. = src/
 output.. = bin/
 
-pom.model.groupId = org.eclipse.swt
 tycho.pomless.parent = ../../local-build/local-build-parent
diff --git a/local-build/local-build-parent/pom.xml b/local-build/local-build-parent/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>
+    <groupId>org.eclipse.platform</groupId>
     <artifactId>eclipse.platform.swt</artifactId>
-    <groupId>eclipse.platform.swt</groupId>
     <version>4.36.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
diff --git a/local-build/org.eclipse.swt.fragments.localbuild/pom.xml b/local-build/org.eclipse.swt.fragments.localbuild/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>
+    <groupId>org.eclipse.platform</groupId>
     <artifactId>eclipse.platform.swt</artifactId>
-    <groupId>eclipse.platform.swt</groupId>
     <version>4.36.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.platform</groupId>
   <artifactId>org.eclipse.swt.fragments.localbuild</artifactId>
   <version>3.105.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
     <relativePath>../eclipse-platform-parent</relativePath>
   </parent>
 
-  <groupId>eclipse.platform.swt</groupId>
+  <groupId>org.eclipse.platform</groupId>
   <artifactId>eclipse.platform.swt</artifactId>
   <packaging>pom</packaging>
 
diff --git a/tests/org.eclipse.swt.tests.cocoa/build.properties b/tests/org.eclipse.swt.tests.cocoa/build.properties
@@ -20,7 +20,6 @@ bin.includes = .,\
 # Both use the same not-shareable resources and therefore cannot run in parallel. 
 additional.bundles = org.eclipse.swt.tests
 
-pom.model.groupId = org.eclipse.swt
 tycho.pomless.parent = ../../local-build/local-build-parent
 pom.model.packaging = eclipse-test-plugin
 pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
diff --git a/tests/org.eclipse.swt.tests.gtk/build.properties b/tests/org.eclipse.swt.tests.gtk/build.properties
@@ -20,7 +20,6 @@ bin.includes = .,\
 # Both use the same not-shareable resources and therefore cannot run in parallel. 
 additional.bundles = org.eclipse.swt.tests
 
-pom.model.groupId = org.eclipse.swt
 tycho.pomless.parent = ../../local-build/local-build-parent
 pom.model.packaging = eclipse-test-plugin
 pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
diff --git a/tests/org.eclipse.swt.tests.win32/build.properties b/tests/org.eclipse.swt.tests.win32/build.properties
@@ -21,7 +21,6 @@ bin.includes = .,\
 # Both use the same not-shareable resources and therefore cannot run in parallel. 
 additional.bundles = org.eclipse.swt.tests
 
-pom.model.groupId = org.eclipse.swt
 tycho.pomless.parent = ../../local-build/local-build-parent
 pom.model.packaging = eclipse-test-plugin
 pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
diff --git a/tests/org.eclipse.swt.tests/pom.xml b/tests/org.eclipse.swt.tests/pom.xml
@@ -14,12 +14,11 @@
   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.platform</groupId>
     <artifactId>eclipse.platform.swt.localbuild</artifactId>
-    <groupId>eclipse.platform.swt</groupId>
     <version>4.36.0-SNAPSHOT</version>
     <relativePath>../../local-build/local-build-parent/</relativePath>
   </parent>
-  <groupId>org.eclipse.platform</groupId>
   <artifactId>org.eclipse.swt.tests</artifactId>
   <version>3.107.800-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,4 @@ bin.includes = about.html,\`
`18`	`18`	`.`
`19`	`19`	`src.includes = about.html`
`20`	`20`
`21`		`-pom.model.groupId = org.eclipse.swt`
`22`	`21`	`tycho.pomless.parent = ../../local-build/local-build-parent`