From 88f8571d022d2578501c53f8b13c75b05543039b Mon Sep 17 00:00:00 2001
From: Zhe Sun <31067185+ZheSun88@users.noreply.github.com>
Date: Thu, 29 Jun 2023 12:55:32 +0300
Subject: [PATCH] chore: group platform modules in a profile, remove gradle
 module activation rule (CP: 24.0) (#4301)

---
 hilla-dev/pom.xml                             |  3 ++
 hilla-react/pom.xml                           |  5 ++
 hilla-spring-boot-starter/pom.xml             |  4 ++
 hilla/pom.xml                                 |  3 ++
 pom.xml                                       | 51 ++++++++++++-------
 .../templates/template-hilla-bom.xml          |  2 +-
 .../template-hilla-maven-plugin-pom.xml       |  1 +
 .../template-servlet-containers-tests-pom.xml |  2 +-
 vaadin-platform-hybrid-test/pom.xml           |  2 +-
 vaadin-platform-test/pom.xml                  |  2 +-
 10 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/hilla-dev/pom.xml b/hilla-dev/pom.xml
index faf0b54e1..a86507e1c 100644
--- a/hilla-dev/pom.xml
+++ b/hilla-dev/pom.xml
@@ -14,6 +14,9 @@
     <description>Hilla Platform Development Dependencies</description>
     <version>${hilla.version}</version>
     <url>https://hilla.dev</url>
+    <properties>
+        <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
+    </properties>
     <distributionManagement>
         <repository>
             <id>vaadin-prereleases</id>
diff --git a/hilla-react/pom.xml b/hilla-react/pom.xml
index 57bac656a..ce9d9d682 100644
--- a/hilla-react/pom.xml
+++ b/hilla-react/pom.xml
@@ -14,6 +14,11 @@
     <description>Hilla Platform for React-based Applications</description>
     <version>${hilla.version}</version>
     <url>https://hilla.dev</url>
+
+    <properties>
+        <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
+    </properties>
+
     <distributionManagement>
         <repository>
             <id>vaadin-prereleases</id>
diff --git a/hilla-spring-boot-starter/pom.xml b/hilla-spring-boot-starter/pom.xml
index f3d09c2ac..963e9d6d4 100644
--- a/hilla-spring-boot-starter/pom.xml
+++ b/hilla-spring-boot-starter/pom.xml
@@ -14,6 +14,10 @@
     <description>Spring Boot Starter for Hilla applications.</description>
     <version>${hilla.version}</version>
 
+    <properties>
+        <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
+    </properties>
+
     <repositories>
         <!-- The order of definitions matters. Explicitly defining central here to make sure it has the highest priority. -->
 
diff --git a/hilla/pom.xml b/hilla/pom.xml
index 06af25b90..c949221fb 100644
--- a/hilla/pom.xml
+++ b/hilla/pom.xml
@@ -14,6 +14,9 @@
     <description>Hilla Platform</description>
     <version>${hilla.version}</version>
     <url>https://hilla.dev</url>
+    <properties>
+        <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
+    </properties>
     <distributionManagement>
         <repository>
             <id>vaadin-prereleases</id>
diff --git a/pom.xml b/pom.xml
index de73a2287..0ecc608ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,22 +31,6 @@
         </repository>
     </distributionManagement>
 
-    <modules>
-        <module>vaadin-internal</module>
-        <module>vaadin</module>
-        <module>vaadin-spring-bom</module>
-        <module>vaadin-bom</module>
-        <module>vaadin-core-internal</module>
-        <module>vaadin-core</module>
-        <module>vaadin-dev</module>
-        <module>vaadin-maven-plugin</module>
-        <module>vaadin-testbench</module>
-        <module>vaadin-testbench-junit5</module>
-        <module>vaadin-spring-boot-starter</module>
-        <module>vaadin-platform-javadoc</module>
-        <module>vaadin-dev-bundle</module>
-    </modules>
-
     <profiles>
         <profile>
             <id>sbom</id>
@@ -56,9 +40,6 @@
         </profile>
         <profile>
             <id>gradle</id>
-            <activation>
-                <jdk>(,18)</jdk>
-            </activation>
             <modules>
                 <module>vaadin-gradle-plugin</module>
                 <module>vaadin-gradle-plugin/pom-portal.xml</module>
@@ -83,6 +64,38 @@
                 <module>hilla-spring-boot-starter</module>
                 <module>hilla-maven-plugin</module>
             </modules>
+            <!-- This prevents deploying all com.vaadin modules, but we need to set it to true in
+            all hilla modules  -->
+            <properties>
+                <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+            </properties>
+        </profile>
+        <!-- separate platform modules for active by default it must be after hilla modules -->
+        <profile>
+            <id>platform</id>
+            <activation>
+                <property>
+                    <name>!skipPlatform</name>
+                </property>
+            </activation>
+            <modules>
+                <module>vaadin-internal</module>
+                <module>vaadin</module>
+                <module>vaadin-spring-bom</module>
+                <module>vaadin-bom</module>
+                <module>vaadin-core-internal</module>
+                <module>vaadin-core</module>
+                <module>vaadin-dev</module>
+                <module>vaadin-maven-plugin</module>
+                <module>vaadin-testbench</module>
+                <module>vaadin-testbench-junit5</module>
+                <module>vaadin-spring-boot-starter</module>
+                <module>vaadin-platform-javadoc</module>
+                <module>vaadin-dev-bundle</module>
+            </modules>
+            <properties>
+                <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
+            </properties>
         </profile>
         <!-- Needed so as we can skip this module on releasing and still nexus stating works -->
         <profile>
diff --git a/scripts/generator/templates/template-hilla-bom.xml b/scripts/generator/templates/template-hilla-bom.xml
index 07b89759e..0b3e6a836 100644
--- a/scripts/generator/templates/template-hilla-bom.xml
+++ b/scripts/generator/templates/template-hilla-bom.xml
@@ -15,7 +15,7 @@
     <url>https://hilla.dev</url>
 	
     <properties>
-        {{javadeps}}
+        <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
     </properties>
 
     <distributionManagement>
diff --git a/scripts/generator/templates/template-hilla-maven-plugin-pom.xml b/scripts/generator/templates/template-hilla-maven-plugin-pom.xml
index 8db6ae99b..61d2744dd 100644
--- a/scripts/generator/templates/template-hilla-maven-plugin-pom.xml
+++ b/scripts/generator/templates/template-hilla-maven-plugin-pom.xml
@@ -24,6 +24,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.version>3.8.6</maven.version>
+        <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
     </properties>
 
     <dependencies>
diff --git a/scripts/generator/templates/template-servlet-containers-tests-pom.xml b/scripts/generator/templates/template-servlet-containers-tests-pom.xml
index 4000d4ef4..6ecccb21d 100644
--- a/scripts/generator/templates/template-servlet-containers-tests-pom.xml
+++ b/scripts/generator/templates/template-servlet-containers-tests-pom.xml
@@ -18,7 +18,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <failOnMissingWebXml>false</failOnMissingWebXml>
-        <maven.deploy.skip>true</maven.deploy.skip>
+        <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         <!-- this version is needed for app.bndrun file -->
         {{javadeps}}
     </properties>
diff --git a/vaadin-platform-hybrid-test/pom.xml b/vaadin-platform-hybrid-test/pom.xml
index a57b80cfe..11c1e23f2 100644
--- a/vaadin-platform-hybrid-test/pom.xml
+++ b/vaadin-platform-hybrid-test/pom.xml
@@ -18,7 +18,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <failOnMissingWebXml>false</failOnMissingWebXml>
-        <maven.deploy.skip>true</maven.deploy.skip>
+        <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
     </properties>
     <dependencyManagement>
         <dependencies>
diff --git a/vaadin-platform-test/pom.xml b/vaadin-platform-test/pom.xml
index 627c428f8..433300e68 100644
--- a/vaadin-platform-test/pom.xml
+++ b/vaadin-platform-test/pom.xml
@@ -15,7 +15,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <failOnMissingWebXml>false</failOnMissingWebXml>
-        <maven.deploy.skip>true</maven.deploy.skip>
+        <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         <osgi.bundle.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</osgi.bundle.version>
     </properties>
     <dependencyManagement>