diff --git a/java/build-jar-multiplatform.sh b/java/build-jar-multiplatform.sh index e21eb0a98..97bbfc91f 100755 --- a/java/build-jar-multiplatform.sh +++ b/java/build-jar-multiplatform.sh @@ -68,10 +68,12 @@ build_jars_darwin() { } build_jars_multiplatform() { - if [[ "${TRAVIS_REPO_SLUG-}" != "ray-project/ray" || "${TRAVIS_PULL_REQUEST-}" != "false" ]]; then - echo "Skip build multiplatform jars when this build is from a pull request or - not a build for commit in ray-project/ray." - return + if [ "${TRAVIS-}" = true ]; then + if [[ "${TRAVIS_REPO_SLUG-}" != "ray-project/ray" || "${TRAVIS_PULL_REQUEST-}" != "false" ]]; then + echo "Skip build multiplatform jars when this build is from a pull request or + not a build for commit in ray-project/ray." + return + fi fi download_jars "ray-runtime-$version.jar" "streaming-runtime-$version.jar" prepare_native @@ -140,10 +142,10 @@ deploy_jars() { fi fi echo "Start deploying jars" - cd "$WORKSPACE_DIR"/java - mvn -T16 deploy -Dmaven.test.skip=true -Dcheckstyle.skip - cd "$WORKSPACE_DIR"/streaming/java - mvn -T16 deploy -Dmaven.test.skip=true -Dcheckstyle.skip + cd "$WORKSPACE_DIR/java" + mvn -T16 deploy -Dmaven.test.skip=true -Dcheckstyle.skip -Prelease + cd "$WORKSPACE_DIR/streaming/java" + mvn -T16 deploy -Dmaven.test.skip=true -Dcheckstyle.skip -Prelease echo "Finished deploying jars" } diff --git a/java/pom.xml b/java/pom.xml index 60c2bffec..99aa6d943 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -1,13 +1,41 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - pom - io.ray ray-superpom 0.1-SNAPSHOT + pom + Ray Project Parent POM + A fast and simple framework for building and running distributed applications. + + https://github.com/ray-project/ray + + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + https://github.com/ray-project/ray + git@github.com:ray-project/ray.git + scm:git:ssh://github.com:ray-project/ray.git + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + api runtime @@ -21,10 +49,32 @@ 0.1-SNAPSHOT - - - - + + + release + + + release + true + + + + ${basedir} + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + + @@ -49,13 +99,28 @@ attach-sources - deploy jar + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + attach-javadocs + + jar + + + + + -Xdoclint:none + + org.apache.maven.plugins @@ -79,21 +144,6 @@ maven-assembly-plugin 2.2 - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - deploy - - jar - - - - maven-deploy-plugin 2.8.2 @@ -132,6 +182,26 @@ false + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + + sign + + + + + --pinentry-mode + loopback + + + + + @@ -139,6 +209,10 @@ org.apache.maven.plugins maven-checkstyle-plugin + + org.apache.maven.plugins + maven-source-plugin + diff --git a/java/runtime/pom.xml b/java/runtime/pom.xml index adb7153ac..61ae25c51 100644 --- a/java/runtime/pom.xml +++ b/java/runtime/pom.xml @@ -13,8 +13,25 @@ ray-runtime ray runtime ray runtime implementation - jar + + ${basedir}/../../build/java + + + + release + + + release + true + + false + + + ${basedir} + + + @@ -139,7 +156,7 @@ maven-jar-plugin 2.3.1 - ${basedir}/../../build/java + ${output.directory} diff --git a/java/runtime/pom_template.xml b/java/runtime/pom_template.xml index ec09ca5c4..55a22c59c 100644 --- a/java/runtime/pom_template.xml +++ b/java/runtime/pom_template.xml @@ -13,8 +13,25 @@ ray-runtime ray runtime ray runtime implementation - jar + + ${basedir}/../../build/java + + + + release + + + release + true + + false + + + ${basedir} + + + @@ -60,7 +77,7 @@ maven-jar-plugin 2.3.1 - ${basedir}/../../build/java + ${output.directory} diff --git a/java/test/pom.xml b/java/test/pom.xml index e3c6e8a46..9cd773a05 100644 --- a/java/test/pom.xml +++ b/java/test/pom.xml @@ -16,6 +16,10 @@ jar + + true + + io.ray diff --git a/java/test/pom_template.xml b/java/test/pom_template.xml index 01db3d5a8..c5a074ad0 100644 --- a/java/test/pom_template.xml +++ b/java/test/pom_template.xml @@ -16,6 +16,10 @@ jar + + true + + io.ray diff --git a/java/tutorial/pom.xml b/java/tutorial/pom.xml index cecad8d8a..a056d3d57 100644 --- a/java/tutorial/pom.xml +++ b/java/tutorial/pom.xml @@ -18,6 +18,10 @@ jar + + true + + io.ray diff --git a/java/tutorial/pom_template.xml b/java/tutorial/pom_template.xml index a3c8e9ff6..55917ab6c 100644 --- a/java/tutorial/pom_template.xml +++ b/java/tutorial/pom_template.xml @@ -18,6 +18,10 @@ jar + + true + + io.ray diff --git a/streaming/java/pom.xml b/streaming/java/pom.xml index 222093041..9fea52c93 100644 --- a/streaming/java/pom.xml +++ b/streaming/java/pom.xml @@ -1,167 +1,241 @@ - - 4.0.0 - pom + 4.0.0 + io.ray + ray-streaming + 0.1-SNAPSHOT + pom + Ray Project Streaming Parent POM + A streaming framework built on ray + https://github.com/ray-project/ray - io.ray - ray-streaming - 0.1-SNAPSHOT - ray streaming - ray streaming - - streaming-api - streaming-runtime - streaming-state - + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + - - 1.8 - UTF-8 - 0.1-SNAPSHOT - 1.7.25 - 1.2.17 - 6.9.10 - 1.10.19 - 27.0.1-jre - 2.57 - + + https://github.com/ray-project/ray + git@github.com:ray-project/ray.git + scm:git:ssh://github.com:ray-project/ray.git + - - - com.google.guava - guava - ${guava.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - org.testng - testng - ${testng.version} - - + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.1 - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - -parameters - -parameters - - + + streaming-api + streaming-runtime + streaming-state + - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - deploy - - jar - - - - + + 1.8 + UTF-8 + 0.1-SNAPSHOT + 1.7.25 + 1.2.17 + 6.9.10 + 1.10.19 + 27.0.1-jre + 2.57 + - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - org.apache.maven.plugins - maven-clean-plugin - 3.0.0 - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - deploy - - jar - - - - - - maven-deploy-plugin - 2.8.2 - - - deploy - deploy - - deploy - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.0.0 - - - validate - validate - - check - - - - - ../../java/checkstyle.xml - checkstyle-suppressions.xml - UTF-8 - true - true - true - warning - ${project.build.directory}/checkstyle-errors.xml - false - - - - + + + release + + + release + true + + + + ${basedir} + + - - org.apache.maven.plugins - maven-checkstyle-plugin - + + org.apache.maven.plugins + maven-gpg-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + - + + + + + + + com.google.guava + guava + ${guava.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + org.testng + testng + ${testng.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + -parameters + -parameters + + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + attach-javadocs + + jar + + + + + -Xdoclint:none + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + org.apache.maven.plugins + maven-clean-plugin + 3.0.0 + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2 + + + maven-deploy-plugin + 2.8.2 + + + deploy + deploy + + deploy + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.0.0 + + + validate + validate + + check + + + + + ../../java/checkstyle.xml + checkstyle-suppressions.xml + UTF-8 + true + true + true + warning + ${project.build.directory}/checkstyle-errors.xml + false + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + + sign + + + + + --pinentry-mode + loopback + + + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + diff --git a/streaming/java/streaming-api/pom.xml b/streaming/java/streaming-api/pom.xml index 4e100fefd..0f71d8b77 100644 --- a/streaming/java/streaming-api/pom.xml +++ b/streaming/java/streaming-api/pom.xml @@ -3,36 +3,36 @@ - - ray-streaming - io.ray - 0.1-SNAPSHOT - - 4.0.0 + + ray-streaming + io.ray + 0.1-SNAPSHOT + + 4.0.0 - streaming-api - ray streaming api - ray streaming api + streaming-api + ray streaming api + ray streaming api - jar + jar - - - io.ray - ray-api - ${project.version} - - - io.ray - ray-runtime - ${project.version} - - - org.ray - streaming-state - ${project.version} - - + + + io.ray + ray-api + ${project.version} + + + io.ray + ray-runtime + ${project.version} + + + io.ray + streaming-state + ${project.version} + + com.google.code.findbugs jsr305 3.0.2 @@ -67,5 +67,5 @@ testng 6.9.10 - + diff --git a/streaming/java/streaming-api/pom_template.xml b/streaming/java/streaming-api/pom_template.xml index 9b94fb278..fa5a4a792 100644 --- a/streaming/java/streaming-api/pom_template.xml +++ b/streaming/java/streaming-api/pom_template.xml @@ -3,35 +3,35 @@ - - ray-streaming - io.ray - 0.1-SNAPSHOT - - 4.0.0 + + ray-streaming + io.ray + 0.1-SNAPSHOT + + 4.0.0 - streaming-api - ray streaming api - ray streaming api + streaming-api + ray streaming api + ray streaming api - jar + jar - - - io.ray - ray-api - ${project.version} - - - io.ray - ray-runtime - ${project.version} - - - org.ray - streaming-state - ${project.version} - - {generated_bzl_deps} - + + + io.ray + ray-api + ${project.version} + + + io.ray + ray-runtime + ${project.version} + + + io.ray + streaming-state + ${project.version} + + {generated_bzl_deps} + diff --git a/streaming/java/streaming-runtime/pom.xml b/streaming/java/streaming-runtime/pom.xml index 19633c4be..1a5e57d8e 100644 --- a/streaming/java/streaming-runtime/pom.xml +++ b/streaming/java/streaming-runtime/pom.xml @@ -3,35 +3,53 @@ - - ray-streaming - io.ray - 0.1-SNAPSHOT - - 4.0.0 + + ray-streaming + io.ray + 0.1-SNAPSHOT + + 4.0.0 - streaming-runtime - ray streaming runtime - ray streaming runtime - jar + streaming-runtime + ray streaming runtime + ray streaming runtime + jar + + ${basedir}/../../build/java + + + + release + + + release + true + + false + + + ${basedir} + + + - - - io.ray - ray-api - ${project.version} - - - io.ray - ray-runtime - ${project.version} - - - io.ray - streaming-api - ${project.version} - - + + + io.ray + ray-api + ${project.version} + + + io.ray + ray-runtime + ${project.version} + + + io.ray + streaming-api + ${project.version} + + com.github.davidmoten flatbuffers-java 1.9.0.1 @@ -101,46 +119,46 @@ testng 6.9.10 - + - - - - src/main/resources - - - native_dependencies - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies-to-build - package - - copy-dependencies - - - ${basedir}/../../build/java - false - false - true - - - - + + + + src/main/resources + + + native_dependencies + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies-to-build + package + + copy-dependencies + + + ${basedir}/../../build/java + false + false + true + + + + - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - ${basedir}/../../build/java - - - - + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + ${output.directory} + + + + diff --git a/streaming/java/streaming-runtime/pom_template.xml b/streaming/java/streaming-runtime/pom_template.xml index 832fd72bd..88dd84136 100644 --- a/streaming/java/streaming-runtime/pom_template.xml +++ b/streaming/java/streaming-runtime/pom_template.xml @@ -3,75 +3,93 @@ - - ray-streaming - io.ray - 0.1-SNAPSHOT - - 4.0.0 + + ray-streaming + io.ray + 0.1-SNAPSHOT + + 4.0.0 - streaming-runtime - ray streaming runtime - ray streaming runtime - jar + streaming-runtime + ray streaming runtime + ray streaming runtime + jar + + ${basedir}/../../build/java + + + + release + + + release + true + + false + + + ${basedir} + + + - - - io.ray - ray-api - ${project.version} - - - io.ray - ray-runtime - ${project.version} - - - io.ray - streaming-api - ${project.version} - - {generated_bzl_deps} - + + + io.ray + ray-api + ${project.version} + + + io.ray + ray-runtime + ${project.version} + + + io.ray + streaming-api + ${project.version} + + {generated_bzl_deps} + - - - - src/main/resources - - - native_dependencies - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies-to-build - package - - copy-dependencies - - - ${basedir}/../../build/java - false - false - true - - - - + + + + src/main/resources + + + native_dependencies + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies-to-build + package + + copy-dependencies + + + ${basedir}/../../build/java + false + false + true + + + + - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - ${basedir}/../../build/java - - - - + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + ${output.directory} + + + + diff --git a/streaming/java/streaming-state/pom.xml b/streaming/java/streaming-state/pom.xml index 77e3de57b..c8a09945d 100644 --- a/streaming/java/streaming-state/pom.xml +++ b/streaming/java/streaming-state/pom.xml @@ -9,8 +9,9 @@ 4.0.0 - org.ray streaming-state + ray streaming state + ray streaming state diff --git a/streaming/java/streaming-state/pom_template.xml b/streaming/java/streaming-state/pom_template.xml index adaf7908e..c3d1b9eb1 100644 --- a/streaming/java/streaming-state/pom_template.xml +++ b/streaming/java/streaming-state/pom_template.xml @@ -3,20 +3,20 @@ - - ray-streaming - io.ray - 0.1-SNAPSHOT - - 4.0.0 + + ray-streaming + io.ray + 0.1-SNAPSHOT + + 4.0.0 - streaming-state - ray streaming state - ray streaming state - jar + streaming-state + ray streaming state + ray streaming state + jar - - {generated_bzl_deps} - + + {generated_bzl_deps} +