From 5cbebf1e5979c8f273b52f2495a31c9b1aa57c14 Mon Sep 17 00:00:00 2001 From: dkhomutov Date: Tue, 14 Jan 2025 13:48:53 +0300 Subject: [PATCH 1/3] Update versions from 2.0.0-RC1 to 2.0.0 --- pom.xml | 2 +- smart-action/pom.xml | 6 ++-- smart-agent/pom.xml | 10 +++---- smart-client/pom.xml | 6 ++-- smart-common/pom.xml | 4 +-- smart-dist/pom.xml | 20 ++++++------- smart-engine/pom.xml | 18 ++++++------ smart-frontend/pom.xml | 4 +-- smart-hadoop-support/pom.xml | 4 +-- smart-hadoop-support/smart-hadoop-3.3/pom.xml | 6 ++-- smart-hadoop-support/smart-hadoop-3/pom.xml | 10 +++---- .../smart-hadoop-client-3/pom.xml | 18 ++++++------ .../smart-hadoop-common/pom.xml | 8 +++--- smart-hadoop-support/smart-hadoop/pom.xml | 20 ++++++------- .../smart-inputstream/pom.xml | 4 +-- smart-integration/pom.xml | 28 +++++++++---------- smart-metastore/pom.xml | 8 +++--- smart-metrics/pom.xml | 6 ++-- smart-rule/pom.xml | 6 ++-- smart-server/pom.xml | 22 +++++++-------- smart-web-server/pom.xml | 6 ++-- .../smart-agent-web-server/pom.xml | 4 +-- .../smart-master-web-server/pom.xml | 4 +-- .../smart-web-server-base/pom.xml | 2 +- 24 files changed, 113 insertions(+), 113 deletions(-) diff --git a/pom.xml b/pom.xml index 3c4fb491b0..d049010f9c 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 Smart Data Project SmartData Project pom diff --git a/smart-action/pom.xml b/smart-action/pom.xml index ae7490f1b1..0132d7b519 100644 --- a/smart-action/pom.xml +++ b/smart-action/pom.xml @@ -25,19 +25,19 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 ../pom.xml smart-action - 2.0.0-RC1 + 2.0.0 jar org.smartdata smart-common - 2.0.0-RC1 + 2.0.0 provided diff --git a/smart-agent/pom.xml b/smart-agent/pom.xml index 37025c9f72..9462649f86 100644 --- a/smart-agent/pom.xml +++ b/smart-agent/pom.xml @@ -26,12 +26,12 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 ../pom.xml smart-agent - 2.0.0-RC1 + 2.0.0 jar @@ -50,13 +50,13 @@ org.smartdata smart-engine - 2.0.0-RC1 + 2.0.0 provided org.smartdata smart-agent-web-server - 2.0.0-RC1 + 2.0.0 com.typesafe.akka @@ -71,7 +71,7 @@ org.smartdata smart-engine - 2.0.0-RC1 + 2.0.0 tests test diff --git a/smart-client/pom.xml b/smart-client/pom.xml index b5fcca200e..506c8b238b 100644 --- a/smart-client/pom.xml +++ b/smart-client/pom.xml @@ -25,19 +25,19 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 ../pom.xml smart-client - 2.0.0-RC1 + 2.0.0 jar org.smartdata smart-common - 2.0.0-RC1 + 2.0.0 provided diff --git a/smart-common/pom.xml b/smart-common/pom.xml index b77c696786..4bd6a0df02 100644 --- a/smart-common/pom.xml +++ b/smart-common/pom.xml @@ -25,12 +25,12 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 ../pom.xml smart-common - 2.0.0-RC1 + 2.0.0 jar diff --git a/smart-dist/pom.xml b/smart-dist/pom.xml index 5c29d88931..20af71e98f 100644 --- a/smart-dist/pom.xml +++ b/smart-dist/pom.xml @@ -25,44 +25,44 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 ../pom.xml smart-dist - 2.0.0-RC1 + 2.0.0 pom org.smartdata smart-common - 2.0.0-RC1 + 2.0.0 org.smartdata smart-client - 2.0.0-RC1 + 2.0.0 org.smartdata smart-inputstream - 2.0.0-RC1 + 2.0.0 org.smartdata smart-action - 2.0.0-RC1 + 2.0.0 org.smartdata smart-engine - 2.0.0-RC1 + 2.0.0 org.smartdata smart-server - 2.0.0-RC1 + 2.0.0 org.smartdata @@ -77,12 +77,12 @@ org.smartdata smart-agent - 2.0.0-RC1 + 2.0.0 org.smartdata smart-integration - 2.0.0-RC1 + 2.0.0 provided diff --git a/smart-engine/pom.xml b/smart-engine/pom.xml index eea0fdcae1..b285b78b3b 100644 --- a/smart-engine/pom.xml +++ b/smart-engine/pom.xml @@ -26,12 +26,12 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 ../pom.xml smart-engine - 2.0.0-RC1 + 2.0.0 jar @@ -48,17 +48,17 @@ org.smartdata smart-common - 2.0.0-RC1 + 2.0.0 org.smartdata smart-metrics - 2.0.0-RC1 + 2.0.0 org.smartdata smart-hadoop - 2.0.0-RC1 + 2.0.0 commons-configuration @@ -77,22 +77,22 @@ org.smartdata smart-action - 2.0.0-RC1 + 2.0.0 org.smartdata smart-rule - 2.0.0-RC1 + 2.0.0 org.smartdata smart-metastore - 2.0.0-RC1 + 2.0.0 org.smartdata smart-metastore - 2.0.0-RC1 + 2.0.0 test test-jar diff --git a/smart-frontend/pom.xml b/smart-frontend/pom.xml index 5ab05ae8d9..694890da28 100644 --- a/smart-frontend/pom.xml +++ b/smart-frontend/pom.xml @@ -25,12 +25,12 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 ../pom.xml smart-frontend - 2.0.0-RC1 + 2.0.0 pom diff --git a/smart-hadoop-support/pom.xml b/smart-hadoop-support/pom.xml index 6f5d00e09a..8ccbea392d 100644 --- a/smart-hadoop-support/pom.xml +++ b/smart-hadoop-support/pom.xml @@ -25,12 +25,12 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 ../pom.xml smart-hadoop-support - 2.0.0-RC1 + 2.0.0 pom diff --git a/smart-hadoop-support/smart-hadoop-3.3/pom.xml b/smart-hadoop-support/smart-hadoop-3.3/pom.xml index 0219fc126c..4b539474b0 100644 --- a/smart-hadoop-support/smart-hadoop-3.3/pom.xml +++ b/smart-hadoop-support/smart-hadoop-3.3/pom.xml @@ -25,19 +25,19 @@ org.smartdata smart-hadoop-support - 2.0.0-RC1 + 2.0.0 .. smart-hadoop-3.3 - 2.0.0-RC1 + 2.0.0 jar org.smartdata smart-hadoop-3 - 2.0.0-RC1 + 2.0.0 diff --git a/smart-hadoop-support/smart-hadoop-3/pom.xml b/smart-hadoop-support/smart-hadoop-3/pom.xml index 6408719dd3..3e80446c20 100644 --- a/smart-hadoop-support/smart-hadoop-3/pom.xml +++ b/smart-hadoop-support/smart-hadoop-3/pom.xml @@ -25,19 +25,19 @@ org.smartdata smart-hadoop-support - 2.0.0-RC1 + 2.0.0 .. smart-hadoop-3 - 2.0.0-RC1 + 2.0.0 jar org.smartdata smart-common - 2.0.0-RC1 + 2.0.0 org.apache.hadoop @@ -75,7 +75,7 @@ org.smartdata smart-hadoop-common - 2.0.0-RC1 + 2.0.0 org.projectlombok @@ -121,7 +121,7 @@ org.smartdata smart-hadoop-common - 2.0.0-RC1 + 2.0.0 test test-jar diff --git a/smart-hadoop-support/smart-hadoop-client-3/pom.xml b/smart-hadoop-support/smart-hadoop-client-3/pom.xml index 60907df5e9..e3ff6cbfdf 100644 --- a/smart-hadoop-support/smart-hadoop-client-3/pom.xml +++ b/smart-hadoop-support/smart-hadoop-client-3/pom.xml @@ -25,19 +25,19 @@ org.smartdata smart-hadoop-support - 2.0.0-RC1 + 2.0.0 .. smart-hadoop-client-3 - 2.0.0-RC1 + 2.0.0 jar org.smartdata smart-common - 2.0.0-RC1 + 2.0.0 provided @@ -49,29 +49,29 @@ org.smartdata smart-client - 2.0.0-RC1 + 2.0.0 org.smartdata smart-hadoop-common - 2.0.0-RC1 + 2.0.0 org.smartdata smart-inputstream - 2.0.0-RC1 + 2.0.0 provided org.smartdata smart-hadoop-3 - 2.0.0-RC1 + 2.0.0 test org.smartdata smart-hadoop-3 - 2.0.0-RC1 + 2.0.0 test-jar test @@ -100,7 +100,7 @@ org.smartdata smart-hadoop-common - 2.0.0-RC1 + 2.0.0 test test-jar diff --git a/smart-hadoop-support/smart-hadoop-common/pom.xml b/smart-hadoop-support/smart-hadoop-common/pom.xml index 48b9cf8723..e114b88095 100644 --- a/smart-hadoop-support/smart-hadoop-common/pom.xml +++ b/smart-hadoop-support/smart-hadoop-common/pom.xml @@ -25,24 +25,24 @@ org.smartdata smart-hadoop-support - 2.0.0-RC1 + 2.0.0 .. smart-hadoop-common - 2.0.0-RC1 + 2.0.0 jar org.smartdata smart-common - 2.0.0-RC1 + 2.0.0 org.smartdata smart-action - 2.0.0-RC1 + 2.0.0 org.apache.hadoop diff --git a/smart-hadoop-support/smart-hadoop/pom.xml b/smart-hadoop-support/smart-hadoop/pom.xml index bb0cf04549..34ae878e7b 100644 --- a/smart-hadoop-support/smart-hadoop/pom.xml +++ b/smart-hadoop-support/smart-hadoop/pom.xml @@ -25,34 +25,34 @@ org.smartdata smart-hadoop-support - 2.0.0-RC1 + 2.0.0 .. smart-hadoop - 2.0.0-RC1 + 2.0.0 jar org.smartdata smart-hadoop-common - 2.0.0-RC1 + 2.0.0 org.smartdata smart-common - 2.0.0-RC1 + 2.0.0 org.smartdata smart-metastore - 2.0.0-RC1 + 2.0.0 org.smartdata smart-action - 2.0.0-RC1 + 2.0.0 org.apache.hadoop @@ -144,14 +144,14 @@ org.smartdata smart-hadoop-common - 2.0.0-RC1 + 2.0.0 test test-jar org.smartdata smart-action - 2.0.0-RC1 + 2.0.0 test test-jar @@ -223,7 +223,7 @@ org.smartdata smart-metastore - 2.0.0-RC1 + 2.0.0 test test-jar @@ -240,7 +240,7 @@ org.smartdata smart-inputstream - 2.0.0-RC1 + 2.0.0 compile diff --git a/smart-hadoop-support/smart-inputstream/pom.xml b/smart-hadoop-support/smart-inputstream/pom.xml index 5f745d16e6..5d696f3b4a 100644 --- a/smart-hadoop-support/smart-inputstream/pom.xml +++ b/smart-hadoop-support/smart-inputstream/pom.xml @@ -25,12 +25,12 @@ org.smartdata smart-hadoop-support - 2.0.0-RC1 + 2.0.0 .. smart-inputstream - 2.0.0-RC1 + 2.0.0 jar diff --git a/smart-integration/pom.xml b/smart-integration/pom.xml index 6f621f2de2..ee77febfb4 100644 --- a/smart-integration/pom.xml +++ b/smart-integration/pom.xml @@ -25,12 +25,12 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 ../pom.xml smart-integration - 2.0.0-RC1 + 2.0.0 jar @@ -53,66 +53,66 @@ org.smartdata smart-hadoop-common - 2.0.0-RC1 + 2.0.0 test test-jar org.smartdata smart-inputstream - 2.0.0-RC1 + 2.0.0 test org.smartdata smart-server - 2.0.0-RC1 + 2.0.0 test org.smartdata smart-engine - 2.0.0-RC1 + 2.0.0 test org.smartdata smart-engine - 2.0.0-RC1 + 2.0.0 test-jar test org.smartdata smart-agent - 2.0.0-RC1 + 2.0.0 test org.smartdata smart-agent - 2.0.0-RC1 + 2.0.0 test-jar test org.smartdata smart-server - 2.0.0-RC1 + 2.0.0 test test-jar org.smartdata smart-hadoop - 2.0.0-RC1 + 2.0.0 test test-jar org.smartdata smart-common - 2.0.0-RC1 + 2.0.0 junit @@ -142,7 +142,7 @@ org.smartdata smart-metastore - 2.0.0-RC1 + 2.0.0 org.smartdata @@ -176,7 +176,7 @@ org.smartdata smart-metastore - 2.0.0-RC1 + 2.0.0 test test-jar diff --git a/smart-metastore/pom.xml b/smart-metastore/pom.xml index 260386009e..d6f40c68b7 100644 --- a/smart-metastore/pom.xml +++ b/smart-metastore/pom.xml @@ -26,12 +26,12 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 ../pom.xml smart-metastore - 2.0.0-RC1 + 2.0.0 jar @@ -43,12 +43,12 @@ org.smartdata smart-common - 2.0.0-RC1 + 2.0.0 org.smartdata smart-metrics - 2.0.0-RC1 + 2.0.0 com.alibaba diff --git a/smart-metrics/pom.xml b/smart-metrics/pom.xml index c33afa4ad5..45333d8fee 100644 --- a/smart-metrics/pom.xml +++ b/smart-metrics/pom.xml @@ -25,19 +25,19 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 ../pom.xml smart-metrics - 2.0.0-RC1 + 2.0.0 jar org.smartdata smart-common - 2.0.0-RC1 + 2.0.0 org.projectlombok diff --git a/smart-rule/pom.xml b/smart-rule/pom.xml index 82e547ad72..876daf0e54 100644 --- a/smart-rule/pom.xml +++ b/smart-rule/pom.xml @@ -26,12 +26,12 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 ../pom.xml smart-rule - 2.0.0-RC1 + 2.0.0 jar @@ -57,7 +57,7 @@ org.smartdata smart-common - 2.0.0-RC1 + 2.0.0 diff --git a/smart-server/pom.xml b/smart-server/pom.xml index 438dd4c9a1..abe279fb79 100644 --- a/smart-server/pom.xml +++ b/smart-server/pom.xml @@ -26,34 +26,34 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 ../pom.xml smart-server - 2.0.0-RC1 + 2.0.0 jar org.smartdata smart-common - 2.0.0-RC1 + 2.0.0 org.smartdata smart-metastore - 2.0.0-RC1 + 2.0.0 org.smartdata smart-master-web-server - 2.0.0-RC1 + 2.0.0 org.smartdata smart-engine - 2.0.0-RC1 + 2.0.0 commons-configuration @@ -64,12 +64,12 @@ org.smartdata smart-action - 2.0.0-RC1 + 2.0.0 org.smartdata smart-rule - 2.0.0-RC1 + 2.0.0 org.slf4j @@ -118,7 +118,7 @@ org.smartdata smart-hadoop - 2.0.0-RC1 + 2.0.0 test test-jar @@ -131,7 +131,7 @@ org.smartdata smart-hadoop-common - 2.0.0-RC1 + 2.0.0 test test-jar @@ -194,7 +194,7 @@ org.smartdata smart-metastore - 2.0.0-RC1 + 2.0.0 test test-jar diff --git a/smart-web-server/pom.xml b/smart-web-server/pom.xml index ffdac7fef7..2aebd98b21 100644 --- a/smart-web-server/pom.xml +++ b/smart-web-server/pom.xml @@ -25,7 +25,7 @@ org.smartdata smartdata-project - 2.0.0-RC1 + 2.0.0 smart-web-server @@ -60,13 +60,13 @@ org.smartdata smart-engine - 2.0.0-RC1 + 2.0.0 org.smartdata smart-metrics - 2.0.0-RC1 + 2.0.0 diff --git a/smart-web-server/smart-agent-web-server/pom.xml b/smart-web-server/smart-agent-web-server/pom.xml index 8eafa0e046..b8b45f90ce 100644 --- a/smart-web-server/smart-agent-web-server/pom.xml +++ b/smart-web-server/smart-agent-web-server/pom.xml @@ -25,7 +25,7 @@ org.smartdata smart-web-server - 2.0.0-RC1 + 2.0.0 smart-agent-web-server @@ -34,7 +34,7 @@ org.smartdata smart-web-server-base - 2.0.0-RC1 + 2.0.0 \ No newline at end of file diff --git a/smart-web-server/smart-master-web-server/pom.xml b/smart-web-server/smart-master-web-server/pom.xml index 3d91cdbf7f..61ea4efef1 100644 --- a/smart-web-server/smart-master-web-server/pom.xml +++ b/smart-web-server/smart-master-web-server/pom.xml @@ -25,7 +25,7 @@ org.smartdata smart-web-server - 2.0.0-RC1 + 2.0.0 smart-master-web-server @@ -34,7 +34,7 @@ org.smartdata smart-web-server-base - 2.0.0-RC1 + 2.0.0 diff --git a/smart-web-server/smart-web-server-base/pom.xml b/smart-web-server/smart-web-server-base/pom.xml index ea55343ceb..54b6c08373 100644 --- a/smart-web-server/smart-web-server-base/pom.xml +++ b/smart-web-server/smart-web-server-base/pom.xml @@ -25,7 +25,7 @@ org.smartdata smart-web-server - 2.0.0-RC1 + 2.0.0 smart-web-server-base From 1db2ef569279cac8cf321ae4d2dcd3c43bffdd35 Mon Sep 17 00:00:00 2001 From: dkhomutov Date: Tue, 14 Jan 2025 14:08:25 +0300 Subject: [PATCH 2/3] Enable ci/cd on pull requests to release branches --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4e33d122c7..d19629e040 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: push: branches: [ "develop" ] pull_request: - branches: [ "develop" ] + branches: [ "develop", "release/**" ] jobs: build: From 9579d5b7ed79781e13d882ec33c3d3de1a540670 Mon Sep 17 00:00:00 2001 From: dkhomutov Date: Tue, 14 Jan 2025 14:15:08 +0300 Subject: [PATCH 3/3] Fix dependencies versions upgrade --- smart-dist/pom.xml | 4 ++-- smart-engine/pom.xml | 4 ++-- smart-hadoop-support/smart-hadoop/pom.xml | 6 +++--- smart-hadoop-support/smart-inputstream/pom.xml | 2 +- smart-integration/pom.xml | 6 +++--- smart-server/pom.xml | 4 ++-- supports/tools/docker/multihost/docker-compose.yaml | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/smart-dist/pom.xml b/smart-dist/pom.xml index 20af71e98f..5deab6504a 100644 --- a/smart-dist/pom.xml +++ b/smart-dist/pom.xml @@ -67,12 +67,12 @@ org.smartdata ${smart.hadoop.artifact} - 2.0.0-RC1 + 2.0.0 org.smartdata ${smart.hadoop.client.artifact} - 2.0.0-RC1 + 2.0.0 org.smartdata diff --git a/smart-engine/pom.xml b/smart-engine/pom.xml index b285b78b3b..534e1535e5 100644 --- a/smart-engine/pom.xml +++ b/smart-engine/pom.xml @@ -128,12 +128,12 @@ org.smartdata ${smart.hadoop.artifact} - 2.0.0-RC1 + 2.0.0 org.smartdata ${smart.hadoop.client.artifact} - 2.0.0-RC1 + 2.0.0 org.dbunit diff --git a/smart-hadoop-support/smart-hadoop/pom.xml b/smart-hadoop-support/smart-hadoop/pom.xml index 34ae878e7b..8acc7b88c0 100644 --- a/smart-hadoop-support/smart-hadoop/pom.xml +++ b/smart-hadoop-support/smart-hadoop/pom.xml @@ -61,12 +61,12 @@ org.smartdata ${smart.hadoop.artifact} - 2.0.0-RC1 + 2.0.0 org.smartdata ${smart.hadoop.client.artifact} - 2.0.0-RC1 + 2.0.0 com.github.ben-manes.caffeine @@ -80,7 +80,7 @@ org.smartdata ${smart.hadoop.artifact} - 2.0.0-RC1 + 2.0.0 test test-jar diff --git a/smart-hadoop-support/smart-inputstream/pom.xml b/smart-hadoop-support/smart-inputstream/pom.xml index 5d696f3b4a..fa5a547969 100644 --- a/smart-hadoop-support/smart-inputstream/pom.xml +++ b/smart-hadoop-support/smart-inputstream/pom.xml @@ -37,7 +37,7 @@ org.smartdata ${smart.hadoop.artifact} - 2.0.0-RC1 + 2.0.0 diff --git a/smart-integration/pom.xml b/smart-integration/pom.xml index ee77febfb4..0d85ed6846 100644 --- a/smart-integration/pom.xml +++ b/smart-integration/pom.xml @@ -147,7 +147,7 @@ org.smartdata ${smart.hadoop.artifact} - 2.0.0-RC1 + 2.0.0 test test-jar @@ -164,13 +164,13 @@ org.smartdata ${smart.hadoop.artifact} - 2.0.0-RC1 + 2.0.0 test org.smartdata ${smart.hadoop.client.artifact} - 2.0.0-RC1 + 2.0.0 test diff --git a/smart-server/pom.xml b/smart-server/pom.xml index abe279fb79..25c2ede1ac 100644 --- a/smart-server/pom.xml +++ b/smart-server/pom.xml @@ -181,13 +181,13 @@ org.smartdata ${smart.hadoop.artifact} - 2.0.0-RC1 + 2.0.0 test org.smartdata ${smart.hadoop.artifact} - 2.0.0-RC1 + 2.0.0 test test-jar diff --git a/supports/tools/docker/multihost/docker-compose.yaml b/supports/tools/docker/multihost/docker-compose.yaml index 3f3bdbafef..06e937f511 100644 --- a/supports/tools/docker/multihost/docker-compose.yaml +++ b/supports/tools/docker/multihost/docker-compose.yaml @@ -60,7 +60,7 @@ services: - ssm-server ssm-server: - image: cloud-hub.adsw.io/library/ssm-server:2.0.0-RC1 + image: cloud-hub.adsw.io/library/ssm-server:2.0.0 hostname: ssm-server.demo restart: unless-stopped container_name: ssm-server