From 3f8a931e390ba473a0cae386b92bfa59ebe15992 Mon Sep 17 00:00:00 2001 From: Mohit Yadav <105265192+mohityadav766@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:33:47 +0530 Subject: [PATCH] Bump Pom Version to 1.3.0-SNAPSHOT (#14008) * Bump Pom Version to 1.3.0-SNAPSHOT * chore: Fix Makefile recipe * fix: Prepare Main Branch for Next Feature Release * fix: Syntax issue --------- Co-authored-by: Akash-Jain --- .github/workflows/docker-openmetadata-db.yml | 2 +- .github/workflows/docker-openmetadata-ingestion-base.yml | 2 +- .github/workflows/docker-openmetadata-ingestion.yml | 2 +- .github/workflows/docker-openmetadata-postgres.yml | 2 +- .github/workflows/docker-openmetadata-server.yml | 4 ++-- Makefile | 3 +-- common/pom.xml | 2 +- .../docker-compose-ingestion/docker-compose-ingestion.yml | 2 +- .../docker-compose-openmetadata.yml | 4 ++-- docker/docker-compose-quickstart/Dockerfile | 4 ++-- .../docker-compose-quickstart/docker-compose-postgres.yml | 8 ++++---- docker/docker-compose-quickstart/docker-compose.yml | 8 ++++---- ingestion/Dockerfile | 2 +- ingestion/operators/docker/Dockerfile | 2 +- ingestion/setup.py | 2 +- openmetadata-airflow-apis/setup.py | 2 +- openmetadata-clients/openmetadata-java-client/pom.xml | 2 +- openmetadata-clients/pom.xml | 2 +- openmetadata-dist/pom.xml | 2 +- openmetadata-service/pom.xml | 2 +- openmetadata-shaded-deps/elasticsearch-dep/pom.xml | 2 +- openmetadata-shaded-deps/opensearch-dep/pom.xml | 2 +- openmetadata-shaded-deps/pom.xml | 2 +- openmetadata-spec/pom.xml | 2 +- openmetadata-ui/pom.xml | 2 +- pom.xml | 2 +- 26 files changed, 35 insertions(+), 36 deletions(-) diff --git a/.github/workflows/docker-openmetadata-db.yml b/.github/workflows/docker-openmetadata-db.yml index f89df6ede88d..2089d9d6e9c7 100644 --- a/.github/workflows/docker-openmetadata-db.yml +++ b/.github/workflows/docker-openmetadata-db.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Check trigger type if: ${{ env.input == '' }} - run: echo "input=1.2.0" >> $GITHUB_ENV + run: echo "input=1.3.0-SNAPSHOT" >> $GITHUB_ENV - name: Check out the Repo uses: actions/checkout@v3 diff --git a/.github/workflows/docker-openmetadata-ingestion-base.yml b/.github/workflows/docker-openmetadata-ingestion-base.yml index 840e3ecdb571..22817a35bd26 100644 --- a/.github/workflows/docker-openmetadata-ingestion-base.yml +++ b/.github/workflows/docker-openmetadata-ingestion-base.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Check trigger type if: ${{ env.input == '' }} - run: echo "input=1.2.0" >> $GITHUB_ENV + run: echo "input=1.3.0-SNAPSHOT" >> $GITHUB_ENV - name: Check out the Repo uses: actions/checkout@v3 diff --git a/.github/workflows/docker-openmetadata-ingestion.yml b/.github/workflows/docker-openmetadata-ingestion.yml index 9278ab0728fb..add92478b860 100644 --- a/.github/workflows/docker-openmetadata-ingestion.yml +++ b/.github/workflows/docker-openmetadata-ingestion.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Check trigger type if: ${{ env.input == '' }} - run: echo "input=1.2.0" >> $GITHUB_ENV + run: echo "input=1.3.0-SNAPSHOT" >> $GITHUB_ENV - name: Check out the Repo uses: actions/checkout@v3 diff --git a/.github/workflows/docker-openmetadata-postgres.yml b/.github/workflows/docker-openmetadata-postgres.yml index 6505f27c7ff9..b53195ff2e0d 100644 --- a/.github/workflows/docker-openmetadata-postgres.yml +++ b/.github/workflows/docker-openmetadata-postgres.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Check trigger type if: ${{ env.input == '' }} - run: echo "input=1.2.0" >> $GITHUB_ENV + run: echo "input=1.3.0-SNAPSHOT" >> $GITHUB_ENV - name: Check out the Repo uses: actions/checkout@v3 diff --git a/.github/workflows/docker-openmetadata-server.yml b/.github/workflows/docker-openmetadata-server.yml index 7d70be039b9e..922033b82a74 100644 --- a/.github/workflows/docker-openmetadata-server.yml +++ b/.github/workflows/docker-openmetadata-server.yml @@ -64,7 +64,7 @@ jobs: steps: - name: Check trigger type id: check_trigger - run: echo "DOCKER_RELEASE_TAG=1.2.0" >> $GITHUB_OUTPUT + run: echo "DOCKER_RELEASE_TAG=1.3.0-SNAPSHOT" >> $GITHUB_OUTPUT - name: Download application from Artifiact uses: actions/download-artifact@v2 @@ -129,7 +129,7 @@ jobs: - name: Check trigger type id: check_trigger if: ${{ env.DOCKER_RELEASE_TAG == '' }} - run: echo "DOCKER_RELEASE_TAG=1.2.0" >> $GITHUB_ENV + run: echo "DOCKER_RELEASE_TAG=1.3.0-SNAPSHOT" >> $GITHUB_ENV - name: Check out the Repo uses: actions/checkout@v3 diff --git a/Makefile b/Makefile index 78d7de3bfdf2..3bf028852878 100644 --- a/Makefile +++ b/Makefile @@ -224,8 +224,7 @@ update_python_release_paths: ## To update the setup.py files .PHONY: update_dockerfile_version update_dockerfile_version: ## To update the dockerfiles version - @file_paths="docker/docker-compose-ingestion/docker-compose-ingestion-postgres.yml \ - docker/docker-compose-ingestion/docker-compose-ingestion.yml \ + @file_paths="docker/docker-compose-ingestion/docker-compose-ingestion.yml \ docker/docker-compose-openmetadata/docker-compose-openmetadata.yml \ docker/docker-compose-quickstart/docker-compose-postgres.yml \ docker/docker-compose-quickstart/docker-compose.yml"; \ diff --git a/common/pom.xml b/common/pom.xml index 7531a6c26042..eeb928e7b703 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -18,7 +18,7 @@ platform org.open-metadata - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 diff --git a/docker/docker-compose-ingestion/docker-compose-ingestion.yml b/docker/docker-compose-ingestion/docker-compose-ingestion.yml index dc5d7cf3f123..74a32326bea8 100644 --- a/docker/docker-compose-ingestion/docker-compose-ingestion.yml +++ b/docker/docker-compose-ingestion/docker-compose-ingestion.yml @@ -18,7 +18,7 @@ volumes: services: ingestion: container_name: openmetadata_ingestion - image: docker.getcollate.io/openmetadata/ingestion:1.2.0 + image: docker.getcollate.io/openmetadata/ingestion:1.3.0-SNAPSHOT environment: AIRFLOW__API__AUTH_BACKENDS: "airflow.api.auth.backend.basic_auth,airflow.api.auth.backend.session" AIRFLOW__CORE__EXECUTOR: LocalExecutor diff --git a/docker/docker-compose-openmetadata/docker-compose-openmetadata.yml b/docker/docker-compose-openmetadata/docker-compose-openmetadata.yml index 9cfbd52553fd..7c93ef4230a9 100644 --- a/docker/docker-compose-openmetadata/docker-compose-openmetadata.yml +++ b/docker/docker-compose-openmetadata/docker-compose-openmetadata.yml @@ -14,7 +14,7 @@ services: execute-migrate-all: container_name: execute_migrate_all command: "./bootstrap/bootstrap_storage.sh migrate-all" - image: docker.getcollate.io/openmetadata/server:1.2.0 + image: docker.getcollate.io/openmetadata/server:1.3.0-SNAPSHOT environment: OPENMETADATA_CLUSTER_NAME: ${OPENMETADATA_CLUSTER_NAME:-openmetadata} SERVER_PORT: ${SERVER_PORT:-8585} @@ -158,7 +158,7 @@ services: openmetadata-server: container_name: openmetadata_server restart: always - image: docker.getcollate.io/openmetadata/server:1.2.0 + image: docker.getcollate.io/openmetadata/server:1.3.0-SNAPSHOT environment: OPENMETADATA_CLUSTER_NAME: ${OPENMETADATA_CLUSTER_NAME:-openmetadata} SERVER_PORT: ${SERVER_PORT:-8585} diff --git a/docker/docker-compose-quickstart/Dockerfile b/docker/docker-compose-quickstart/Dockerfile index 1c95e4365fa5..4e932bbe3a17 100644 --- a/docker/docker-compose-quickstart/Dockerfile +++ b/docker/docker-compose-quickstart/Dockerfile @@ -11,7 +11,7 @@ # Build stage FROM alpine:3 AS build -ARG RI_VERSION="1.2.0" +ARG RI_VERSION="1.3.0-SNAPSHOT" ENV RELEASE_URL="https://github.com/open-metadata/OpenMetadata/releases/download/${RI_VERSION}-release/openmetadata-${RI_VERSION}.tar.gz" RUN mkdir -p /opt/openmetadata && \ @@ -21,7 +21,7 @@ RUN mkdir -p /opt/openmetadata && \ # Final stage FROM alpine:3 -ARG RI_VERSION="1.2.0" +ARG RI_VERSION="1.3.0-SNAPSHOT" ARG BUILD_DATE ARG COMMIT_ID LABEL maintainer="OpenMetadata" diff --git a/docker/docker-compose-quickstart/docker-compose-postgres.yml b/docker/docker-compose-quickstart/docker-compose-postgres.yml index de28b87f8002..1e25d031502f 100644 --- a/docker/docker-compose-quickstart/docker-compose-postgres.yml +++ b/docker/docker-compose-quickstart/docker-compose-postgres.yml @@ -18,7 +18,7 @@ volumes: services: postgresql: container_name: openmetadata_postgresql - image: docker.getcollate.io/openmetadata/postgresql:1.2.0 + image: docker.getcollate.io/openmetadata/postgresql:1.3.0-SNAPSHOT restart: always command: "--work_mem=10MB" environment: @@ -56,7 +56,7 @@ services: execute-migrate-all: container_name: execute_migrate_all - image: docker.getcollate.io/openmetadata/server:1.1.0 + image: docker.getcollate.io/openmetadata/server:1.3.0-SNAPSHOT command: "./bootstrap/bootstrap_storage.sh migrate-all" environment: OPENMETADATA_CLUSTER_NAME: ${OPENMETADATA_CLUSTER_NAME:-openmetadata} @@ -202,7 +202,7 @@ services: openmetadata-server: container_name: openmetadata_server restart: always - image: docker.getcollate.io/openmetadata/server:1.1.0 + image: docker.getcollate.io/openmetadata/server:1.3.0-SNAPSHOT environment: OPENMETADATA_CLUSTER_NAME: ${OPENMETADATA_CLUSTER_NAME:-openmetadata} SERVER_PORT: ${SERVER_PORT:-8585} @@ -348,7 +348,7 @@ services: ingestion: container_name: openmetadata_ingestion - image: docker.getcollate.io/openmetadata/ingestion:1.1.0 + image: docker.getcollate.io/openmetadata/ingestion:1.3.0-SNAPSHOT depends_on: elasticsearch: condition: service_started diff --git a/docker/docker-compose-quickstart/docker-compose.yml b/docker/docker-compose-quickstart/docker-compose.yml index 527c39305e86..68867bbdbb44 100644 --- a/docker/docker-compose-quickstart/docker-compose.yml +++ b/docker/docker-compose-quickstart/docker-compose.yml @@ -18,7 +18,7 @@ volumes: services: mysql: container_name: openmetadata_mysql - image: docker.getcollate.io/openmetadata/db:1.2.0 + image: docker.getcollate.io/openmetadata/db:1.3.0-SNAPSHOT command: "--sort_buffer_size=10M" restart: always environment: @@ -54,7 +54,7 @@ services: execute-migrate-all: container_name: execute_migrate_all - image: docker.getcollate.io/openmetadata/server:1.1.0 + image: docker.getcollate.io/openmetadata/server:1.3.0-SNAPSHOT command: "./bootstrap/bootstrap_storage.sh migrate-all" environment: OPENMETADATA_CLUSTER_NAME: ${OPENMETADATA_CLUSTER_NAME:-openmetadata} @@ -200,7 +200,7 @@ services: openmetadata-server: container_name: openmetadata_server restart: always - image: docker.getcollate.io/openmetadata/server:1.1.0 + image: docker.getcollate.io/openmetadata/server:1.3.0-SNAPSHOT environment: OPENMETADATA_CLUSTER_NAME: ${OPENMETADATA_CLUSTER_NAME:-openmetadata} SERVER_PORT: ${SERVER_PORT:-8585} @@ -346,7 +346,7 @@ services: ingestion: container_name: openmetadata_ingestion - image: docker.getcollate.io/openmetadata/ingestion:1.1.0 + image: docker.getcollate.io/openmetadata/ingestion:1.3.0-SNAPSHOT depends_on: elasticsearch: condition: service_started diff --git a/ingestion/Dockerfile b/ingestion/Dockerfile index e9b60e1f1a00..a24608c3277e 100644 --- a/ingestion/Dockerfile +++ b/ingestion/Dockerfile @@ -81,7 +81,7 @@ ARG INGESTION_DEPENDENCY="all" ENV PIP_NO_CACHE_DIR=1 # Make pip silent ENV PIP_QUIET=1 -ARG RI_VERSION="1.1.0.4" +ARG RI_VERSION="1.3.0.0.dev0" RUN pip install --upgrade pip RUN pip install "openmetadata-managed-apis~=${RI_VERSION}" --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-2.6.3/constraints-3.9.txt" RUN pip install "openmetadata-ingestion[${INGESTION_DEPENDENCY}]~=${RI_VERSION}" diff --git a/ingestion/operators/docker/Dockerfile b/ingestion/operators/docker/Dockerfile index 9c5c5f637456..2fca6c00304a 100644 --- a/ingestion/operators/docker/Dockerfile +++ b/ingestion/operators/docker/Dockerfile @@ -87,7 +87,7 @@ ENV PIP_QUIET=1 RUN pip install --upgrade pip ARG INGESTION_DEPENDENCY="all" -ARG RI_VERSION="1.1.0.4" +ARG RI_VERSION="1.3.0.0.dev0" RUN pip install --upgrade pip RUN pip install "openmetadata-ingestion[airflow]~=${RI_VERSION}" RUN pip install "openmetadata-ingestion[${INGESTION_DEPENDENCY}]~=${RI_VERSION}" diff --git a/ingestion/setup.py b/ingestion/setup.py index 3485f33aff17..c7aab12cdb14 100644 --- a/ingestion/setup.py +++ b/ingestion/setup.py @@ -309,7 +309,7 @@ def get_long_description(): build_options = {"includes": ["_cffi_backend"]} setup( name="openmetadata-ingestion", - version="1.2.0.0.dev0", + version="1.3.0.0.dev0", url="https://open-metadata.org/", author="OpenMetadata Committers", license="Apache License 2.0", diff --git a/openmetadata-airflow-apis/setup.py b/openmetadata-airflow-apis/setup.py index 656cee745926..33a3925c94ea 100644 --- a/openmetadata-airflow-apis/setup.py +++ b/openmetadata-airflow-apis/setup.py @@ -69,7 +69,7 @@ def get_long_description(): packages=find_packages(include=[f"{PLUGIN_NAME}.*", PLUGIN_NAME]), include_package_data=True, package_data={PLUGIN_NAME: get_package_data()}, - version="1.2.0.0.dev0", + version="1.3.0.0.dev0", url="https://open-metadata.org/", author="OpenMetadata Committers", license="Apache License 2.0", diff --git a/openmetadata-clients/openmetadata-java-client/pom.xml b/openmetadata-clients/openmetadata-java-client/pom.xml index 1b05063b56ea..bd7fbae1d76b 100644 --- a/openmetadata-clients/openmetadata-java-client/pom.xml +++ b/openmetadata-clients/openmetadata-java-client/pom.xml @@ -5,7 +5,7 @@ openmetadata-clients org.open-metadata - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 diff --git a/openmetadata-clients/pom.xml b/openmetadata-clients/pom.xml index e1e23dde4a3f..3785c3788318 100644 --- a/openmetadata-clients/pom.xml +++ b/openmetadata-clients/pom.xml @@ -5,7 +5,7 @@ platform org.open-metadata - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 diff --git a/openmetadata-dist/pom.xml b/openmetadata-dist/pom.xml index 1790aa5d8674..91edfdd76834 100644 --- a/openmetadata-dist/pom.xml +++ b/openmetadata-dist/pom.xml @@ -20,7 +20,7 @@ platform org.open-metadata - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT openmetadata-dist diff --git a/openmetadata-service/pom.xml b/openmetadata-service/pom.xml index 872a2eb74e75..d4b72f1a4e7d 100644 --- a/openmetadata-service/pom.xml +++ b/openmetadata-service/pom.xml @@ -5,7 +5,7 @@ platform org.open-metadata - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 openmetadata-service diff --git a/openmetadata-shaded-deps/elasticsearch-dep/pom.xml b/openmetadata-shaded-deps/elasticsearch-dep/pom.xml index a467a451b522..69e75472f47b 100644 --- a/openmetadata-shaded-deps/elasticsearch-dep/pom.xml +++ b/openmetadata-shaded-deps/elasticsearch-dep/pom.xml @@ -5,7 +5,7 @@ openmetadata-shaded-deps org.open-metadata - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 elasticsearch-deps diff --git a/openmetadata-shaded-deps/opensearch-dep/pom.xml b/openmetadata-shaded-deps/opensearch-dep/pom.xml index b1f29a3684e0..0b6eb7caaf32 100644 --- a/openmetadata-shaded-deps/opensearch-dep/pom.xml +++ b/openmetadata-shaded-deps/opensearch-dep/pom.xml @@ -5,7 +5,7 @@ openmetadata-shaded-deps org.open-metadata - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 opensearch-deps diff --git a/openmetadata-shaded-deps/pom.xml b/openmetadata-shaded-deps/pom.xml index 3d859cf59570..6eed28660700 100644 --- a/openmetadata-shaded-deps/pom.xml +++ b/openmetadata-shaded-deps/pom.xml @@ -5,7 +5,7 @@ platform org.open-metadata - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 openmetadata-shaded-deps diff --git a/openmetadata-spec/pom.xml b/openmetadata-spec/pom.xml index 59bc8f964917..4cf31c4a873a 100644 --- a/openmetadata-spec/pom.xml +++ b/openmetadata-spec/pom.xml @@ -5,7 +5,7 @@ platform org.open-metadata - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 diff --git a/openmetadata-ui/pom.xml b/openmetadata-ui/pom.xml index 31fe1acad78c..1b9547c7a6bf 100644 --- a/openmetadata-ui/pom.xml +++ b/openmetadata-ui/pom.xml @@ -5,7 +5,7 @@ platform org.open-metadata - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 320aa8dc345c..ba2fee518fbe 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ based on Open Metadata Standards/APIs, supporting connectors to a wide range of data services, OpenMetadata enables end-to-end metadata management, giving you the freedom to unlock the value of your data assets. - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT https://github.com/open-metadata/OpenMetadata openmetadata-spec