Skip to content

release assembly all #9399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 9, 2023
Merged

release assembly all #9399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/bigdl-release-scala.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
sed -i 's/<artifactId>bigdl-parent-spark_${spark.version}<\/artifactId>/<artifactId>bigdl-parent-spark_3.1.3<\/artifactId>/' scala/serving/pom.xml
sed -i 's/<artifactId>bigdl-parent-spark_${spark.version}<\/artifactId>/<artifactId>bigdl-parent-spark_3.1.3<\/artifactId>/' scala/ppml/pom.xml
sed -i 's/<artifactId>bigdl-parent-spark_${spark.version}<\/artifactId>/<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
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
sed -i 's/<artifactId>bigdl-parent-spark_${spark.version}<\/artifactId>/<artifactId>bigdl-parent-spark_2.4.6<\/artifactId>/' scala/serving/pom.xml
sed -i 's/<artifactId>bigdl-parent-spark_${spark.version}<\/artifactId>/<artifactId>bigdl-parent-spark_2.4.6<\/artifactId>/' scala/ppml/pom.xml
sed -i 's/<artifactId>bigdl-parent-spark_${spark.version}<\/artifactId>/<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
Expand Down
4 changes: 2 additions & 2 deletions scala/assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
<descriptor>${assembly.xml.path}</descriptor>
</descriptors>
</configuration>
</execution>
Expand Down Expand Up @@ -239,7 +239,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.5.1</version>
<executions>
<execution>
<id>without-spark</id>
Expand Down
177 changes: 177 additions & 0 deletions scala/assembly/src/main/assembly/assembly-all.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>dist-all</id>
<formats>
<format>dir</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<outputDirectory>/conf</outputDirectory>
<directory>${project.parent.basedir}/dllib/src/main/resources</directory>
<includes>
<include>spark-bigdl.conf</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/bin</outputDirectory>
<directory>${project.parent.basedir}/../scripts</directory>
<includes>
<include>*with-dllib.sh</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/apps</outputDirectory>
<directory>${project.parent.basedir}/../apps</directory>
<includes>
<include>**/*</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/python</outputDirectory>
<directory>${project.parent.basedir}/dllib/target</directory>
<includes>
<include>bigdl-dllib*-python-api.zip</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/python</outputDirectory>
<directory>${project.parent.basedir}/orca/target</directory>
<includes>
<include>bigdl-orca*-python-api.zip</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/python</outputDirectory>
<directory>${project.parent.basedir}/friesian/target</directory>
<includes>
<include>bigdl-friesian*-python-api.zip</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/python</outputDirectory>
<directory>${project.parent.basedir}/serving/target</directory>
<includes>
<include>bigdl-serving*-python-api.zip</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/python</outputDirectory>
<directory>${project.parent.basedir}/ppml/target</directory>
<includes>
<include>bigdl-ppml*-python-api.zip</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/python</outputDirectory>
<directory>${project.parent.basedir}/target</directory>
<includes>
<include>bigdl*-python-api.zip</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/examples/dllib</outputDirectory>
<directory>${project.parent.basedir}/../python/dllib/examples</directory>
<includes>
<include>/**</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/examples/orca</outputDirectory>
<directory>${project.parent.basedir}/../python/orca/example</directory>
<includes>
<include>/**</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/examples/chronos</outputDirectory>
<directory>${project.parent.basedir}/../python/chronos/example</directory>
<includes>
<include>/**</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/examples/friesian</outputDirectory>
<directory>${project.parent.basedir}/../python/friesian/example</directory>
<includes>
<include>/**</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/examples/nano</outputDirectory>
<directory>${project.parent.basedir}/../python/nano/example</directory>
<includes>
<include>/**</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/examples/serving</outputDirectory>
<directory>${project.parent.basedir}/../python/serving/example</directory>
<includes>
<include>/**</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/</outputDirectory>
<directory>${project.parent.basedir}/tpp</directory>
<includes>
<include>/**</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/python</outputDirectory>
<directory>${project.parent.basedir}/../python/ppml/scripts</directory>
<includes>
<include>start-fl-server.py</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/python</outputDirectory>
<directory>${project.parent.basedir}/../python/ppml/scripts</directory>
<includes>
<include>start-fgboost-server.py</include>
</includes>
</fileSet>
<fileSet>
<outputDirectory>/python/requirements</outputDirectory>
<directory>${project.parent.basedir}/../python/requirements</directory>
<includes>
<include>/**</include>
</includes>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>jars</outputDirectory>
<includes>
<include>com.intel.analytics.bigdl:*:jar</include>
</includes>
<excludes>
<exclude>com.intel.analytics.bigdl:bigdl-assembly*:jar</exclude>
</excludes>
</dependencySet>
<dependencySet>
<outputDirectory>jars</outputDirectory>
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
<scope>runtime</scope>
<useProjectArtifact>false</useProjectArtifact>
<excludes>
<exclude>com.intel.analytics.bigdl:*:jar</exclude>
<exclude>com.intel.analytics.zoo:*:jar</exclude>
<exclude>com.intel.analytics.bigdl.core.dist:all:jar</exclude>
<exclude>io.grpc:grpc-netty-shaded:jar</exclude>
<exclude>io.netty:netty-tcnative-boringssl-static:jar</exclude>
<exclude>com.intel.analytics.bigdl.core.native.opencv:opencv-java-x86_64-linux:jar</exclude>
<exclude>org.lz4:lz4-java:jar</exclude>
<exclude>org.apache.hadoop:*:jar</exclude>
<exclude>org.apache.flink:*:jar</exclude>
<exclude>org.apache.spark:*:jar</exclude>
<exclude>*:commons*:jar</exclude>
<exclude>*:slf4j*:jar</exclude>
</excludes>
</dependencySet>
</dependencySets>
</assembly>
2 changes: 1 addition & 1 deletion scala/common/spark-version/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.5.1</version>
<configuration>
<artifactSet>
<includes>
Expand Down
2 changes: 1 addition & 1 deletion scala/dllib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@
or shade plugin will be executed after assembly plugin. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.5.1</version>
<configuration>
<filters>
<filter>
Expand Down
2 changes: 1 addition & 1 deletion scala/friesian/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@
or shade plugin will be executed after assembly plugin. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.5.1</version>
<configuration>
<filters>
<filter>
Expand Down
2 changes: 1 addition & 1 deletion scala/orca/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
or shade plugin will be executed after assembly plugin. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.5.1</version>
<configuration>
<filters>
<filter>
Expand Down
9 changes: 8 additions & 1 deletion scala/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
</licenses>

<properties>
<assembly.xml.path>src/main/assembly/assembly.xml</assembly.xml.path>
<failIfNoTests>false</failIfNoTests>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>

Expand Down Expand Up @@ -167,7 +168,7 @@
<thrift.version>0.9.2</thrift.version>
<slf4j.version>1.7.7</slf4j.version>
<log4j.version>2.17.1</log4j.version>
<jackson.version>2.14.1</jackson.version>
<jackson.version>2.15.3</jackson.version>
<jetty.version>6.1.26</jetty.version>
<jetty.jspapi.version>6.1.14</jetty.jspapi.version>
<commons-cli.version>1.2</commons-cli.version>
Expand Down Expand Up @@ -974,5 +975,11 @@
<dist-os-name>${os-flag}</dist-os-name>
</properties>
</profile>
<profile>
<id>release-assembly</id>
<properties>
<assembly.xml.path>src/main/assembly/assembly-all.xml</assembly.xml.path>
</properties>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion scala/ppml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@
or shade plugin will be executed after assembly plugin. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.5.1</version>
<configuration>
<filters>
<filter>
Expand Down
2 changes: 1 addition & 1 deletion scala/serving/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@
or shade plugin will be executed after assembly plugin. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.5.1</version>
<configuration>
<filters>
<filter>
Expand Down