This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new de1cdf2 Remove incubator from pinot and superset (#8223)
de1cdf2 is described below
commit de1cdf2190cf91e53f947735cd364a5fe6125829
Author: Xiaotian (Jackie) Jiang <[email protected]>
AuthorDate: Thu Feb 17 18:46:59 2022 -0800
Remove incubator from pinot and superset (#8223)
---
CONTRIBUTING.md | 6 +++---
contrib/pinot-druid-benchmark/README.md | 6 +++---
docker/images/pinot-superset/README.md | 8 ++++----
docker/images/pinot-thirdeye/Dockerfile | 2 +-
docker/images/pinot-thirdeye/README.md | 8 ++++----
docker/images/pinot-thirdeye/docker-build.sh | 2 +-
docker/images/pinot/Dockerfile | 2 +-
docker/images/pinot/docker-build.sh | 2 +-
kubernetes/helm/README-dev.md | 2 +-
kubernetes/helm/index.yaml | 14 +++++++-------
kubernetes/helm/pinot/Chart.yaml | 2 +-
kubernetes/helm/presto/Chart.yaml | 2 +-
kubernetes/helm/thirdeye/Chart.yaml | 4 ++--
pinot-controller/pom.xml | 5 ++---
pom.xml | 2 +-
15 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3919110..e1c92e5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,7 +30,7 @@ If your change is relatively minor, you can skip this step.
If you are adding ne
### Create an issue for the change
-Create a Pinot issue [here](https://github.com/apache/incubator-pinot/issues)
for the change you would like to make. Provide information on why the change is
needed and how you plan to address it. Use the conversations on the issue as a
way to validate assumptions and the right way to proceed. Be sure to review
sections on [Backward and Forward compatibility
changes](https://docs.pinot.apache.org/developers/developers-and-contributors/contribution-guidelines#backward-and-forward-compatib
[...]
+Create a Pinot issue [here](https://github.com/apache/pinot/issues) for the
change you would like to make. Provide information on why the change is needed
and how you plan to address it. Use the conversations on the issue as a way to
validate assumptions and the right way to proceed. Be sure to review sections
on [Backward and Forward compatibility
changes](https://docs.pinot.apache.org/developers/developers-and-contributors/contribution-guidelines#backward-and-forward-compatibility-chan
[...]
If you have a design document, please refer to the design documents in your
Issue. You may even want to create multiple issues depending on the extent of
your change.
@@ -73,7 +73,7 @@ Please ensure your code is adequately documented. Some things
to consider for do
#### Code Formatting
* Ensure that the code you add is properly formatted as per the Pinot
style-sheets.
-* Pinot's style-sheets can be found in ```incubator-pinot/config```.
+* Pinot's style-sheets can be found in ```pinot/config```.
* For information on how to import the style-sheet into your IDE, refer
[here](https://docs.pinot.apache.org/developers/developers-and-contributors/code-setup#setup-ide).
#### Exceptions and Exception-Handling
@@ -181,7 +181,7 @@ $ git add <files required for the change>
$ git commit -m "Meaningful oneliner for the change"
$ git push origin <your issue branch>
-After this, create a PullRequest in `github
<https://github.com/apache/incubator-pinot/pulls>`_. Include the following
information in the description:
+After this, create a PullRequest in `github
<https://github.com/apache/pinot/pulls>`_. Include the following information in
the description:
* The changes that are included in the PR.
diff --git a/contrib/pinot-druid-benchmark/README.md
b/contrib/pinot-druid-benchmark/README.md
index b274237..549313b 100644
--- a/contrib/pinot-druid-benchmark/README.md
+++ b/contrib/pinot-druid-benchmark/README.md
@@ -234,9 +234,9 @@ executionFrameworkSpec:
segmentTarPushJobRunnerClassName:
'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentTarPushJobRunner'
segmentUriPushJobRunnerClassName:
'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentUriPushJobRunner'
jobType: SegmentCreationAndTarPush
-inputDirURI:
'/absolute/path/to/incubator-pinot/contrib/pinot-druid-benchmark/data_out/raw_data/'
+inputDirURI:
'/absolute/path/to/pinot/contrib/pinot-druid-benchmark/data_out/raw_data/'
includeFileNamePattern: 'glob:**/*.csv'
-outputDirURI:
'/absolute/path/to/incubator-pinot/contrib/pinot-druid-benchmark/data_out/segments/'
+outputDirURI:
'/absolute/path/to/pinot/contrib/pinot-druid-benchmark/data_out/segments/'
overwriteOutput: true
pinotFSSpecs:
- scheme: file
@@ -276,7 +276,7 @@ line appear in the output as:
```
...
-outputDirURI:
/absolute/path/to/incubator-pinot/contrib/pinot-druid-benchmark/data_out/segments/
+outputDirURI:
/absolute/path/to/pinot/contrib/pinot-druid-benchmark/data_out/segments/
...
```
diff --git a/docker/images/pinot-superset/README.md
b/docker/images/pinot-superset/README.md
index 1237ee7..d8c2c0d 100644
--- a/docker/images/pinot-superset/README.md
+++ b/docker/images/pinot-superset/README.md
@@ -21,14 +21,14 @@
# Superset
-Docker image for [Superset](https://github.com/apache/incubator-superset) with
Pinot integration.
+Docker image for [Superset](https://github.com/apache/superset) with Pinot
integration.
## How to build
-Pinot Superset image is built on top of
[apache/incubator-superset](https://hub.docker.com/r/apache/incubator-superset)
with Pinotdb driver.
+Pinot Superset image is built on top of
[apache/superset](https://hub.docker.com/r/apache/superset) with Pinotdb driver.
-Below command will build Superset image based on
`apache/incubator-superset:0.37` then tag it as
`apachepinot/pinot-superset:0.37`.
+Below command will build Superset image based on `apache/superset:0.37` then
tag it as `apachepinot/pinot-superset:0.37`.
```bash
docker build --build-arg SUPERSET_IMAGE_TAG=0.37 --tag
apachepinot/pinot-superset:0.37 .
@@ -42,7 +42,7 @@ docker push apachepinot/pinot-superset:0.37
## Configuration
-Follow the
[instructions](https://superset.incubator.apache.org/installation.html#configuration)
provided by Apache Superset for writing your own `superset_config.py`.
+Follow the
[instructions](https://superset.apache.org/installation.html#configuration)
provided by Apache Superset for writing your own `superset_config.py`.
Place this file in a local directory and mount this directory to
`/etc/superset` inside the container. This location is included in the image's
`PYTHONPATH`. Mounting this file to a different location is possible, but it
will need to be in the `PYTHONPATH`.
diff --git a/docker/images/pinot-thirdeye/Dockerfile
b/docker/images/pinot-thirdeye/Dockerfile
index 42e23c7..db15f03 100644
--- a/docker/images/pinot-thirdeye/Dockerfile
+++ b/docker/images/pinot-thirdeye/Dockerfile
@@ -22,7 +22,7 @@ FROM openjdk:8 AS thirdeye_build_env
LABEL [email protected]
ARG PINOT_BRANCH=master
-ARG PINOT_GIT_URL="https://github.com/apache/incubator-pinot.git";
+ARG PINOT_GIT_URL="https://github.com/apache/pinot.git";
RUN echo "Trying to build Thirdeye from [ ${PINOT_GIT_URL} ] on branch [
${PINOT_BRANCH} ]"
ENV TE_HOME=/opt/thirdeye
diff --git a/docker/images/pinot-thirdeye/README.md
b/docker/images/pinot-thirdeye/README.md
index 754805a..de2b67a 100644
--- a/docker/images/pinot-thirdeye/README.md
+++ b/docker/images/pinot-thirdeye/README.md
@@ -20,7 +20,7 @@
-->
# docker-pinot-thirdeye
-This is a docker image of [Apache
Thirdeye](https://github.com/apache/incubator-pinot/tree/master/thirdeye).
+This is a docker image of [Apache
Thirdeye](https://github.com/apache/pinot/tree/master/thirdeye).
## How to build a docker image
@@ -40,11 +40,11 @@ The docker image is tagged as `[Docker Tag]`.
`Git Branch`: The Pinot branch to build. Default is `master`.
-`Pinot Git URL`: The Pinot Git Repo to build, users can set it to their own
fork. Please note that, the URL is `https://` based, not `git://`. Default is
the Apache Repo: `https://github.com/apache/incubator-pinot.git`.
+`Pinot Git URL`: The Pinot Git Repo to build, users can set it to their own
fork. Please note that, the URL is `https://` based, not `git://`. Default is
the Apache Repo: `https://github.com/apache/pinot.git`.
* Example of building and tagging a snapshot on your own fork:
```SHELL
-./docker-build.sh thirdeye:latest master
https://github.com/apache/incubator-pinot.git
+./docker-build.sh thirdeye:latest master https://github.com/apache/pinot.git
```
## How to publish a docker image
@@ -65,7 +65,7 @@ Script `docker-build-and-push.sh` builds and publishes this
docker image to your
* Example of building and publishing a image to
[apachepinot/thirdeye](https://cloud.docker.com/u/apachepinot/repository/docker/apachepinot/thirdeye)
dockerHub repo.
```SHELL
-./docker-build-and-push.sh apachepinot/thirdeye:latest master
https://github.com/apache/incubator-pinot.git
+./docker-build-and-push.sh apachepinot/thirdeye:latest master
https://github.com/apache/pinot.git
```
## How to Run it
diff --git a/docker/images/pinot-thirdeye/docker-build.sh
b/docker/images/pinot-thirdeye/docker-build.sh
index 0521f0a..6e94608 100755
--- a/docker/images/pinot-thirdeye/docker-build.sh
+++ b/docker/images/pinot-thirdeye/docker-build.sh
@@ -39,7 +39,7 @@ if [[ "$#" -gt 2 ]]
then
PINOT_GIT_URL=$3
else
- PINOT_GIT_URL="https://github.com/apache/incubator-pinot.git";
+ PINOT_GIT_URL="https://github.com/apache/pinot.git";
fi
echo "Trying to build Thirdeye docker image from Git URL: [ ${PINOT_GIT_URL} ]
on branch: [ ${PINOT_BRANCH} ] and tag it as: [ ${DOCKER_TAG} ]."
diff --git a/docker/images/pinot/Dockerfile b/docker/images/pinot/Dockerfile
index ed2ee14..637230d 100644
--- a/docker/images/pinot/Dockerfile
+++ b/docker/images/pinot/Dockerfile
@@ -25,7 +25,7 @@ LABEL [email protected]
ARG PINOT_BRANCH=master
ARG KAFKA_VERSION=2.0
ARG JDK_VERSION=11
-ARG PINOT_GIT_URL="https://github.com/apache/incubator-pinot.git";
+ARG PINOT_GIT_URL="https://github.com/apache/pinot.git";
RUN echo "Trying to build Pinot from [ ${PINOT_GIT_URL} ] on branch [
${PINOT_BRANCH} ] with Kafka version [ ${KAFKA_VERSION} ]"
ENV PINOT_HOME=/opt/pinot
ENV PINOT_BUILD_DIR=/opt/pinot-build
diff --git a/docker/images/pinot/docker-build.sh
b/docker/images/pinot/docker-build.sh
index 3e653ab..b070015 100755
--- a/docker/images/pinot/docker-build.sh
+++ b/docker/images/pinot/docker-build.sh
@@ -39,7 +39,7 @@ if [[ "$#" -gt 2 ]]
then
PINOT_GIT_URL=$3
else
- PINOT_GIT_URL="https://github.com/apache/incubator-pinot.git";
+ PINOT_GIT_URL="https://github.com/apache/pinot.git";
fi
if [[ "$#" -gt 3 ]]
diff --git a/kubernetes/helm/README-dev.md b/kubernetes/helm/README-dev.md
index 233deb6..d763421 100644
--- a/kubernetes/helm/README-dev.md
+++ b/kubernetes/helm/README-dev.md
@@ -42,4 +42,4 @@ This step will generate an `index.yaml` file which contains
all the Charts infor
Update generated `index.yaml` accordingly:
- Revert the changes for all previous Charts;
-- Change `entries.pinot.source` to
`https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm`.
+- Change `entries.pinot.source` to
`https://github.com/apache/pinot/tree/master/kubernetes/helm`.
diff --git a/kubernetes/helm/index.yaml b/kubernetes/helm/index.yaml
index 70b38e9..77d2a99 100644
--- a/kubernetes/helm/index.yaml
+++ b/kubernetes/helm/index.yaml
@@ -25,7 +25,7 @@ entries:
name: pinot-dev
name: pinot
sources:
- - https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
+ - https://github.com/apache/pinot/tree/master/kubernetes/helm
urls:
- pinot-0.2.4.tgz
version: 0.2.4
@@ -53,7 +53,7 @@ entries:
name: pinot-dev
name: pinot
sources:
- - https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
+ - https://github.com/apache/pinot/tree/master/kubernetes/helm
urls:
- pinot-0.2.3.tgz
version: 0.2.3
@@ -81,7 +81,7 @@ entries:
name: pinot-dev
name: pinot
sources:
- - https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
+ - https://github.com/apache/pinot/tree/master/kubernetes/helm
urls:
- pinot-0.2.2.tgz
version: 0.2.2
@@ -109,7 +109,7 @@ entries:
name: pinot-dev
name: pinot
sources:
- - https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
+ - https://github.com/apache/pinot/tree/master/kubernetes/helm
urls:
- pinot-0.2.1.tgz
version: 0.2.1
@@ -137,7 +137,7 @@ entries:
name: pinot-dev
name: pinot
sources:
- - https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
+ - https://github.com/apache/pinot/tree/master/kubernetes/helm
urls:
- pinot-0.2.0.tgz
version: 0.2.0
@@ -159,7 +159,7 @@ entries:
name: pinot-dev
name: presto
sources:
- - https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
+ - https://github.com/apache/pinot/tree/master/kubernetes/helm
urls:
- presto-0.2.1.tgz
version: 0.2.1
@@ -180,7 +180,7 @@ entries:
name: pinot-dev
name: presto
sources:
- - https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
+ - https://github.com/apache/pinot/tree/master/kubernetes/helm
urls:
- presto-0.2.0.tgz
version: 0.2.0
diff --git a/kubernetes/helm/pinot/Chart.yaml b/kubernetes/helm/pinot/Chart.yaml
index bac386c..05e140b 100644
--- a/kubernetes/helm/pinot/Chart.yaml
+++ b/kubernetes/helm/pinot/Chart.yaml
@@ -29,7 +29,7 @@ keywords:
- pinot
home: https://pinot.apache.org/
sources:
- - https://github.com/apache/incubator-pinot
+ - https://github.com/apache/pinot
maintainers:
- name: pinot-dev
email: [email protected]
diff --git a/kubernetes/helm/presto/Chart.yaml
b/kubernetes/helm/presto/Chart.yaml
index f5234ab..c7253ed 100644
--- a/kubernetes/helm/presto/Chart.yaml
+++ b/kubernetes/helm/presto/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
- presto
home: https://github.com/prestodb/presto
sources:
- - https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
+ - https://github.com/apache/pinot/tree/master/kubernetes/helm
maintainers:
- name: pinot-dev
email: [email protected]
diff --git a/kubernetes/helm/thirdeye/Chart.yaml
b/kubernetes/helm/thirdeye/Chart.yaml
index 586762e..0cb2d38 100644
--- a/kubernetes/helm/thirdeye/Chart.yaml
+++ b/kubernetes/helm/thirdeye/Chart.yaml
@@ -9,9 +9,9 @@ keywords:
- pinot
- anomaly detection
- rootcause analysis
-home: https://github.com/apache/incubator-pinot
+home: https://github.com/apache/pinot
sources:
-- https://github.com/apache/incubator-pinot
+- https://github.com/apache/pinot
maintainers:
- name: Alexander Pucher
email: [email protected]
diff --git a/pinot-controller/pom.xml b/pinot-controller/pom.xml
index a81e479..596e96e 100644
--- a/pinot-controller/pom.xml
+++ b/pinot-controller/pom.xml
@@ -275,9 +275,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!--
- version upgraded to 3.0.0-M5 since the earlier version (2.19) was
causing test cases defined
- in suites to run twice. See
https://github.com/apache/incubator-pinot/pull/6326#issue-533412053
- for more details.
+ version upgraded to 3.0.0-M5 since the earlier version (2.19) was
causing test cases defined in suites to run
+ twice. See https://github.com/apache/pinot/pull/6326#issue-533412053
for more details.
-->
<version>3.0.0-M5</version>
<configuration combine.children="override">
diff --git a/pom.xml b/pom.xml
index d5a73c4..0b95efb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
</mailingLists>
<scm>
-
<developerConnection>scm:git:[email protected]:apache/incubator-pinot.git</developerConnection>
+
<developerConnection>scm:git:[email protected]:apache/pinot.git</developerConnection>
<tag>HEAD</tag>
</scm>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
