reorder

nousot · Dec 1, 2021 · ef5bba7 · ef5bba7
1 parent e9c9c52
commit ef5bba7
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -54,7 +54,7 @@ jobs:
           - java: 11
             spark: '3.1'
             spark-hadoop: '3.2'
-            profiles: '-DskipTests -Pspark-provided -Pflink-provided'
+            profiles: '-DskipTests -Pflink-provided -Pspark-provided'
 
     env:
       SPARK_LOCAL_IP: localhost

diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -37,14 +37,14 @@ jobs:
         ASF_PASSWORD: ${{ secrets.NEXUS_PW }}
       run: |
         rm -rf ~/.m2/repository/org/apache/kyuubi
-        ./build/mvn clean deploy -s ./build/release/asf-settings.xml -DskipTests -Pspark-provided -Pflink-provided
-        ./build/mvn clean deploy -s ./build/release/asf-settings.xml -DskipTests -Pspark-provided,spark-3.1 -Pflink-provided -pl dev/kyuubi-extension-spark-3-1 -am
-        ./build/mvn clean deploy -s ./build/release/asf-settings.xml -DskipTests -Pspark-provided,spark-3.2 -Pflink-provided -pl dev/kyuubi-extension-spark-3-2 -am
+        ./build/mvn clean deploy -s ./build/release/asf-settings.xml -DskipTests -Pflink-provided -Pspark-provided
+        ./build/mvn clean deploy -s ./build/release/asf-settings.xml -DskipTests -Pflink-provided -Pspark-provided,spark-3.1 -pl dev/kyuubi-extension-spark-3-1 -am
+        ./build/mvn clean deploy -s ./build/release/asf-settings.xml -DskipTests -Pflink-provided -Pspark-provided,spark-3.2 -pl dev/kyuubi-extension-spark-3-2 -am
     - name: Publish snapshot - branch-1.3
       if: ${{ matrix.branch == 'branch-1.3' }}
       env:
         ASF_USERNAME: ${{ secrets.NEXUS_USER }}
         ASF_PASSWORD: ${{ secrets.NEXUS_PW }}
       run: |
         rm -rf ~/.m2/repository/org/apache/kyuubi
-        ./build/mvn clean deploy -s ./build/release/asf-settings.xml -DskipTests -Pspark-provided,kyuubi-extension-spark-3-1 -Pflink-provided
+        ./build/mvn clean deploy -s ./build/release/asf-settings.xml -DskipTests -Pflink-provided -Pspark-provided,kyuubi-extension-spark-3-1
diff --git a/build/dist b/build/dist
@@ -41,12 +41,12 @@ function usage {
   echo ""
   echo "Usage:"
   echo "+--------------------------------------------------------------------------------------+"
-  echo "| ./build/dist [--name <custom_name>] [--tgz] [--spark-provided] [--flink-provided] <maven build options> |"
+  echo "| ./build/dist [--name <custom_name>] [--tgz] [--flink-provided] [--spark-provided] <maven build options> |"
   echo "+--------------------------------------------------------------------------------------+"
   echo "name:           -  custom binary name, using project version if undefined"
   echo "tgz:            -  whether to make a whole bundled package"
-  echo "spark-provided: -  whether to make a package without Spark binary"
   echo "flink-provided: -  whether to make a package without Flink binary"
+  echo "spark-provided: -  whether to make a package without Spark binary"
   echo ""
 }
 

diff --git a/build/release/release.sh b/build/release/release.sh
@@ -94,12 +94,12 @@ upload_svn_staging() {
 }
 
 upload_nexus_staging() {
-  ${KYUUBI_DIR}/build/mvn clean deploy -DskipTests -Papache-release,spark-provided,flink-provided \
+  ${KYUUBI_DIR}/build/mvn clean deploy -DskipTests -Papache-release,flink-provided,spark-provided \
     -s "${KYUUBI_DIR}/build/release/asf-settings.xml"
-  ${KYUUBI_DIR}/build/mvn clean deploy -DskipTests -Papache-release,spark-provided,spark-3.1,flink-provided \
+  ${KYUUBI_DIR}/build/mvn clean deploy -DskipTests -Papache-release,flink-provided,spark-provided,spark-3.1 \
     -s "${KYUUBI_DIR}/build/release/asf-settings.xml" \
     -pl dev/kyuubi-extension-spark-3-1 -am
-  ${KYUUBI_DIR}/build/mvn clean deploy -DskipTests -Papache-release,spark-provided,spark-3.2,flink-provided \
+  ${KYUUBI_DIR}/build/mvn clean deploy -DskipTests -Papache-release,flink-provided,spark-provided,spark-3.2 \
     -s "${KYUUBI_DIR}/build/release/asf-settings.xml" \
     -pl dev/kyuubi-extension-spark-3-2 -am
 }

