From aca76bba8191910e981a3bfd8089ea77f345768d Mon Sep 17 00:00:00 2001
From: Alexander Fedorov <alexander.fedorov@arsysop.ru>
Date: Wed, 21 Aug 2024 18:14:04 +0300
Subject: [PATCH] [#1361] Support stable P2 repository structure for publishing

Merge aggregators
---
 pom.xml                                       |  5 +--
 .../pom.xml                                   | 13 +++++++
 .../pom.xml                                   | 36 ------------------
 .../pom.xml                                   | 38 -------------------
 4 files changed, 14 insertions(+), 78 deletions(-)
 rename releng/{org.eclipse.passage.lic.aggregator => org.eclipse.passage.aggregator}/pom.xml (90%)
 delete mode 100644 releng/org.eclipse.passage.demo.aggregator/pom.xml
 delete mode 100644 releng/org.eclipse.passage.ldc.aggregator/pom.xml

diff --git a/pom.xml b/pom.xml
index c12ecf8fa..bcdd8edea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,10 +30,7 @@
 
 	<modules>
 		<module>./releng/org.eclipse.passage.target</module>
-
-		<module>./releng/org.eclipse.passage.lic.aggregator</module>
-		<module>./releng/org.eclipse.passage.ldc.aggregator</module>
-		<module>./releng/org.eclipse.passage.demo.aggregator</module>
+		<module>./releng/org.eclipse.passage.aggregator</module>
 		<!-- enable and fix after 3.0.0 RC2 -->
 		<!--
 		<module>sites/org.eclipse.passage.repository</module>
diff --git a/releng/org.eclipse.passage.lic.aggregator/pom.xml b/releng/org.eclipse.passage.aggregator/pom.xml
similarity index 90%
rename from releng/org.eclipse.passage.lic.aggregator/pom.xml
rename to releng/org.eclipse.passage.aggregator/pom.xml
index 653eceacd..abf1efb88 100644
--- a/releng/org.eclipse.passage.lic.aggregator/pom.xml
+++ b/releng/org.eclipse.passage.aggregator/pom.xml
@@ -110,6 +110,19 @@
 		<module>../../features/org.eclipse.passage.lic.define.feature</module>
 
 		<module>../../releng/org.eclipse.passage.lic.repository</module>
+
+		<module>../../bundles/org.eclipse.passage.ldc.pde.core.templates</module>
+		<module>../../bundles/org.eclipse.passage.ldc.pde.ui.templates</module>
+		<module>../../bundles/org.eclipse.passage.ldc</module>
+		<module>../../features/org.eclipse.passage.ldc.feature</module>
+
+		<module>../../releng/org.eclipse.passage.ldc.repository</module>
+
+		<module>../../bundles/org.eclipse.passage.seal.demo</module>
+		<module>../../features/org.eclipse.passage.demo.feature</module>
+		<module>../../tests/org.eclipse.passage.seal.demo.tests</module>
+
+		<module>../../releng/org.eclipse.passage.demo.repository</module>
 	</modules>
 
 </project>
\ No newline at end of file
diff --git a/releng/org.eclipse.passage.demo.aggregator/pom.xml b/releng/org.eclipse.passage.demo.aggregator/pom.xml
deleted file mode 100644
index d533f7aa9..000000000
--- a/releng/org.eclipse.passage.demo.aggregator/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2020, 2024 ArSysOp and others
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	https://www.eclipse.org/legal/epl-2.0/.
-
-	SPDX-License-Identifier: EPL-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<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>
-
-	<artifactId>org.eclipse.passage.demo.aggregator</artifactId>
-	<packaging>pom</packaging>
-
-	<parent>
-		<groupId>org.eclipse.passage</groupId>
-		<artifactId>org.eclipse.passage.parent</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
-		<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
-	</parent>
-
-	<modules>
-		<module>../../bundles/org.eclipse.passage.seal.demo</module>
-		<module>../../features/org.eclipse.passage.demo.feature</module>
-		<module>../../tests/org.eclipse.passage.seal.demo.tests</module>
-		<module>../../releng/org.eclipse.passage.demo.repository</module>
-	</modules>
-
-</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.passage.ldc.aggregator/pom.xml b/releng/org.eclipse.passage.ldc.aggregator/pom.xml
deleted file mode 100644
index 6e180bb04..000000000
--- a/releng/org.eclipse.passage.ldc.aggregator/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2019, 2024 ArSysOp and others
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	https://www.eclipse.org/legal/epl-2.0/.
-
-	SPDX-License-Identifier: EPL-2.0
-
-	Contributors:
-		ArSysOp - initial API and implementation
--->
-<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>
-
-	<artifactId>org.eclipse.passage.ldc.aggregator</artifactId>
-	<packaging>pom</packaging>
-
-	<parent>
-		<groupId>org.eclipse.passage</groupId>
-		<artifactId>org.eclipse.passage.parent</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
-		<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
-	</parent>
-	<modules>
-		<module>../../bundles/org.eclipse.passage.ldc.pde.core.templates</module>
-		<module>../../bundles/org.eclipse.passage.ldc.pde.ui.templates</module>
-		<module>../../bundles/org.eclipse.passage.ldc</module>
-		<module>../../features/org.eclipse.passage.ldc.feature</module>
-
-		<module>../../releng/org.eclipse.passage.ldc.repository</module>
-	</modules>
-
-</project>
\ No newline at end of file