Merge pull request #6404 from Pandrex247/FISH-7809

FISH-7809 Remove 'deploy-internals' Profile and Fix Deployment of Core
payara · Sep 20, 2023 · 80e35c6 · 80e35c6
2 parents 78b3190 + 1c907ef
commit 80e35c6
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 90 deletions.
diff --git a/appserver/distributions/pom.xml b/appserver/distributions/pom.xml
@@ -189,15 +189,6 @@
     </build>
 
     <profiles>
-
-        <!-- Don't deploy any distributions if only the internals are being deployed -->
-        <profile>
-            <id>deploy-internals</id>
-            <properties>
-                <deploy.skip>true</deploy.skip>
-            </properties>
-        </profile>
-
         <!-- Default build profile -->
         <profile>
             <id>DefaultBuild</id>

diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
@@ -481,11 +481,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>deploy-internals</id>
-            <properties>
-                <deploy.skip>true</deploy.skip>
-            </properties>
-        </profile>
     </profiles>
 </project>
diff --git a/appserver/extras/embedded/pom.xml b/appserver/extras/embedded/pom.xml
@@ -60,12 +60,4 @@
         <module>tests</module>
     </modules>
 
-    <profiles>
-        <profile>
-            <id>deploy-internals</id>
-            <properties>
-                <deploy.skip>true</deploy.skip>
-            </properties>
-        </profile>
-    </profiles>
 </project>
diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml
@@ -419,11 +419,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>deploy-internals</id>
-            <properties>
-                <deploy.skip>true</deploy.skip>
-            </properties>
-        </profile>
     </profiles>
 </project>
diff --git a/appserver/extras/payara-micro/payara-micro-distribution/pom.xml b/appserver/extras/payara-micro/payara-micro-distribution/pom.xml
@@ -528,11 +528,5 @@
                 <product.name>Payara Micro Enterprise</product.name>
             </properties>
         </profile>
-        <profile>
-            <id>deploy-internals</id>
-            <properties>
-                <deploy.skip>true</deploy.skip>
-            </properties>
-        </profile>
     </profiles>
 </project>
diff --git a/appserver/packager/external/pom.xml b/appserver/packager/external/pom.xml
@@ -63,7 +63,6 @@
 
     <properties>
         <findbugs.skip>true</findbugs.skip>
-        <deploy.skip>false</deploy.skip>
     </properties>
 
     <modules>

diff --git a/appserver/packager/pom.xml b/appserver/packager/pom.xml
@@ -175,7 +175,6 @@
         <findbugs.skip>true</findbugs.skip>
         <zip.excludes>**\/META-INF,META-INF\/*</zip.excludes>
         <pkg_proto.py>src/main/resources/pkg_proto.py</pkg_proto.py>
-        <deploy.skip>true</deploy.skip>
     </properties>
 
     <build>

diff --git a/core/core-parent/pom.xml b/core/core-parent/pom.xml
@@ -54,20 +54,7 @@
 
     <name>Payara Core Parent</name>
 
-    <distributionManagement>
-        <repository>
-            <id>payara-nexus-artifacts</id>
-            <url>https://nexus.payara.fish/repository/payara-artifacts/</url>
-        </repository>
-        <snapshotRepository>
-            <id>payara-nexus-snapshots</id>
-            <url>https://nexus.payara.fish/repository/payara-snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
-
     <properties>
-        <!-- core artifacts end up in payara-artifacts repo -->
-        <deploy.skip>false</deploy.skip>
         <jar.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</jar.manifest>
     </properties>
 
@@ -403,15 +390,6 @@
                         </testExcludes>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>${maven.deploy.plugin.version}</version>
-                    <configuration>
-                        <retryFailedDeploymentCount>10</retryFailedDeploymentCount>
-                        <skip>${deploy.skip}</skip>
-                    </configuration>
-                </plugin>
 
                 <plugin>
                     <groupId>org.apache.felix</groupId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -185,7 +185,7 @@
         <!-- build settings -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <deploy.skip>true</deploy.skip>
+        <deploy.skip>false</deploy.skip>
         <javadoc.skip>true</javadoc.skip>
 
         <payara.deployment.transformer.version>1.3</payara.deployment.transformer.version>
@@ -215,6 +215,17 @@
         </license>
     </licenses>
 
+    <distributionManagement>
+        <repository>
+            <id>payara-nexus-artifacts</id>
+            <url>https://nexus.payara.fish/repository/payara-artifacts/</url>
+        </repository>
+        <snapshotRepository>
+            <id>payara-nexus-snapshots</id>
+            <url>https://nexus.payara.fish/repository/payara-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
     <repositories>
         <!-- Try Maven central first, not last, which happens when omitted here -->
         <repository>
@@ -448,6 +459,15 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>${maven.deploy.plugin.version}</version>
+                    <configuration>
+                        <retryFailedDeploymentCount>10</retryFailedDeploymentCount>
+                        <skip>${deploy.skip}</skip>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

diff --git a/nucleus/packager/external/pom.xml b/nucleus/packager/external/pom.xml
@@ -63,7 +63,6 @@
 
     <properties>
         <findbugs.skip>true</findbugs.skip>
-        <deploy.skip>false</deploy.skip>
     </properties>
 
     <modules>

diff --git a/nucleus/packager/pom.xml b/nucleus/packager/pom.xml
@@ -86,7 +86,6 @@
         <temp.modules.dir>${temp.dir}/modules</temp.modules.dir>
         <findbugs.skip>true</findbugs.skip>
         <zip.excludes>**\/META-INF,META-INF\/*</zip.excludes>
-        <deploy.skip>true</deploy.skip>
     </properties>
 
     <modules>

diff --git a/pom.xml b/pom.xml
@@ -117,6 +117,13 @@
         </pluginRepository>
     </pluginRepositories>
 
+    <distributionManagement>
+        <repository>
+            <id>payara-nexus-distributions</id>
+            <url>https://nexus.payara.fish/repository/payara-community/</url>
+        </repository>
+    </distributionManagement>
+
     <properties>
         <dynamic.build.properties.version>0.0.1.a2</dynamic.build.properties.version>
 
@@ -150,6 +157,8 @@
         <monitoring-console-process.version>2.0.1</monitoring-console-process.version>
         <monitoring-console-webapp.version>2.0.1</monitoring-console-webapp.version>
         <validation.xml.root>${project.build.outputDirectory}</validation.xml.root>
+
+        <deploy.skip>true</deploy.skip>
     </properties>
 
     <profiles>
@@ -278,25 +287,6 @@
             </build>
         </profile>
 
-        <profile>
-            <!-- only internal modules deployed, so tests can run without Server build built -->
-            <id>deploy-internals</id>
-            <properties>
-                <deploy.skip>false</deploy.skip>
-            </properties>
-
-            <distributionManagement>
-                <repository>
-                    <id>payara-nexus-artifacts</id>
-                    <url>https://nexus.payara.fish/repository/payara-artifacts/</url>
-                </repository>
-                <snapshotRepository>
-                    <id>payara-nexus-snapshots</id>
-                    <url>https://nexus.payara.fish/repository/payara-snapshots/</url>
-                </snapshotRepository>
-            </distributionManagement>
-        </profile>
-
         <profile>
             <id>BuildCore</id>
             <activation>
@@ -390,15 +380,6 @@
                         </testExcludes>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>${maven.deploy.plugin.version}</version>
-                    <configuration>
-                        <retryFailedDeploymentCount>10</retryFailedDeploymentCount>
-                        <skip>${deploy.skip}</skip>
-                    </configuration>
-                </plugin>
 
                 <plugin>
                     <groupId>org.apache.felix</groupId>