Repository: zeppelin Updated Branches: refs/heads/branch-0.8 4cab3be00 -> 52ff1ca6c (forced update)
[HOTFIX] Script and pom file fix for release Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/52ff1ca6 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/52ff1ca6 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/52ff1ca6 Branch: refs/heads/branch-0.8 Commit: 52ff1ca6c1ec68864a00d49cf4e3c5d7f54e3f39 Parents: c76812a Author: Jeff Zhang <zjf...@apache.org> Authored: Thu May 3 15:21:37 2018 +0800 Committer: Jeff Zhang <zjf...@apache.org> Committed: Thu May 3 15:21:37 2018 +0800 ---------------------------------------------------------------------- dev/create_release.sh | 4 ++-- dev/publish_release.sh | 2 +- pom.xml | 3 +++ zeppelin-distribution/pom.xml | 21 --------------------- 4 files changed, 6 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/52ff1ca6/dev/create_release.sh ---------------------------------------------------------------------- diff --git a/dev/create_release.sh b/dev/create_release.sh index 9cb61e0..6836e02 100755 --- a/dev/create_release.sh +++ b/dev/create_release.sh @@ -106,8 +106,8 @@ function make_binary_release() { git_clone make_source_package -make_binary_release all "-Pspark-2.1 -Phadoop-2.6 -Pscala-${SCALA_VERSION}" -make_binary_release netinst "-Pspark-2.1 -Phadoop-2.6 -Pscala-${SCALA_VERSION} -pl zeppelin-interpreter,zeppelin-zengine,:zeppelin-display_${SCALA_VERSION},:zeppelin-spark-dependencies_${SCALA_VERSION},:zeppelin-spark_${SCALA_VERSION},zeppelin-web,zeppelin-server,zeppelin-distribution -am" +make_binary_release all "-Pspark-2.2 -Pscala-${SCALA_VERSION}" +make_binary_release netinst "-Pspark-2.2 -Pscala-${SCALA_VERSION} -pl zeppelin-interpreter,zeppelin-zengine,spark/interpreter,spark/spark-dependencies,zeppelin-web,zeppelin-server,zeppelin-distribution -am" # remove non release files and dirs rm -rf "${WORKING_DIR}/zeppelin" http://git-wip-us.apache.org/repos/asf/zeppelin/blob/52ff1ca6/dev/publish_release.sh ---------------------------------------------------------------------- diff --git a/dev/publish_release.sh b/dev/publish_release.sh index b569ec4..ec3c1aa 100755 --- a/dev/publish_release.sh +++ b/dev/publish_release.sh @@ -46,7 +46,7 @@ if [[ $RELEASE_VERSION == *"SNAPSHOT"* ]]; then DO_SNAPSHOT="yes" fi -PUBLISH_PROFILES="-Ppublish-distr -Pspark-2.1 -Phadoop-2.6 -Pr" +PUBLISH_PROFILES="-Ppublish-distr -Pspark-2.2 -Pr" PROJECT_OPTIONS="-pl !zeppelin-distribution" NEXUS_STAGING="https://repository.apache.org/service/local/staging"; NEXUS_PROFILE="153446d1ac37c4" http://git-wip-us.apache.org/repos/asf/zeppelin/blob/52ff1ca6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8fba697..16fe86c 100644 --- a/pom.xml +++ b/pom.xml @@ -888,6 +888,9 @@ <goals> <goal>jar</goal> </goals> +<configuration> <!-- add this to disable checking --> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/52ff1ca6/zeppelin-distribution/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml index ed05c93..2238bc9 100644 --- a/zeppelin-distribution/pom.xml +++ b/zeppelin-distribution/pom.xml @@ -171,27 +171,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>com.bazaarvoice.maven.plugins</groupId> - <artifactId>s3-upload-maven-plugin</artifactId> - <version>1.2</version> - <configuration> - <bucketName>zeppel.in</bucketName> - <endpoint>s3-ap-northeast-1.amazonaws.com</endpoint> - <makePublic>true</makePublic> - <sourceFile>zeppelin-distribution/target/zeppelin-${project.version}.tar.gz</sourceFile> - <destinationFile>zeppelin-${project.version}.tar.gz</destinationFile> - </configuration> - <executions> - <execution> - <id>publish-distr-to-s3</id> - <phase>package</phase> - <goals> - <goal>s3-upload</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </profile>