diff --git a/docs/develop_tools/distribution.md b/docs/develop_tools/distribution.md
@@ -33,12 +33,12 @@ For more information on usage, run `./build/dist --help`
 
 Usage:
 +--------------------------------------------------------------------------------------+
-| ./build/dist [--name <custom_name>] [--tgz] [--spark-provided] [--flink-provided] <maven build options> |
+| ./build/dist [--name <custom_name>] [--tgz] [--flink-provided] [--spark-provided] <maven build options> |
 +--------------------------------------------------------------------------------------+
 name:           -  custom binary name, using project version if undefined
 tgz:            -  whether to make a whole bundled package
-spark-provided: -  whether to make a package without Spark binary
 flink-provided: -  whether to make a package without Flink binary
+spark-provided: -  whether to make a package without Spark binary
 ```
 
 For instance,

diff --git a/...engine/src/test/scala/org/apache/kyuubi/engine/spark/udf/KyuubiDefinedFunctionSuite.scala b/...engine/src/test/scala/org/apache/kyuubi/engine/spark/udf/KyuubiDefinedFunctionSuite.scala
@@ -30,12 +30,12 @@ import org.apache.kyuubi.{KyuubiFunSuite, TestUtils}
  *
  * To run the entire test suite:
  * {{{
- *   build/mvn clean install -Pspark-provided,flink-provided -DwildcardSuites=org.apache.kyuubi.engine.spark.udf.KyuubiDefinedFunctionSuite
+ *   build/mvn clean install -Pflink-provided,spark-provided -DwildcardSuites=org.apache.kyuubi.engine.spark.udf.KyuubiDefinedFunctionSuite
  * }}}
  *
  * To re-generate golden files for entire suite, run:
  * {{{
- *   KYUUBI_UPDATE=1 build/mvn clean install -Pspark-provided,flink-provided -DwildcardSuites=org.apache.kyuubi.engine.spark.udf.KyuubiDefinedFunctionSuite
+ *   KYUUBI_UPDATE=1 build/mvn clean install -Pflink-provided,spark-provided -DwildcardSuites=org.apache.kyuubi.engine.spark.udf.KyuubiDefinedFunctionSuite
  * }}}
  */
 // scalastyle:on line.size.limit

diff --git a/kyuubi-common/src/test/scala/org/apache/kyuubi/TestUtils.scala b/kyuubi-common/src/test/scala/org/apache/kyuubi/TestUtils.scala
@@ -52,7 +52,7 @@ object TestUtils {
       }
       reader.close()
       val hint = s"$markdown out of date, please update doc with " +
-        s"KYUUBI_UPDATE=1 build/mvn clean install -Pspark-provided,flink-provided " +
+        s"KYUUBI_UPDATE=1 build/mvn clean install -Pflink-provided,spark-provided " +
         s"-DwildcardSuites=$agent"
       assert(newOutput.size === expected.size, hint)
 

diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/config/AllKyuubiConfiguration.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/config/AllKyuubiConfiguration.scala
@@ -35,12 +35,12 @@ import org.apache.kyuubi.zookeeper.ZookeeperConf
  *
  * To run the entire test suite:
  * {{{
- *   build/mvn clean install -Pspark-provided,flink-provided -DwildcardSuites=org.apache.kyuubi.config.AllKyuubiConfiguration
+ *   build/mvn clean install -Pflink-provided,spark-provided -DwildcardSuites=org.apache.kyuubi.config.AllKyuubiConfiguration
  * }}}
  *
  * To re-generate golden files for entire suite, run:
  * {{{
- *   KYUUBI_UPDATE=1 build/mvn clean install -Pspark-provided,flink-provided -DwildcardSuites=org.apache.kyuubi.config.AllKyuubiConfiguration
+ *   KYUUBI_UPDATE=1 build/mvn clean install -Pflink-provided,spark-provided -DwildcardSuites=org.apache.kyuubi.config.AllKyuubiConfiguration
  * }}}
  */
 // scalastyle:on line.size.limit