Fixing publish skip logic

datasprayio · Nov 5, 2024 · 9291af9 · 9291af9
1 parent 6ea17c6
commit 9291af9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 17 deletions.
diff --git a/dataspray-api-parent/dataspray-client-java/pom.xml b/dataspray-api-parent/dataspray-client-java/pom.xml
@@ -221,12 +221,6 @@
                         <goals>
                             <goal>remote</goal>
                         </goals>
-                        <configuration>
-                            <repository>https://s01.oss.sonatype.org/service/local/repositories/releases/content/
-                            </repository>
-                            <property>skipDeployClientJava</property>
-                            <requireGoal>deploy</requireGoal>
-                        </configuration>
                     </execution>
                 </executions>
                 <configuration>
@@ -288,8 +282,8 @@
                 <extensions>true</extensions>
                 <configuration>
                     <skipNexusStagingDeployMojo>${skipDeployClientJava}</skipNexusStagingDeployMojo>
-                    <serverId>${distributionManagement.repository.id}</serverId>
-                    <nexusUrl>${nexusBaseUrl}</nexusUrl>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
                     <autoReleaseAfterClose>true</autoReleaseAfterClose>
                 </configuration>
             </plugin>

diff --git a/dataspray-api-parent/dataspray-client-typescript/package.json b/dataspray-api-parent/dataspray-client-typescript/package.json
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "build": "tsc",
-    "publish-if-needed": "can-npm-publish && pnpm publish"
+    "publish-if-needed": "can-npm-publish && pnpm publish || echo 'Already published, skipping.'"
   },
   "devDependencies": {
     "can-npm-publish": "^1.3.6",

diff --git a/dataspray-runner-parent/dataspray-runner-java/pom.xml b/dataspray-runner-parent/dataspray-runner-java/pom.xml
@@ -138,7 +138,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <repository>${nexusReleaseUrl}</repository>
+                    <repository>https://s01.oss.sonatype.org/service/local/repositories/releases/content/</repository>
                     <property>skipDeployRunnerJava</property>
                     <requireGoal>deploy</requireGoal>
                 </configuration>
@@ -196,8 +196,8 @@
                 <extensions>true</extensions>
                 <configuration>
                     <skipNexusStagingDeployMojo>${skipDeployRunnerJava}</skipNexusStagingDeployMojo>
-                    <serverId>${distributionManagement.repository.id}</serverId>
-                    <nexusUrl>${nexusBaseUrl}</nexusUrl>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
                     <autoReleaseAfterClose>true</autoReleaseAfterClose>
                 </configuration>
             </plugin>

diff --git a/dataspray-runner-parent/dataspray-runner-typescript/package.json b/dataspray-runner-parent/dataspray-runner-typescript/package.json
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "build": "tsc",
-    "publish-if-needed": "can-npm-publish && pnpm publish"
+    "publish-if-needed": "can-npm-publish && pnpm publish || echo 'Already published, skipping.'"
   },
   "devDependencies": {
     "@types/aws-lambda": "^8.10.131",

diff --git a/pom.xml b/pom.xml
@@ -61,8 +61,6 @@
         <sqlite4java>1.0.392</sqlite4java>
         <okhttp.version>4.12.0</okhttp.version>
 
-        <nexusBaseUrl>https://s01.oss.sonatype.org/</nexusBaseUrl>
-        <nexusReleaseUrl>${nexusBaseUrl}service/local/repositories/releases/content/</nexusReleaseUrl>
         <lambda-native.phase>package</lambda-native.phase>
         <lambda-native.container-build>false</lambda-native.container-build>
         <lambda-native-it.phase>none</lambda-native-it.phase>
@@ -102,11 +100,11 @@
     <distributionManagement>
         <snapshotRepository>
             <id>ossrh</id>
-            <url>${nexusBaseUrl}content/repositories/snapshots</url>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
         <repository>
             <id>ossrh</id>
-            <url>${nexusBaseUrl}service/local/staging/deploy/maven2/</url>
+            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
     </distributionManagement>