From 5164170cce2955741d6c2f83a2a8f736e5fec97e Mon Sep 17 00:00:00 2001 From: lijianing Date: Thu, 25 Jan 2018 19:22:48 +0800 Subject: [PATCH 1/3] release 120-160 --- VERSION | 2 +- k2de-common-parent/k2de-common-tests/pom.xml | 2 +- k2de-common-parent/k2de-common/pom.xml | 2 +- k2de-common-parent/pom.xml | 2 +- .../k2de-dependency-k2platform/pom.xml | 2 +- k2de-dependency-k2platform-parent/pom.xml | 2 +- k2de-ingestion-parent/k2de-backup/pom.xml | 2 +- k2de-ingestion-parent/k2de-kafka-consumer/pom.xml | 2 +- k2de-ingestion-parent/k2de-netty-server/pom.xml | 2 +- k2de-ingestion-parent/pom.xml | 2 +- k2de-integration-parent/k2de-metadata-tool/pom.xml | 2 +- k2de-integration-parent/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/VERSION b/VERSION index 3e151df..9b27a55 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -K2DE_VERSION=1.2.0-1.4.0-SNAPSHOT \ No newline at end of file +K2DE_VERSION=1.2.0-1.6.0 \ No newline at end of file diff --git a/k2de-common-parent/k2de-common-tests/pom.xml b/k2de-common-parent/k2de-common-tests/pom.xml index 602d39c..9dcf527 100644 --- a/k2de-common-parent/k2de-common-tests/pom.xml +++ b/k2de-common-parent/k2de-common-tests/pom.xml @@ -5,7 +5,7 @@ k2de-common-parent com.k2data - 1.2.0-1.4.0-SNAPSHOT + 1.2.0-1.6.0 4.0.0 diff --git a/k2de-common-parent/k2de-common/pom.xml b/k2de-common-parent/k2de-common/pom.xml index a4dd9aa..0c6d423 100644 --- a/k2de-common-parent/k2de-common/pom.xml +++ b/k2de-common-parent/k2de-common/pom.xml @@ -5,7 +5,7 @@ k2de-common-parent com.k2data - 1.2.0-1.4.0-SNAPSHOT + 1.2.0-1.6.0 4.0.0 diff --git a/k2de-common-parent/pom.xml b/k2de-common-parent/pom.xml index 1c83058..0a5319b 100644 --- a/k2de-common-parent/pom.xml +++ b/k2de-common-parent/pom.xml @@ -5,7 +5,7 @@ k2de-parent com.k2data - 1.2.0-1.4.0-SNAPSHOT + 1.2.0-1.6.0 4.0.0 diff --git a/k2de-dependency-k2platform-parent/k2de-dependency-k2platform/pom.xml b/k2de-dependency-k2platform-parent/k2de-dependency-k2platform/pom.xml index 4da438e..bf224a8 100644 --- a/k2de-dependency-k2platform-parent/k2de-dependency-k2platform/pom.xml +++ b/k2de-dependency-k2platform-parent/k2de-dependency-k2platform/pom.xml @@ -6,7 +6,7 @@ com.k2data k2de-dependency-k2platform-parent - 1.2.0-1.4.0-SNAPSHOT + 1.2.0-1.6.0 4.0.0 diff --git a/k2de-dependency-k2platform-parent/pom.xml b/k2de-dependency-k2platform-parent/pom.xml index 3dd939e..f7a632c 100644 --- a/k2de-dependency-k2platform-parent/pom.xml +++ b/k2de-dependency-k2platform-parent/pom.xml @@ -5,7 +5,7 @@ k2de-parent com.k2data - 1.2.0-1.4.0-SNAPSHOT + 1.2.0-1.6.0 4.0.0 diff --git a/k2de-ingestion-parent/k2de-backup/pom.xml b/k2de-ingestion-parent/k2de-backup/pom.xml index 0b11631..e6db6b2 100644 --- a/k2de-ingestion-parent/k2de-backup/pom.xml +++ b/k2de-ingestion-parent/k2de-backup/pom.xml @@ -7,7 +7,7 @@ com.k2data k2de-ingestion-parent - 1.2.0-1.4.0-SNAPSHOT + 1.2.0-1.6.0 k2de-backup diff --git a/k2de-ingestion-parent/k2de-kafka-consumer/pom.xml b/k2de-ingestion-parent/k2de-kafka-consumer/pom.xml index 94e5e0a..496b5c1 100644 --- a/k2de-ingestion-parent/k2de-kafka-consumer/pom.xml +++ b/k2de-ingestion-parent/k2de-kafka-consumer/pom.xml @@ -5,7 +5,7 @@ k2de-ingestion-parent com.k2data - 1.2.0-1.4.0-SNAPSHOT + 1.2.0-1.6.0 4.0.0 diff --git a/k2de-ingestion-parent/k2de-netty-server/pom.xml b/k2de-ingestion-parent/k2de-netty-server/pom.xml index 3a2e02d..d1324c3 100644 --- a/k2de-ingestion-parent/k2de-netty-server/pom.xml +++ b/k2de-ingestion-parent/k2de-netty-server/pom.xml @@ -5,7 +5,7 @@ k2de-ingestion-parent com.k2data - 1.2.0-1.4.0-SNAPSHOT + 1.2.0-1.6.0 4.0.0 diff --git a/k2de-ingestion-parent/pom.xml b/k2de-ingestion-parent/pom.xml index 9a7c5fe..33a9dcf 100644 --- a/k2de-ingestion-parent/pom.xml +++ b/k2de-ingestion-parent/pom.xml @@ -5,7 +5,7 @@ k2de-parent com.k2data - 1.2.0-1.4.0-SNAPSHOT + 1.2.0-1.6.0 4.0.0 pom diff --git a/k2de-integration-parent/k2de-metadata-tool/pom.xml b/k2de-integration-parent/k2de-metadata-tool/pom.xml index 47f0094..df67253 100644 --- a/k2de-integration-parent/k2de-metadata-tool/pom.xml +++ b/k2de-integration-parent/k2de-metadata-tool/pom.xml @@ -5,7 +5,7 @@ k2de-integration-parent com.k2data - 1.2.0-1.4.0-SNAPSHOT + 1.2.0-1.6.0 4.0.0 diff --git a/k2de-integration-parent/pom.xml b/k2de-integration-parent/pom.xml index 1c0f0e9..4bc03c3 100644 --- a/k2de-integration-parent/pom.xml +++ b/k2de-integration-parent/pom.xml @@ -5,7 +5,7 @@ k2de-parent com.k2data - 1.2.0-1.4.0-SNAPSHOT + 1.2.0-1.6.0 4.0.0 pom diff --git a/pom.xml b/pom.xml index ef00a16..7962cbc 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.k2data k2de-parent pom - 1.2.0-1.4.0-SNAPSHOT + 1.2.0-1.6.0 k2de-common-parent -- Gitee From 6b8d898fe98dcf3e2759a8c61e9587dfe4eacf8f Mon Sep 17 00:00:00 2001 From: lijianing Date: Thu, 25 Jan 2018 19:49:25 +0800 Subject: [PATCH 2/3] master next commit --- VERSION | 2 +- k2de-common-parent/k2de-common-tests/pom.xml | 2 +- k2de-common-parent/k2de-common/pom.xml | 2 +- k2de-common-parent/pom.xml | 2 +- .../k2de-dependency-k2platform/pom.xml | 2 +- k2de-dependency-k2platform-parent/pom.xml | 2 +- k2de-ingestion-parent/k2de-backup/pom.xml | 2 +- k2de-ingestion-parent/k2de-kafka-consumer/pom.xml | 2 +- k2de-ingestion-parent/k2de-netty-server/pom.xml | 2 +- k2de-ingestion-parent/pom.xml | 2 +- k2de-integration-parent/k2de-metadata-tool/pom.xml | 2 +- k2de-integration-parent/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/VERSION b/VERSION index 9b27a55..cadd537 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -K2DE_VERSION=1.2.0-1.6.0 \ No newline at end of file +K2DE_VERSION=1.2.1-1.6.0-SNAPSHOT \ No newline at end of file diff --git a/k2de-common-parent/k2de-common-tests/pom.xml b/k2de-common-parent/k2de-common-tests/pom.xml index 9dcf527..28322e6 100644 --- a/k2de-common-parent/k2de-common-tests/pom.xml +++ b/k2de-common-parent/k2de-common-tests/pom.xml @@ -5,7 +5,7 @@ k2de-common-parent com.k2data - 1.2.0-1.6.0 + 1.2.1-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-common-parent/k2de-common/pom.xml b/k2de-common-parent/k2de-common/pom.xml index 0c6d423..5d87c14 100644 --- a/k2de-common-parent/k2de-common/pom.xml +++ b/k2de-common-parent/k2de-common/pom.xml @@ -5,7 +5,7 @@ k2de-common-parent com.k2data - 1.2.0-1.6.0 + 1.2.1-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-common-parent/pom.xml b/k2de-common-parent/pom.xml index 0a5319b..8538673 100644 --- a/k2de-common-parent/pom.xml +++ b/k2de-common-parent/pom.xml @@ -5,7 +5,7 @@ k2de-parent com.k2data - 1.2.0-1.6.0 + 1.2.1-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-dependency-k2platform-parent/k2de-dependency-k2platform/pom.xml b/k2de-dependency-k2platform-parent/k2de-dependency-k2platform/pom.xml index bf224a8..8b05532 100644 --- a/k2de-dependency-k2platform-parent/k2de-dependency-k2platform/pom.xml +++ b/k2de-dependency-k2platform-parent/k2de-dependency-k2platform/pom.xml @@ -6,7 +6,7 @@ com.k2data k2de-dependency-k2platform-parent - 1.2.0-1.6.0 + 1.2.1-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-dependency-k2platform-parent/pom.xml b/k2de-dependency-k2platform-parent/pom.xml index f7a632c..3e1fdaf 100644 --- a/k2de-dependency-k2platform-parent/pom.xml +++ b/k2de-dependency-k2platform-parent/pom.xml @@ -5,7 +5,7 @@ k2de-parent com.k2data - 1.2.0-1.6.0 + 1.2.1-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-ingestion-parent/k2de-backup/pom.xml b/k2de-ingestion-parent/k2de-backup/pom.xml index e6db6b2..ff272a9 100644 --- a/k2de-ingestion-parent/k2de-backup/pom.xml +++ b/k2de-ingestion-parent/k2de-backup/pom.xml @@ -7,7 +7,7 @@ com.k2data k2de-ingestion-parent - 1.2.0-1.6.0 + 1.2.1-1.6.0-SNAPSHOT k2de-backup diff --git a/k2de-ingestion-parent/k2de-kafka-consumer/pom.xml b/k2de-ingestion-parent/k2de-kafka-consumer/pom.xml index 496b5c1..204ddde 100644 --- a/k2de-ingestion-parent/k2de-kafka-consumer/pom.xml +++ b/k2de-ingestion-parent/k2de-kafka-consumer/pom.xml @@ -5,7 +5,7 @@ k2de-ingestion-parent com.k2data - 1.2.0-1.6.0 + 1.2.1-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-ingestion-parent/k2de-netty-server/pom.xml b/k2de-ingestion-parent/k2de-netty-server/pom.xml index d1324c3..037f735 100644 --- a/k2de-ingestion-parent/k2de-netty-server/pom.xml +++ b/k2de-ingestion-parent/k2de-netty-server/pom.xml @@ -5,7 +5,7 @@ k2de-ingestion-parent com.k2data - 1.2.0-1.6.0 + 1.2.1-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-ingestion-parent/pom.xml b/k2de-ingestion-parent/pom.xml index 33a9dcf..2790d54 100644 --- a/k2de-ingestion-parent/pom.xml +++ b/k2de-ingestion-parent/pom.xml @@ -5,7 +5,7 @@ k2de-parent com.k2data - 1.2.0-1.6.0 + 1.2.1-1.6.0-SNAPSHOT 4.0.0 pom diff --git a/k2de-integration-parent/k2de-metadata-tool/pom.xml b/k2de-integration-parent/k2de-metadata-tool/pom.xml index df67253..8dd3346 100644 --- a/k2de-integration-parent/k2de-metadata-tool/pom.xml +++ b/k2de-integration-parent/k2de-metadata-tool/pom.xml @@ -5,7 +5,7 @@ k2de-integration-parent com.k2data - 1.2.0-1.6.0 + 1.2.1-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-integration-parent/pom.xml b/k2de-integration-parent/pom.xml index 4bc03c3..53bb845 100644 --- a/k2de-integration-parent/pom.xml +++ b/k2de-integration-parent/pom.xml @@ -5,7 +5,7 @@ k2de-parent com.k2data - 1.2.0-1.6.0 + 1.2.1-1.6.0-SNAPSHOT 4.0.0 pom diff --git a/pom.xml b/pom.xml index 7962cbc..a8177b3 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.k2data k2de-parent pom - 1.2.0-1.6.0 + 1.2.1-1.6.0-SNAPSHOT k2de-common-parent -- Gitee From b5929c87ddc5b6c6c52edf422aa9cf27ca7e40e4 Mon Sep 17 00:00:00 2001 From: lijianing Date: Thu, 25 Jan 2018 19:56:03 +0800 Subject: [PATCH 3/3] dev next commit --- VERSION | 2 +- k2de-common-parent/k2de-common-tests/pom.xml | 2 +- k2de-common-parent/k2de-common/pom.xml | 2 +- k2de-common-parent/pom.xml | 2 +- .../k2de-dependency-k2platform/pom.xml | 2 +- k2de-dependency-k2platform-parent/pom.xml | 2 +- k2de-ingestion-parent/k2de-backup/pom.xml | 2 +- k2de-ingestion-parent/k2de-kafka-consumer/pom.xml | 2 +- k2de-ingestion-parent/k2de-netty-server/pom.xml | 2 +- k2de-ingestion-parent/pom.xml | 2 +- k2de-integration-parent/k2de-metadata-tool/pom.xml | 2 +- k2de-integration-parent/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/VERSION b/VERSION index cadd537..5558644 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -K2DE_VERSION=1.2.1-1.6.0-SNAPSHOT \ No newline at end of file +K2DE_VERSION=1.3.0-1.6.0-SNAPSHOT \ No newline at end of file diff --git a/k2de-common-parent/k2de-common-tests/pom.xml b/k2de-common-parent/k2de-common-tests/pom.xml index 28322e6..64e6dc6 100644 --- a/k2de-common-parent/k2de-common-tests/pom.xml +++ b/k2de-common-parent/k2de-common-tests/pom.xml @@ -5,7 +5,7 @@ k2de-common-parent com.k2data - 1.2.1-1.6.0-SNAPSHOT + 1.3.0-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-common-parent/k2de-common/pom.xml b/k2de-common-parent/k2de-common/pom.xml index 5d87c14..92fd99f 100644 --- a/k2de-common-parent/k2de-common/pom.xml +++ b/k2de-common-parent/k2de-common/pom.xml @@ -5,7 +5,7 @@ k2de-common-parent com.k2data - 1.2.1-1.6.0-SNAPSHOT + 1.3.0-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-common-parent/pom.xml b/k2de-common-parent/pom.xml index 8538673..55bc484 100644 --- a/k2de-common-parent/pom.xml +++ b/k2de-common-parent/pom.xml @@ -5,7 +5,7 @@ k2de-parent com.k2data - 1.2.1-1.6.0-SNAPSHOT + 1.3.0-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-dependency-k2platform-parent/k2de-dependency-k2platform/pom.xml b/k2de-dependency-k2platform-parent/k2de-dependency-k2platform/pom.xml index 8b05532..4640ffc 100644 --- a/k2de-dependency-k2platform-parent/k2de-dependency-k2platform/pom.xml +++ b/k2de-dependency-k2platform-parent/k2de-dependency-k2platform/pom.xml @@ -6,7 +6,7 @@ com.k2data k2de-dependency-k2platform-parent - 1.2.1-1.6.0-SNAPSHOT + 1.3.0-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-dependency-k2platform-parent/pom.xml b/k2de-dependency-k2platform-parent/pom.xml index 3e1fdaf..ed37155 100644 --- a/k2de-dependency-k2platform-parent/pom.xml +++ b/k2de-dependency-k2platform-parent/pom.xml @@ -5,7 +5,7 @@ k2de-parent com.k2data - 1.2.1-1.6.0-SNAPSHOT + 1.3.0-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-ingestion-parent/k2de-backup/pom.xml b/k2de-ingestion-parent/k2de-backup/pom.xml index ff272a9..db496bb 100644 --- a/k2de-ingestion-parent/k2de-backup/pom.xml +++ b/k2de-ingestion-parent/k2de-backup/pom.xml @@ -7,7 +7,7 @@ com.k2data k2de-ingestion-parent - 1.2.1-1.6.0-SNAPSHOT + 1.3.0-1.6.0-SNAPSHOT k2de-backup diff --git a/k2de-ingestion-parent/k2de-kafka-consumer/pom.xml b/k2de-ingestion-parent/k2de-kafka-consumer/pom.xml index 204ddde..dae0869 100644 --- a/k2de-ingestion-parent/k2de-kafka-consumer/pom.xml +++ b/k2de-ingestion-parent/k2de-kafka-consumer/pom.xml @@ -5,7 +5,7 @@ k2de-ingestion-parent com.k2data - 1.2.1-1.6.0-SNAPSHOT + 1.3.0-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-ingestion-parent/k2de-netty-server/pom.xml b/k2de-ingestion-parent/k2de-netty-server/pom.xml index 037f735..ff134e4 100644 --- a/k2de-ingestion-parent/k2de-netty-server/pom.xml +++ b/k2de-ingestion-parent/k2de-netty-server/pom.xml @@ -5,7 +5,7 @@ k2de-ingestion-parent com.k2data - 1.2.1-1.6.0-SNAPSHOT + 1.3.0-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-ingestion-parent/pom.xml b/k2de-ingestion-parent/pom.xml index 2790d54..bee8d1e 100644 --- a/k2de-ingestion-parent/pom.xml +++ b/k2de-ingestion-parent/pom.xml @@ -5,7 +5,7 @@ k2de-parent com.k2data - 1.2.1-1.6.0-SNAPSHOT + 1.3.0-1.6.0-SNAPSHOT 4.0.0 pom diff --git a/k2de-integration-parent/k2de-metadata-tool/pom.xml b/k2de-integration-parent/k2de-metadata-tool/pom.xml index 8dd3346..355a2c7 100644 --- a/k2de-integration-parent/k2de-metadata-tool/pom.xml +++ b/k2de-integration-parent/k2de-metadata-tool/pom.xml @@ -5,7 +5,7 @@ k2de-integration-parent com.k2data - 1.2.1-1.6.0-SNAPSHOT + 1.3.0-1.6.0-SNAPSHOT 4.0.0 diff --git a/k2de-integration-parent/pom.xml b/k2de-integration-parent/pom.xml index 53bb845..80d1c7e 100644 --- a/k2de-integration-parent/pom.xml +++ b/k2de-integration-parent/pom.xml @@ -5,7 +5,7 @@ k2de-parent com.k2data - 1.2.1-1.6.0-SNAPSHOT + 1.3.0-1.6.0-SNAPSHOT 4.0.0 pom diff --git a/pom.xml b/pom.xml index a8177b3..92646d3 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.k2data k2de-parent pom - 1.2.1-1.6.0-SNAPSHOT + 1.3.0-1.6.0-SNAPSHOT k2de-common-parent -- Gitee