diff --git a/.github/workflows/bigdl-release-scala.yml b/.github/workflows/bigdl-release-scala.yml index e717a0d787f..f6207f39bd3 100644 --- a/.github/workflows/bigdl-release-scala.yml +++ b/.github/workflows/bigdl-release-scala.yml @@ -103,7 +103,7 @@ jobs: sed -i 's/bigdl-parent-spark_${spark.version}<\/artifactId>/bigdl-parent-spark_3.1.3<\/artifactId>/' scala/serving/pom.xml sed -i 's/bigdl-parent-spark_${spark.version}<\/artifactId>/bigdl-parent-spark_3.1.3<\/artifactId>/' scala/ppml/pom.xml sed -i 's/bigdl-parent-spark_${spark.version}<\/artifactId>/bigdl-parent-spark_3.1.3<\/artifactId>/' scala/assembly/pom.xml - mvn clean deploy -DskipTests -Dspark.version=3.1.3 -DSPARK_PLATFORM=SPARK_3.1 -P spark_3.x -P sign -X -DstagingProgressTimeoutMinutes=20 -Dgpg.passphrase=BigDL2017 --file scala/pom.xml + mvn clean deploy -DskipTests -Dspark.version=3.1.3 -DSPARK_PLATFORM=SPARK_3.1 -P spark_3.x -P sign -P release-assembly -X -DstagingProgressTimeoutMinutes=20 -Dgpg.passphrase=BigDL2017 --file scala/pom.xml mv scala/pom.xml.origin scala/pom.xml mv scala/common/spark-version/pom.xml.origin scala/common/spark-version/pom.xml mv scala/common/spark-version/3.0/pom.xml.origin scala/common/spark-version/3.0/pom.xml @@ -138,7 +138,7 @@ jobs: sed -i 's/bigdl-parent-spark_${spark.version}<\/artifactId>/bigdl-parent-spark_2.4.6<\/artifactId>/' scala/serving/pom.xml sed -i 's/bigdl-parent-spark_${spark.version}<\/artifactId>/bigdl-parent-spark_2.4.6<\/artifactId>/' scala/ppml/pom.xml sed -i 's/bigdl-parent-spark_${spark.version}<\/artifactId>/bigdl-parent-spark_2.4.6<\/artifactId>/' scala/assembly/pom.xml - mvn clean deploy -DskipTests -Dspark.version=2.4.6 -DSPARK_PLATFORM=SPARK_2.4 -P spark_2.x -P sign -X -DstagingProgressTimeoutMinutes=20 -Dgpg.passphrase=BigDL2017 --file scala/pom.xml + mvn clean deploy -DskipTests -Dspark.version=2.4.6 -DSPARK_PLATFORM=SPARK_2.4 -P spark_2.x -P sign -P release-assembly -X -DstagingProgressTimeoutMinutes=20 -Dgpg.passphrase=BigDL2017 --file scala/pom.xml mv scala/pom.xml.origin scala/pom.xml mv scala/common/spark-version/pom.xml.origin scala/common/spark-version/pom.xml mv scala/common/spark-version/2.0/pom.xml.origin scala/common/spark-version/2.0/pom.xml diff --git a/scala/assembly/pom.xml b/scala/assembly/pom.xml index 18bb96bf337..7ef90549f67 100644 --- a/scala/assembly/pom.xml +++ b/scala/assembly/pom.xml @@ -172,7 +172,7 @@ - src/main/assembly/assembly.xml + ${assembly.xml.path} @@ -239,7 +239,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.5.1 without-spark diff --git a/scala/assembly/src/main/assembly/assembly-all.xml b/scala/assembly/src/main/assembly/assembly-all.xml new file mode 100644 index 00000000000..4d9112fc546 --- /dev/null +++ b/scala/assembly/src/main/assembly/assembly-all.xml @@ -0,0 +1,177 @@ + + dist-all + + dir + zip + + false + + + /conf + ${project.parent.basedir}/dllib/src/main/resources + + spark-bigdl.conf + + + + /bin + ${project.parent.basedir}/../scripts + + *with-dllib.sh + + + + /apps + ${project.parent.basedir}/../apps + + **/* + + + + /python + ${project.parent.basedir}/dllib/target + + bigdl-dllib*-python-api.zip + + + + /python + ${project.parent.basedir}/orca/target + + bigdl-orca*-python-api.zip + + + + /python + ${project.parent.basedir}/friesian/target + + bigdl-friesian*-python-api.zip + + + + /python + ${project.parent.basedir}/serving/target + + bigdl-serving*-python-api.zip + + + + /python + ${project.parent.basedir}/ppml/target + + bigdl-ppml*-python-api.zip + + + + /python + ${project.parent.basedir}/target + + bigdl*-python-api.zip + + + + /examples/dllib + ${project.parent.basedir}/../python/dllib/examples + + /** + + + + /examples/orca + ${project.parent.basedir}/../python/orca/example + + /** + + + + /examples/chronos + ${project.parent.basedir}/../python/chronos/example + + /** + + + + /examples/friesian + ${project.parent.basedir}/../python/friesian/example + + /** + + + + /examples/nano + ${project.parent.basedir}/../python/nano/example + + /** + + + + /examples/serving + ${project.parent.basedir}/../python/serving/example + + /** + + + + / + ${project.parent.basedir}/tpp + + /** + + + + /python + ${project.parent.basedir}/../python/ppml/scripts + + start-fl-server.py + + + + /python + ${project.parent.basedir}/../python/ppml/scripts + + start-fgboost-server.py + + + + /python/requirements + ${project.parent.basedir}/../python/requirements + + /** + + + + + + jars + + com.intel.analytics.bigdl:*:jar + + + com.intel.analytics.bigdl:bigdl-assembly*:jar + + + + jars + true + false + runtime + false + + com.intel.analytics.bigdl:*:jar + com.intel.analytics.zoo:*:jar + com.intel.analytics.bigdl.core.dist:all:jar + io.grpc:grpc-netty-shaded:jar + io.netty:netty-tcnative-boringssl-static:jar + com.intel.analytics.bigdl.core.native.opencv:opencv-java-x86_64-linux:jar + org.lz4:lz4-java:jar + org.apache.hadoop:*:jar + org.apache.flink:*:jar + org.apache.spark:*:jar + *:commons*:jar + *:slf4j*:jar + + + + \ No newline at end of file diff --git a/scala/common/spark-version/pom.xml b/scala/common/spark-version/pom.xml index 503eda16b13..0b800e897cb 100644 --- a/scala/common/spark-version/pom.xml +++ b/scala/common/spark-version/pom.xml @@ -27,7 +27,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.5.1 diff --git a/scala/dllib/pom.xml b/scala/dllib/pom.xml index cf6a7d51060..3ab7df01084 100644 --- a/scala/dllib/pom.xml +++ b/scala/dllib/pom.xml @@ -472,7 +472,7 @@ or shade plugin will be executed after assembly plugin. --> org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.5.1 diff --git a/scala/friesian/pom.xml b/scala/friesian/pom.xml index 298e54e833d..7fda5ebb5f6 100644 --- a/scala/friesian/pom.xml +++ b/scala/friesian/pom.xml @@ -447,7 +447,7 @@ or shade plugin will be executed after assembly plugin. --> org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.5.1 diff --git a/scala/orca/pom.xml b/scala/orca/pom.xml index 162d19ecc83..c1402c0b71d 100644 --- a/scala/orca/pom.xml +++ b/scala/orca/pom.xml @@ -425,7 +425,7 @@ or shade plugin will be executed after assembly plugin. --> org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.5.1 diff --git a/scala/pom.xml b/scala/pom.xml index 21015246251..0568d46696a 100644 --- a/scala/pom.xml +++ b/scala/pom.xml @@ -82,6 +82,7 @@ + src/main/assembly/assembly.xml false true @@ -167,7 +168,7 @@ 0.9.2 1.7.7 2.17.1 - 2.14.1 + 2.15.3 6.1.26 6.1.14 1.2 @@ -974,5 +975,11 @@ ${os-flag} + + release-assembly + + src/main/assembly/assembly-all.xml + + diff --git a/scala/ppml/pom.xml b/scala/ppml/pom.xml index babaf22eb68..4a89d4985d4 100644 --- a/scala/ppml/pom.xml +++ b/scala/ppml/pom.xml @@ -475,7 +475,7 @@ or shade plugin will be executed after assembly plugin. --> org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.5.1 diff --git a/scala/serving/pom.xml b/scala/serving/pom.xml index 4911336413d..84f66c05dfb 100644 --- a/scala/serving/pom.xml +++ b/scala/serving/pom.xml @@ -403,7 +403,7 @@ or shade plugin will be executed after assembly plugin. --> org.apache.maven.plugins maven-shade-plugin - 3.2.1 + 3.5.1