diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index 96597769d..a3151b913 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -8,7 +8,7 @@ (Please explain how this patch was tested. E.g. unit tests, integration tests, manual tests) (If this patch involves UI changes, please attach a screenshot; otherwise, remove this) -Please review https://livy.incubator.apache.org/community/ before opening a pull request. +Please review https://livy.apache.org/community/ before opening a pull request. ## Was this patch authored or co-authored using generative AI tooling? diff --git a/api/pom.xml b/api/pom.xml index f4b526df5..02e101770 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -20,12 +20,12 @@ org.apache.livy livy-main - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT org.apache.livy livy-api - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT jar diff --git a/assembly/pom.xml b/assembly/pom.xml index 94a8a265c..c609d41b7 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -20,12 +20,12 @@ org.apache.livy livy-main - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT ../pom.xml livy-assembly - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT pom diff --git a/client-common/pom.xml b/client-common/pom.xml index fd49c2ec0..0337d3796 100644 --- a/client-common/pom.xml +++ b/client-common/pom.xml @@ -20,12 +20,12 @@ org.apache.livy livy-main - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT org.apache.livy livy-client-common - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT jar diff --git a/client-http/pom.xml b/client-http/pom.xml index 1fd197019..7993f2acf 100644 --- a/client-http/pom.xml +++ b/client-http/pom.xml @@ -20,12 +20,12 @@ org.apache.livy livy-main - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT org.apache.livy livy-client-http - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT jar diff --git a/core/pom.xml b/core/pom.xml index fca0600b7..56774c2dc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,12 +22,12 @@ org.apache.livy multi-scala-project-root - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT ../scala/pom.xml livy-core-parent - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT pom diff --git a/core/scala-2.12/pom.xml b/core/scala-2.12/pom.xml index edc754540..5f3882ca3 100644 --- a/core/scala-2.12/pom.xml +++ b/core/scala-2.12/pom.xml @@ -19,13 +19,13 @@ 4.0.0 org.apache.livy livy-core_2.12 - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT jar org.apache.livy livy-core-parent - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT ../pom.xml diff --git a/coverage/pom.xml b/coverage/pom.xml index 096cc16a3..6aefb2093 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -23,11 +23,11 @@ org.apache.livy livy-main ../pom.xml - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT livy-coverage-report - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT pom diff --git a/dev/docker/README.md b/dev/docker/README.md index e2540384c..9f0356161 100644 --- a/dev/docker/README.md +++ b/dev/docker/README.md @@ -10,7 +10,7 @@ Following steps use Ubuntu as development environment but most of the instructio ``` $ mvn clean package -Pscala-2.12 -Pspark3 -DskipITs -DskipTests ``` -This generates a zip file for livy similar to `assembly/target/apache-livy-0.10.0-incubating-SNAPSHOT_2.12-bin.zip`. It's useful to use the `clean` target to avoid mixing with previously built dependencies/versions. +This generates a zip file for livy similar to `assembly/target/apache-livy-1.0.0-SNAPSHOT_2.12-bin.zip`. It's useful to use the `clean` target to avoid mixing with previously built dependencies/versions. ### Build container images locally * Build livy-dev-base, livy-dev-spark, livy-dev-server container images using provided script `build-images.sh` diff --git a/dev/docker/build-images.sh b/dev/docker/build-images.sh index aedb4c340..41f902aa6 100644 --- a/dev/docker/build-images.sh +++ b/dev/docker/build-images.sh @@ -29,7 +29,7 @@ HIVE_PACKAGE="apache-hive-${HIVE_VERSION}-bin.tar.gz" SPARK_VERSION=3.2.3 SPARK_PACKAGE="spark-${SPARK_VERSION}-bin-without-hadoop.tgz" SCALA_VERSION=2.12 -LIVY_VERSION="0.10.0-incubating-SNAPSHOT_${SCALA_VERSION}" +LIVY_VERSION="1.0.0-SNAPSHOT_${SCALA_VERSION}" LIVY_PACKAGE="apache-livy-${LIVY_VERSION}-bin.zip" LOCALLY_BUILT_LIVY_PACKAGE="${SCRIPT_DIR}/../../assembly/target/${LIVY_PACKAGE}" @@ -59,7 +59,7 @@ fi # Download livy if needed if [ ! -f "${SCRIPT_DIR}/livy-dev-server/${LIVY_PACKAGE}" ]; then curl --fail -L --retry 3 -o "${SCRIPT_DIR}/livy-dev-server/${LIVY_PACKAGE}" \ - "${APACHE_ARCHIVE_ROOT}/incubator/livy/${LIVY_VERSION}/${LIVY_PACKAGE}" + "${APACHE_ARCHIVE_ROOT}/livy/${LIVY_VERSION}/${LIVY_PACKAGE}" fi diff --git a/dev/docker/livy-dev-server/Dockerfile b/dev/docker/livy-dev-server/Dockerfile index 152343c7b..d2a9ece31 100644 --- a/dev/docker/livy-dev-server/Dockerfile +++ b/dev/docker/livy-dev-server/Dockerfile @@ -17,7 +17,7 @@ FROM livy-dev-spark:latest -ARG LIVY_VERSION=0.10.0-incubating-SNAPSHOT +ARG LIVY_VERSION=1.0.0-SNAPSHOT ARG ROOT_PATH=/opt RUN apt-get update \ @@ -35,6 +35,6 @@ RUN unzip ${LIVY_PACKAGE}.zip 1>/dev/null \ && rm ${LIVY_PACKAGE}.zip # Uncomment following line or add more such lines to replace the default jars with private builds. -# COPY livy-core_2.12-0.10.0-incubating-SNAPSHOT.jar ${SPARK_HOME}/repl_2.12-jars/livy-core_2.12-0.10.0-incubating-SNAPSHOT.jar +# COPY livy-core_2.12-1.0.0-SNAPSHOT.jar ${SPARK_HOME}/repl_2.12-jars/livy-core_2.12-1.0.0-SNAPSHOT.jar WORKDIR ${LIVY_HOME} diff --git a/dev/merge_livy_pr.py b/dev/merge_livy_pr.py index 335607ff7..771b8c308 100755 --- a/dev/merge_livy_pr.py +++ b/dev/merge_livy_pr.py @@ -19,13 +19,13 @@ # Utility for creating well-formed pull request merges and pushing them to Apache. # -# This utility assumes you already have local a incubator-livy git folder and that you -# have added remotes corresponding to both (i) the github apache incubator-livy +# This utility assumes you already have local a livy git folder and that you +# have added remotes corresponding to both (i) the github apache livy # mirror and (ii) the apache git repo. # -# 1. Adding github apache incubator-livy mirror remote to your local repo with name "apache-github" +# 1. Adding github apache livy mirror remote to your local repo with name "apache-github" # (for example) using "git remote add apache-github ...". -# 2. Adding apache incubator-livy remote to your local repo with name "apache" (for example) using +# 2. Adding apache livy remote to your local repo with name "apache" (for example) using # "git remote add apache ..." # 3. Invoke this script from LIVY_HOME (./dev/merge_livy_pr.py) and follow the prompted steps. # 4. If you want to handle the associated JIRA, JIRA_USERNAME and JIRA_PASSWORD should be set. @@ -49,7 +49,7 @@ except ImportError: JIRA_IMPORTED = False -# Location of your incubator-livy git development area +# Location of your livy git development area LIVY_HOME = os.environ.get("LIVY_HOME", os.getcwd()) # Remote name which points to the Gihub site PR_REMOTE_NAME = os.environ.get("PR_REMOTE_NAME", "apache-github") @@ -65,8 +65,8 @@ # https://github.com/settings/tokens. This script only requires the "public_repo" scope. GITHUB_OAUTH_KEY = os.environ.get("GITHUB_OAUTH_KEY") -GITHUB_BASE = "https://github.com/apache/incubator-livy/pull" -GITHUB_API_BASE = "https://api.github.com/repos/apache/incubator-livy" +GITHUB_BASE = "https://github.com/apache/livy/pull" +GITHUB_API_BASE = "https://api.github.com/repos/apache/livy" JIRA_BASE = "https://issues.apache.org/jira/browse" JIRA_API_BASE = "https://issues.apache.org/jira" # Prefix added to temporary branches @@ -151,7 +151,7 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc): merge_message_flags += ["-m", title] if body is not None: # We remove @ symbols from the body to avoid triggering e-mails - # to people every time someone creates a public fork of incubator-livy. + # to people every time someone creates a public fork of livy. merge_message_flags += ["-m", body.replace("@", "")] authors = "\n".join(["Author: %s" % a for a in distinct_authors]) diff --git a/dev/release-build.sh b/dev/release-build.sh index e9eeede29..5ef6807ee 100755 --- a/dev/release-build.sh +++ b/dev/release-build.sh @@ -87,9 +87,9 @@ if [ -z "$GPG_PASSPHRASE" ]; then fi # Destination directory on remote server -RELEASE_STAGING_LOCATION="https://dist.apache.org/repos/dist/dev/incubator/livy" +RELEASE_STAGING_LOCATION="https://dist.apache.org/repos/dist/dev/livy" -LIVY_REPO=${LIVY_REPO:-https://gitbox.apache.org/repos/asf/incubator-livy.git} +LIVY_REPO=${LIVY_REPO:-https://gitbox.apache.org/repos/asf/livy.git} GPG="gpg --no-tty --batch --pinentry-mode loopback" NEXUS_ROOT=https://repository.apache.org/service/local/staging NEXUS_PROFILE=91529f2f65d84e # Profile for Livy staging uploads @@ -102,8 +102,8 @@ rm -rf release-staging mkdir release-staging cd release-staging -git clone $LIVY_REPO incubator-livy -cd incubator-livy +git clone $LIVY_REPO livy +cd livy git checkout $GIT_REF git_hash=`git rev-parse --short HEAD` echo "Checked out Livy git hash $git_hash" @@ -127,7 +127,7 @@ SCALA_2_11_PROFILES="-Pscala-2.11" if [[ "$1" == "package" ]]; then # Source and binary tarballs echo "Packaging release tarballs" - cp -r incubator-livy $ARCHIVE_NAME_PREFIX + cp -r livy $ARCHIVE_NAME_PREFIX zip -r $SRC_ARCHIVE $ARCHIVE_NAME_PREFIX echo $GPG_PASSPHRASE | $GPG --passphrase-fd 0 --armour --output $SRC_ARCHIVE.asc --detach-sig $SRC_ARCHIVE shasum -a 512 $SRC_ARCHIVE > $SRC_ARCHIVE.sha512 @@ -138,7 +138,7 @@ if [[ "$1" == "package" ]]; then BIN_ARCHIVE="${ARCHIVE_NAME_PREFIX}_$1-bin.zip" MVN_FLAGS="clean package -DskipITs -DskipTests -Dgenerate-third-party -e $2" - cp -r incubator-livy $ARCHIVE_NAME_PREFIX-bin + cp -r livy $ARCHIVE_NAME_PREFIX-bin cd $ARCHIVE_NAME_PREFIX-bin $MVN $MVN_FLAGS @@ -178,7 +178,7 @@ if [[ "$1" == "publish-release" ]]; then tmp_repo=$(pwd) cd .. - cd incubator-livy + cd livy # Publish Livy to Maven release repo echo "Publishing Livy checkout at '$GIT_REF' ($git_hash)" echo "Publish version is $LIVY_VERSION" diff --git a/docs/README.md b/docs/README.md index 732adb7f5..a3191fd78 100644 --- a/docs/README.md +++ b/docs/README.md @@ -61,13 +61,13 @@ NOTE: To skip the step of building and copying over the Scala and Java API docs, jekyll build`. -## Publishing Docs to [livy.incubator.apache.org] +## Publishing Docs to [livy.apache.org] 1. Build Livy Docs (`cd docs` then `bundle exec jekyll build`). 2. Copy the contents of `docs/target/` excluding `assets/` into a new directory (eg. `0.4.0/`) and -move it into the `docs/` directory in your local fork of `apache/incubator-livy-website`. +move it into the `docs/` directory in your local fork of `apache/livy-website`. 3. If nesesary, update the `latest` symlink to point to the new directory. -4. Open a pull request to `apache/incubator-livy-website` with the update. +4. Open a pull request to `apache/livy-website` with the update. Note: If you made any changes to files in the `assets/` directory you will need to replicate those -changes in the corresponding files in `apache/incubator-livy-website` in the pull request. \ No newline at end of file +changes in the corresponding files in `apache/livy-website` in the pull request. diff --git a/docs/_data/project.yml b/docs/_data/project.yml index 7f5528d44..d175723b9 100644 --- a/docs/_data/project.yml +++ b/docs/_data/project.yml @@ -16,6 +16,6 @@ # Apache Project configurations # name: Apache Livy -version: 0.10.0-incubating-SNAPSHOT +version: 1.0.0-SNAPSHOT -podling: true +podling: false diff --git a/docs/programmatic-api.md b/docs/programmatic-api.md index bb64a4b8c..dc0370c86 100644 --- a/docs/programmatic-api.md +++ b/docs/programmatic-api.md @@ -35,7 +35,7 @@ Add the Livy client dependency to your application's POM: org.apache.livy livy-client-http - 0.7.0-incubating + 1.0.0 ``` diff --git a/examples/pom.xml b/examples/pom.xml index 83ed3407a..521cacacb 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -23,13 +23,13 @@ org.apache.livy livy-main - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT ../pom.xml org.apache.livy livy-examples - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT jar diff --git a/integration-test/pom.xml b/integration-test/pom.xml index a803b3573..1f9d67a9e 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -23,11 +23,11 @@ org.apache.livy livy-main ../pom.xml - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT livy-integration-test - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT jar diff --git a/pom.xml b/pom.xml index d106f9701..3ba2d405e 100644 --- a/pom.xml +++ b/pom.xml @@ -22,11 +22,11 @@ org.apache.livy livy-main - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT pom Livy Project Parent POM Livy Project - http://livy.incubating.apache.org/ + http://livy.apache.org/ org.apache @@ -43,9 +43,9 @@ - scm:git:git@github.com:apache/incubator-livy.git - scm:git:https://gitbox.apache.org/repos/asf/incubator-livy.git - scm:git:git@github.com:apache/incubator-livy.git + scm:git:git@github.com:apache/livy.git + scm:git:https://gitbox.apache.org/repos/asf/livy.git + scm:git:git@github.com:apache/livy.git HEAD @@ -57,23 +57,23 @@ Dev Mailing List - dev@livy.incubating.apache.org - dev-subscribe@livy.incubating.apache.org - dev-unsubscribe@livy.incubating.apache.org + dev@livy.apache.org + dev-subscribe@livy.apache.org + dev-unsubscribe@livy.apache.org User Mailing List - user@livy.incubating.apache.org - user-subscribe@livy.incubating.apache.org - user-unsubscribe@livy.incubating.apache.org + user@livy.apache.org + user-subscribe@livy.apache.org + user-unsubscribe@livy.apache.org Commits Mailing List - commits@livy.incubating.apache.org - commits-subscribe@livy.incubating.apache.org - commits-unsubscribe@livy.incubating.apache.org + commits@livy.apache.org + commits-subscribe@livy.apache.org + commits-unsubscribe@livy.apache.org diff --git a/python-api/pom.xml b/python-api/pom.xml index 03fa5722c..fe71b3747 100644 --- a/python-api/pom.xml +++ b/python-api/pom.xml @@ -23,13 +23,13 @@ org.apache.livy livy-main - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT ../pom.xml org.apache.livy livy-python-api - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT pom diff --git a/python-api/setup.py b/python-api/setup.py index 511592f26..4d7b9b5f2 100644 --- a/python-api/setup.py +++ b/python-api/setup.py @@ -37,14 +37,14 @@ setup( name='livy-python-api', - version="0.10.0-incubating-SNAPSHOT", + version="1.0.0-SNAPSHOT", packages=["livy", "livy-tests"], package_dir={ "": "src/main/python", "livy-tests": "src/test/python/livy-tests", }, - url='https://github.com/apache/incubator-livy', - author_email='user@livy.incubator.apache.org', + url='https://github.com/apache/livy', + author_email='user@livy.apache.org', license='Apache License, Version 2.0', description=DESCRIPTION, platforms=['any'], diff --git a/repl/pom.xml b/repl/pom.xml index b3e96324f..890a67807 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -23,11 +23,11 @@ org.apache.livy multi-scala-project-root ../scala/pom.xml - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT livy-repl-parent - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT pom diff --git a/repl/scala-2.12/pom.xml b/repl/scala-2.12/pom.xml index 9a1e87d99..1ee58d2f1 100644 --- a/repl/scala-2.12/pom.xml +++ b/repl/scala-2.12/pom.xml @@ -21,13 +21,13 @@ 4.0.0 org.apache.livy livy-repl_2.12 - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT jar org.apache.livy livy-repl-parent - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT ../pom.xml diff --git a/rsc/pom.xml b/rsc/pom.xml index c45d37619..76f79de1c 100644 --- a/rsc/pom.xml +++ b/rsc/pom.xml @@ -21,7 +21,7 @@ org.apache.livy livy-main - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT ../pom.xml diff --git a/scala-api/pom.xml b/scala-api/pom.xml index 991fb4412..73d1e6ad7 100644 --- a/scala-api/pom.xml +++ b/scala-api/pom.xml @@ -23,12 +23,12 @@ org.apache.livy multi-scala-project-root - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT ../scala/pom.xml livy-scala-api-parent - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT pom diff --git a/scala-api/scala-2.12/pom.xml b/scala-api/scala-2.12/pom.xml index 7da12d5f9..a2cf8e90c 100644 --- a/scala-api/scala-2.12/pom.xml +++ b/scala-api/scala-2.12/pom.xml @@ -19,13 +19,13 @@ 4.0.0 org.apache.livy livy-scala-api_2.12 - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT jar org.apache.livy livy-scala-api-parent - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT ../pom.xml diff --git a/scala/pom.xml b/scala/pom.xml index ee217fbcb..c287039cc 100644 --- a/scala/pom.xml +++ b/scala/pom.xml @@ -21,13 +21,13 @@ 4.0.0 org.apache.livy multi-scala-project-root - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT pom org.apache.livy livy-main - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT ../pom.xml diff --git a/server/pom.xml b/server/pom.xml index 29fe3555c..3408769e8 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -23,11 +23,11 @@ org.apache.livy livy-main ../pom.xml - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT livy-server - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT jar diff --git a/test-lib/pom.xml b/test-lib/pom.xml index 5d4241898..b4db64f08 100644 --- a/test-lib/pom.xml +++ b/test-lib/pom.xml @@ -20,12 +20,12 @@ org.apache.livy livy-main - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT org.apache.livy livy-test-lib - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT jar diff --git a/thriftserver/client/pom.xml b/thriftserver/client/pom.xml index 2744d343d..581c9aa08 100644 --- a/thriftserver/client/pom.xml +++ b/thriftserver/client/pom.xml @@ -21,7 +21,7 @@ livy-main org.apache.livy - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/thriftserver/server/pom.xml b/thriftserver/server/pom.xml index 759a75174..ce6284618 100644 --- a/thriftserver/server/pom.xml +++ b/thriftserver/server/pom.xml @@ -22,7 +22,7 @@ livy-main org.apache.livy - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT ../../pom.xml diff --git a/thriftserver/session/pom.xml b/thriftserver/session/pom.xml index e7be3fe92..5dbde855b 100644 --- a/thriftserver/session/pom.xml +++ b/thriftserver/session/pom.xml @@ -22,7 +22,7 @@ org.apache.livy livy-main - 0.10.0-incubating-SNAPSHOT + 1.0.0-SNAPSHOT ../../pom.xml