[spark] 02/02: Revert "[SPARK-45546][BUILD][INFRA] Make `publish-snapshot` support `package` first then `deploy`"

[gurwls223]

This is an automated email from the ASF dual-hosted git repository.

gurwls223 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git

commit e37dd3ab8e0707eead2cb068bc19456349ccdd86
Author: Hyukjin Kwon <gurwls...@apache.org>
AuthorDate: Thu Oct 19 13:50:31 2023 +0900

    Revert "[SPARK-45546][BUILD][INFRA] Make `publish-snapshot` support 
`package` first then `deploy`"
    
    This reverts commit 3ef18e2d00f386196292f0c768816626bc903d47.
---
 .github/workflows/publish_snapshot.yml |  4 ----
 dev/create-release/release-build.sh    | 14 ++------------
 pom.xml                                |  7 -------
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/publish_snapshot.yml 
b/.github/workflows/publish_snapshot.yml
index 476d41d0cf1..7ed836f016b 100644
--- a/.github/workflows/publish_snapshot.yml
+++ b/.github/workflows/publish_snapshot.yml
@@ -66,8 +66,4 @@ jobs:
         GPG_KEY: "not_used"
         GPG_PASSPHRASE: "not_used"
         GIT_REF: ${{ matrix.branch }}
-        # SPARK-45546 adds this environment variable to split the publish 
snapshot process into two steps:
-        # first package, then deploy. This is intended to reduce the resource 
pressure of deploy.
-        # When PACKAGE_BEFORE_DEPLOY is not set to true, it will revert to the 
one-step deploy method.
-        PACKAGE_BEFORE_DEPLOY: true
       run: ./dev/create-release/release-build.sh publish-snapshot
diff --git a/dev/create-release/release-build.sh 
b/dev/create-release/release-build.sh
index 3776c64e31e..f3571c4e48c 100755
--- a/dev/create-release/release-build.sh
+++ b/dev/create-release/release-build.sh
@@ -432,24 +432,14 @@ if [[ "$1" == "publish-snapshot" ]]; then
   echo "</server></servers></settings>" >> $tmp_settings
 
   if [[ $PUBLISH_SCALA_2_12 = 1 ]]; then
-    if [ "$PACKAGE_BEFORE_DEPLOY" = "true" ]; then
-      $MVN -DskipTests $SCALA_2_12_PROFILES $PUBLISH_PROFILES clean package
-      $MVN --settings $tmp_settings -DskipTests $SCALA_2_12_PROFILES 
$PUBLISH_PROFILES deploy
-    else
-      $MVN --settings $tmp_settings -DskipTests $SCALA_2_12_PROFILES 
$PUBLISH_PROFILES clean deploy
-    fi
+    $MVN --settings $tmp_settings -DskipTests $SCALA_2_12_PROFILES 
$PUBLISH_PROFILES clean deploy
   fi
 
   if [[ $PUBLISH_SCALA_2_13 = 1 ]]; then
     if [[ $SPARK_VERSION < "4.0" ]]; then
       ./dev/change-scala-version.sh 2.13
     fi
-    if [ "$PACKAGE_BEFORE_DEPLOY" = "true" ]; then
-      $MVN -DskipTests $SCALA_2_13_PROFILES $PUBLISH_PROFILES clean package
-      $MVN --settings $tmp_settings -DskipTests $SCALA_2_13_PROFILES 
$PUBLISH_PROFILES deploy
-    else
-      $MVN --settings $tmp_settings -DskipTests $SCALA_2_13_PROFILES 
$PUBLISH_PROFILES clean deploy
-    fi
+    $MVN --settings $tmp_settings -DskipTests $SCALA_2_13_PROFILES 
$PUBLISH_PROFILES clean deploy
   fi
 
   rm $tmp_settings
diff --git a/pom.xml b/pom.xml
index ade6537c2a1..824ae49f6da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3840,11 +3840,4 @@
       </build>
     </profile>
   </profiles>
-  <distributionManagement>
-    <snapshotRepository>
-      <id>internal.snapshot</id>
-      <name>Internal Snapshot Repository</name>
-      <url>http://localhost:8081/repository/maven-snapshots/</url>
-    </snapshotRepository>
-  </distributionManagement>
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org