Merge pull request #63 from logchange/ossrh-config

Maven ossrh deployment configuration update
logchange · Jan 17, 2025 · 16a1cef · 16a1cef
2 parents 413fd89 + ba0dc8a
commit 16a1cef
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 36 deletions.
diff --git a/changelog/unreleased/000061-maven-deployment-config.yml b/changelog/unreleased/000061-maven-deployment-config.yml
@@ -7,4 +7,5 @@ type: changed #[added/changed/deprecated/removed/fixed/security/other]
 issues:
   - 61
 merge_requests:
-  - 62
+  - 62
+  - 63
diff --git a/hofund-spring-boot-autoconfigure/pom.xml b/hofund-spring-boot-autoconfigure/pom.xml
@@ -54,7 +54,5 @@
             <artifactId>micrometer-registry-prometheus</artifactId>
             <optional>true</optional>
         </dependency>
-
     </dependencies>
-
 </project>
diff --git a/hofund-spring-boot-e2e/pom.xml b/hofund-spring-boot-e2e/pom.xml
@@ -75,15 +75,22 @@
                     <injectAllReactorProjects>true</injectAllReactorProjects>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>${maven-deploy-plugin.version}</version>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
-
+    <profiles>
+        <profile>
+            <id>ci-cd</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <configuration>
+                            <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/hofund-spring-boot-starter/pom.xml b/hofund-spring-boot-starter/pom.xml
@@ -48,5 +48,4 @@
             <version>${oshi-core.version}</version>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/hofund-spring/pom.xml b/hofund-spring/pom.xml
@@ -29,5 +29,4 @@
             <artifactId>spring-core</artifactId>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/pom.xml b/pom.xml
@@ -61,7 +61,6 @@
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
         <spring-boot.version>3.3.1</spring-boot.version>
         <oshi-core.version>6.6.5</oshi-core.version>
 
@@ -126,15 +125,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>${maven-deploy-plugin.version}</version>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-                <inherited>false</inherited>
-            </plugin>
         </plugins>
     </build>
 
@@ -143,6 +133,18 @@
             <id>ci-cd</id>
             <build>
                 <plugins>
+                    <plugin>
+                        <!-- https://central.sonatype.org/publish/publish-maven/#nexus-staging-maven-plugin-for-deployment-and-release -->
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>1.7.0</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
@@ -176,18 +178,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <!-- https://central.sonatype.org/publish/publish-maven/#nexus-staging-maven-plugin-for-deployment-and-release -->
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.7.0</version>
-                        <extensions>true</extensions>
-                        <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                        </configuration>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
-Original file line number
+Diff line change
@@ Expand Up @@
     issues:
       - 61
     merge_requests:
-      - 62
+      - 62
+      - 63