This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit e687f44973d30f9621876eed9d83e408704ed231 Author: Lei Zhang <zhang...@apache.org> AuthorDate: Thu May 5 20:58:07 2022 +0800 SCB-2477 Use CI friendly maven version --- .gitignore | 3 ++ .../acceptance-pack-akka-spring-demo/pom.xml | 2 +- .../acceptance-pack-cluster-spring-demo/pom.xml | 2 +- .../acceptance-pack-dubbo-demo/pom.xml | 2 +- .../pom.xml | 2 +- .../acceptance-pack-spring-demo-with-nacos/pom.xml | 2 +- .../pom.xml | 2 +- .../acceptance-pack-spring-demo/pom.xml | 2 +- .../acceptance-pack-tcc-spring-demo/pom.xml | 2 +- acceptance-tests/acceptance-test-common/pom.xml | 2 +- acceptance-tests/pom.xml | 2 +- alpha/alpha-benchmark/pom.xml | 2 +- alpha/alpha-core/pom.xml | 2 +- alpha/alpha-persistence-jpa/pom.xml | 2 +- alpha/alpha-server/pom.xml | 2 +- alpha/alpha-spec-saga-akka/pom.xml | 2 +- alpha/alpha-spec-saga-db/pom.xml | 2 +- alpha/alpha-spec-tcc-db/pom.xml | 2 +- alpha/alpha-spring-cloud-starter-consul/pom.xml | 2 +- alpha/alpha-spring-cloud-starter-eureka/pom.xml | 2 +- alpha/alpha-spring-cloud-starter-nacos/pom.xml | 2 +- alpha/alpha-spring-cloud-starter-zookeeper/pom.xml | 2 +- alpha/alpha-ui/pom.xml | 2 +- alpha/pom.xml | 2 +- demo/pom.xml | 2 +- demo/saga-dubbo-demo/pom.xml | 2 +- demo/saga-dubbo-demo/service-api/pom.xml | 4 +- demo/saga-dubbo-demo/service-pub/pom.xml | 2 +- demo/saga-dubbo-demo/servicea/pom.xml | 2 +- demo/saga-dubbo-demo/serviceb/pom.xml | 4 +- demo/saga-dubbo-demo/servicec/pom.xml | 4 +- demo/saga-servicecomb-demo/pom.xml | 2 +- demo/saga-servicecomb-demo/scb-booking/pom.xml | 2 +- demo/saga-servicecomb-demo/scb-car/pom.xml | 2 +- demo/saga-servicecomb-demo/scb-hotel/pom.xml | 2 +- demo/saga-spring-demo/booking/pom.xml | 2 +- demo/saga-spring-demo/car/pom.xml | 2 +- demo/saga-spring-demo/hotel/pom.xml | 2 +- demo/saga-spring-demo/pom.xml | 2 +- demo/tcc-spring-demo/inventory/pom.xml | 2 +- demo/tcc-spring-demo/ordering/pom.xml | 2 +- demo/tcc-spring-demo/payment/pom.xml | 2 +- demo/tcc-spring-demo/pom.xml | 2 +- distribution/pom.xml | 7 +-- docker-build-config/pom.xml | 5 ++- integration-tests/coverage-aggregate/pom.xml | 6 +-- .../explicit-transaction-context-tests/pom.xml | 2 +- integration-tests/pack-tests/pom.xml | 2 +- integration-tests/pom.xml | 2 +- omega/omega-connector/omega-connector-grpc/pom.xml | 2 +- omega/omega-connector/pom.xml | 2 +- omega/omega-context/pom.xml | 2 +- omega/omega-format/pom.xml | 2 +- omega/omega-spring-cloud-consul-starter/pom.xml | 2 +- omega/omega-spring-cloud-eureka-starter/pom.xml | 2 +- omega/omega-spring-cloud-nacos-starter/pom.xml | 2 +- omega/omega-spring-cloud-zookeeper-starter/pom.xml | 2 +- omega/omega-spring-starter/pom.xml | 2 +- omega/omega-spring-tx/pom.xml | 2 +- omega/omega-transaction/pom.xml | 2 +- .../omega-transport/omega-transport-dubbo/pom.xml | 2 +- .../omega-transport/omega-transport-feign/pom.xml | 2 +- .../omega-transport-hystrix/pom.xml | 2 +- .../omega-transport-resttemplate/pom.xml | 2 +- .../omega-transport-servicecomb/pom.xml | 2 +- omega/omega-transport/pom.xml | 2 +- omega/pom.xml | 2 +- pack-common/pom.xml | 2 +- pack-contracts/pack-contract-grpc/pom.xml | 2 +- pack-contracts/pom.xml | 2 +- pack-dependencies/pom.xml | 50 +++++++++++++++++++++- pom.xml | 7 +-- web/pom.xml | 2 +- 73 files changed, 136 insertions(+), 82 deletions(-) diff --git a/.gitignore b/.gitignore index 621755d5..8e9d9c44 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,6 @@ target/ #akka distributed data ddata-* + +#flatten-maven-plugin +**/.flattened-pom.xml \ No newline at end of file diff --git a/acceptance-tests/acceptance-pack-akka-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-akka-spring-demo/pom.xml index e48816b6..b835d166 100644 --- a/acceptance-tests/acceptance-pack-akka-spring-demo/pom.xml +++ b/acceptance-tests/acceptance-pack-akka-spring-demo/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>acceptance-tests</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/acceptance-tests/acceptance-pack-cluster-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-cluster-spring-demo/pom.xml index ce15e976..24747a2a 100644 --- a/acceptance-tests/acceptance-pack-cluster-spring-demo/pom.xml +++ b/acceptance-tests/acceptance-pack-cluster-spring-demo/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>acceptance-tests</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml index 54c0d39a..29dbccae 100644 --- a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml +++ b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>acceptance-tests</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> <name>Pack:Acceptance Tests::Dubbo</name> diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-consul/pom.xml b/acceptance-tests/acceptance-pack-spring-demo-with-consul/pom.xml index 9d255669..1b37fb57 100644 --- a/acceptance-tests/acceptance-pack-spring-demo-with-consul/pom.xml +++ b/acceptance-tests/acceptance-pack-spring-demo-with-consul/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>acceptance-tests</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml index 3b3e2dc0..65e8f8bd 100644 --- a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml +++ b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>acceptance-tests</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml b/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml index b8b31515..5fc832fe 100644 --- a/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml +++ b/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>acceptance-tests</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/acceptance-tests/acceptance-pack-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-spring-demo/pom.xml index e7b360c2..d1e6a918 100644 --- a/acceptance-tests/acceptance-pack-spring-demo/pom.xml +++ b/acceptance-tests/acceptance-pack-spring-demo/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>acceptance-tests</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml index 0f2ca471..d54a4a7c 100644 --- a/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml +++ b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>acceptance-tests</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/acceptance-tests/acceptance-test-common/pom.xml b/acceptance-tests/acceptance-test-common/pom.xml index ed3da7c5..d1c7199c 100644 --- a/acceptance-tests/acceptance-test-common/pom.xml +++ b/acceptance-tests/acceptance-test-common/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>acceptance-tests</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/acceptance-tests/pom.xml b/acceptance-tests/pom.xml index 36df8598..e7320356 100644 --- a/acceptance-tests/pom.xml +++ b/acceptance-tests/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>pack-dependencies</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pack-dependencies</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/alpha/alpha-benchmark/pom.xml b/alpha/alpha-benchmark/pom.xml index 877745d8..ce9c35e4 100644 --- a/alpha/alpha-benchmark/pom.xml +++ b/alpha/alpha-benchmark/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>alpha</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/alpha/alpha-core/pom.xml b/alpha/alpha-core/pom.xml index a069feb0..11680d88 100644 --- a/alpha/alpha-core/pom.xml +++ b/alpha/alpha-core/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>alpha</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/alpha/alpha-persistence-jpa/pom.xml b/alpha/alpha-persistence-jpa/pom.xml index 64868cc7..4320258c 100644 --- a/alpha/alpha-persistence-jpa/pom.xml +++ b/alpha/alpha-persistence-jpa/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>alpha</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml index b194a698..6f0d8988 100644 --- a/alpha/alpha-server/pom.xml +++ b/alpha/alpha-server/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>alpha</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/alpha/alpha-spec-saga-akka/pom.xml b/alpha/alpha-spec-saga-akka/pom.xml index a7617b92..825aff44 100644 --- a/alpha/alpha-spec-saga-akka/pom.xml +++ b/alpha/alpha-spec-saga-akka/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>alpha</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/alpha/alpha-spec-saga-db/pom.xml b/alpha/alpha-spec-saga-db/pom.xml index 81a89702..4cf8907e 100644 --- a/alpha/alpha-spec-saga-db/pom.xml +++ b/alpha/alpha-spec-saga-db/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>alpha</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/alpha/alpha-spec-tcc-db/pom.xml b/alpha/alpha-spec-tcc-db/pom.xml index 865b1f4f..46a44e90 100644 --- a/alpha/alpha-spec-tcc-db/pom.xml +++ b/alpha/alpha-spec-tcc-db/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>alpha</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/alpha/alpha-spring-cloud-starter-consul/pom.xml b/alpha/alpha-spring-cloud-starter-consul/pom.xml index 7806c748..0863d639 100644 --- a/alpha/alpha-spring-cloud-starter-consul/pom.xml +++ b/alpha/alpha-spring-cloud-starter-consul/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>alpha</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/alpha/alpha-spring-cloud-starter-eureka/pom.xml b/alpha/alpha-spring-cloud-starter-eureka/pom.xml index 4aada33d..56afac48 100644 --- a/alpha/alpha-spring-cloud-starter-eureka/pom.xml +++ b/alpha/alpha-spring-cloud-starter-eureka/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>alpha</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/alpha/alpha-spring-cloud-starter-nacos/pom.xml b/alpha/alpha-spring-cloud-starter-nacos/pom.xml index 8cd96b5f..95f1bbb1 100644 --- a/alpha/alpha-spring-cloud-starter-nacos/pom.xml +++ b/alpha/alpha-spring-cloud-starter-nacos/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>alpha</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/alpha/alpha-spring-cloud-starter-zookeeper/pom.xml b/alpha/alpha-spring-cloud-starter-zookeeper/pom.xml index 37b1eefc..5240aea1 100644 --- a/alpha/alpha-spring-cloud-starter-zookeeper/pom.xml +++ b/alpha/alpha-spring-cloud-starter-zookeeper/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>alpha</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/alpha/alpha-ui/pom.xml b/alpha/alpha-ui/pom.xml index 9dc2f655..0bcaa922 100644 --- a/alpha/alpha-ui/pom.xml +++ b/alpha/alpha-ui/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>alpha</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/alpha/pom.xml b/alpha/pom.xml index 1f37b85d..86e767e4 100644 --- a/alpha/pom.xml +++ b/alpha/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>pack-dependencies</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pack-dependencies</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/pom.xml b/demo/pom.xml index 1ed912a2..60d637bc 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>pack-dependencies</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pack-dependencies</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/saga-dubbo-demo/pom.xml b/demo/saga-dubbo-demo/pom.xml index 9647820b..c3f17053 100644 --- a/demo/saga-dubbo-demo/pom.xml +++ b/demo/saga-dubbo-demo/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>pack-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/saga-dubbo-demo/service-api/pom.xml b/demo/saga-dubbo-demo/service-api/pom.xml index 06f370a0..54841f2b 100644 --- a/demo/saga-dubbo-demo/service-api/pom.xml +++ b/demo/saga-dubbo-demo/service-api/pom.xml @@ -24,14 +24,14 @@ <dependency> <groupId>org.apache.servicecomb.pack.demo</groupId> <artifactId>service-pub</artifactId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </dependency> </dependencies> <parent> <artifactId>saga-dubbo-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <artifactId>service-api</artifactId> diff --git a/demo/saga-dubbo-demo/service-pub/pom.xml b/demo/saga-dubbo-demo/service-pub/pom.xml index 2dae3481..96b195be 100644 --- a/demo/saga-dubbo-demo/service-pub/pom.xml +++ b/demo/saga-dubbo-demo/service-pub/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>saga-dubbo-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/saga-dubbo-demo/servicea/pom.xml b/demo/saga-dubbo-demo/servicea/pom.xml index 1e71f064..e9845dbd 100644 --- a/demo/saga-dubbo-demo/servicea/pom.xml +++ b/demo/saga-dubbo-demo/servicea/pom.xml @@ -36,7 +36,7 @@ <parent> <groupId>org.apache.servicecomb.pack.demo</groupId> <artifactId>saga-dubbo-demo</artifactId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <artifactId>servicea</artifactId> diff --git a/demo/saga-dubbo-demo/serviceb/pom.xml b/demo/saga-dubbo-demo/serviceb/pom.xml index 156ea9d1..d5261d45 100644 --- a/demo/saga-dubbo-demo/serviceb/pom.xml +++ b/demo/saga-dubbo-demo/serviceb/pom.xml @@ -24,7 +24,7 @@ <dependency> <groupId>org.apache.servicecomb.pack.demo</groupId> <artifactId>service-api</artifactId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> <scope>compile</scope> </dependency> </dependencies> @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.servicecomb.pack.demo</groupId> <artifactId>saga-dubbo-demo</artifactId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <artifactId>serviceb</artifactId> diff --git a/demo/saga-dubbo-demo/servicec/pom.xml b/demo/saga-dubbo-demo/servicec/pom.xml index 311e24d1..2704a054 100644 --- a/demo/saga-dubbo-demo/servicec/pom.xml +++ b/demo/saga-dubbo-demo/servicec/pom.xml @@ -24,7 +24,7 @@ <dependency> <groupId>org.apache.servicecomb.pack.demo</groupId> <artifactId>service-api</artifactId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> <scope>compile</scope> </dependency> </dependencies> @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.servicecomb.pack.demo</groupId> <artifactId>saga-dubbo-demo</artifactId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <artifactId>servicec</artifactId> diff --git a/demo/saga-servicecomb-demo/pom.xml b/demo/saga-servicecomb-demo/pom.xml index 56a3fd2e..9efef80a 100644 --- a/demo/saga-servicecomb-demo/pom.xml +++ b/demo/saga-servicecomb-demo/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>pack-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/saga-servicecomb-demo/scb-booking/pom.xml b/demo/saga-servicecomb-demo/scb-booking/pom.xml index 0da0f271..0232abf5 100644 --- a/demo/saga-servicecomb-demo/scb-booking/pom.xml +++ b/demo/saga-servicecomb-demo/scb-booking/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>saga-servicecomb-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/saga-servicecomb-demo/scb-car/pom.xml b/demo/saga-servicecomb-demo/scb-car/pom.xml index 0a883903..d648b220 100644 --- a/demo/saga-servicecomb-demo/scb-car/pom.xml +++ b/demo/saga-servicecomb-demo/scb-car/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>saga-servicecomb-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/saga-servicecomb-demo/scb-hotel/pom.xml b/demo/saga-servicecomb-demo/scb-hotel/pom.xml index 11d5bb0c..7f2d764b 100644 --- a/demo/saga-servicecomb-demo/scb-hotel/pom.xml +++ b/demo/saga-servicecomb-demo/scb-hotel/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>saga-servicecomb-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/saga-spring-demo/booking/pom.xml b/demo/saga-spring-demo/booking/pom.xml index fa0b7879..0024a19e 100644 --- a/demo/saga-spring-demo/booking/pom.xml +++ b/demo/saga-spring-demo/booking/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>saga-spring-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/saga-spring-demo/car/pom.xml b/demo/saga-spring-demo/car/pom.xml index 6039ef50..17b31e58 100644 --- a/demo/saga-spring-demo/car/pom.xml +++ b/demo/saga-spring-demo/car/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>saga-spring-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/saga-spring-demo/hotel/pom.xml b/demo/saga-spring-demo/hotel/pom.xml index a925c875..27c58781 100644 --- a/demo/saga-spring-demo/hotel/pom.xml +++ b/demo/saga-spring-demo/hotel/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>saga-spring-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/saga-spring-demo/pom.xml b/demo/saga-spring-demo/pom.xml index d729bd33..3a1da9af 100644 --- a/demo/saga-spring-demo/pom.xml +++ b/demo/saga-spring-demo/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>pack-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/tcc-spring-demo/inventory/pom.xml b/demo/tcc-spring-demo/inventory/pom.xml index 2c040675..fbddd007 100644 --- a/demo/tcc-spring-demo/inventory/pom.xml +++ b/demo/tcc-spring-demo/inventory/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>tcc-spring-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/tcc-spring-demo/ordering/pom.xml b/demo/tcc-spring-demo/ordering/pom.xml index 6226f6aa..791d69d2 100644 --- a/demo/tcc-spring-demo/ordering/pom.xml +++ b/demo/tcc-spring-demo/ordering/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>tcc-spring-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/tcc-spring-demo/payment/pom.xml b/demo/tcc-spring-demo/payment/pom.xml index baa89d4f..c308b27d 100644 --- a/demo/tcc-spring-demo/payment/pom.xml +++ b/demo/tcc-spring-demo/payment/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>tcc-spring-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/demo/tcc-spring-demo/pom.xml b/demo/tcc-spring-demo/pom.xml index 492eed1a..443db1ec 100644 --- a/demo/tcc-spring-demo/pom.xml +++ b/demo/tcc-spring-demo/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>pack-demo</artifactId> <groupId>org.apache.servicecomb.pack.demo</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/distribution/pom.xml b/distribution/pom.xml index 9ba01ff3..6e9da6e2 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -19,9 +19,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.servicecomb.pack</groupId> - <artifactId>pack</artifactId> - <version>0.7.0-SNAPSHOT</version> + <artifactId>pack-dependencies</artifactId> + <groupId>org.apache.servicecomb.pack</groupId> + <version>${revision}</version> + <relativePath>../pack-dependencies</relativePath> </parent> <artifactId>apache-servicecomb-pack-distribution</artifactId> <name>Pack::Distribution</name> diff --git a/docker-build-config/pom.xml b/docker-build-config/pom.xml index be39ffe7..1ee9f2e9 100644 --- a/docker-build-config/pom.xml +++ b/docker-build-config/pom.xml @@ -18,9 +18,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>pack</artifactId> + <artifactId>pack-dependencies</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> + <relativePath>../pack-dependencies</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/integration-tests/coverage-aggregate/pom.xml b/integration-tests/coverage-aggregate/pom.xml index 2c40aa92..ddae2d8c 100644 --- a/integration-tests/coverage-aggregate/pom.xml +++ b/integration-tests/coverage-aggregate/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.servicecomb.pack.tests</groupId> <artifactId>integration-tests</artifactId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -76,12 +76,12 @@ <dependency> <groupId>org.apache.servicecomb.pack.tests</groupId> <artifactId>pack-tests</artifactId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </dependency> <dependency> <groupId>org.apache.servicecomb.pack.tests</groupId> <artifactId>explicit-transaction-context-tests</artifactId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </dependency> </dependencies> diff --git a/integration-tests/explicit-transaction-context-tests/pom.xml b/integration-tests/explicit-transaction-context-tests/pom.xml index 7f26e757..b03085f2 100644 --- a/integration-tests/explicit-transaction-context-tests/pom.xml +++ b/integration-tests/explicit-transaction-context-tests/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>integration-tests</artifactId> <groupId>org.apache.servicecomb.pack.tests</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/integration-tests/pack-tests/pom.xml b/integration-tests/pack-tests/pom.xml index d3b8d346..5bcdf3c6 100644 --- a/integration-tests/pack-tests/pom.xml +++ b/integration-tests/pack-tests/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>integration-tests</artifactId> <groupId>org.apache.servicecomb.pack.tests</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index a77d48f4..1eefcd74 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>pack-dependencies</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pack-dependencies</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-connector/omega-connector-grpc/pom.xml b/omega/omega-connector/omega-connector-grpc/pom.xml index 8d5cd2d1..4b30a549 100644 --- a/omega/omega-connector/omega-connector-grpc/pom.xml +++ b/omega/omega-connector/omega-connector-grpc/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>omega-connector</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-connector/pom.xml b/omega/omega-connector/pom.xml index 5d4bfee1..fbff49ef 100644 --- a/omega/omega-connector/pom.xml +++ b/omega/omega-connector/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>omega</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-context/pom.xml b/omega/omega-context/pom.xml index a8a99695..641f7395 100644 --- a/omega/omega-context/pom.xml +++ b/omega/omega-context/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>omega</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-format/pom.xml b/omega/omega-format/pom.xml index ca242806..4b85e358 100644 --- a/omega/omega-format/pom.xml +++ b/omega/omega-format/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>omega</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-spring-cloud-consul-starter/pom.xml b/omega/omega-spring-cloud-consul-starter/pom.xml index 3ef7d6c6..d0c3a069 100644 --- a/omega/omega-spring-cloud-consul-starter/pom.xml +++ b/omega/omega-spring-cloud-consul-starter/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>omega</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-spring-cloud-eureka-starter/pom.xml b/omega/omega-spring-cloud-eureka-starter/pom.xml index 6ce84d9b..dc37c932 100644 --- a/omega/omega-spring-cloud-eureka-starter/pom.xml +++ b/omega/omega-spring-cloud-eureka-starter/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>omega</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-spring-cloud-nacos-starter/pom.xml b/omega/omega-spring-cloud-nacos-starter/pom.xml index 3c4e7bce..8ee3eb10 100644 --- a/omega/omega-spring-cloud-nacos-starter/pom.xml +++ b/omega/omega-spring-cloud-nacos-starter/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>omega</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-spring-cloud-zookeeper-starter/pom.xml b/omega/omega-spring-cloud-zookeeper-starter/pom.xml index f38467af..88635094 100644 --- a/omega/omega-spring-cloud-zookeeper-starter/pom.xml +++ b/omega/omega-spring-cloud-zookeeper-starter/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>omega</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-spring-starter/pom.xml b/omega/omega-spring-starter/pom.xml index f1b5c406..bfbeb408 100644 --- a/omega/omega-spring-starter/pom.xml +++ b/omega/omega-spring-starter/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>omega</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-spring-tx/pom.xml b/omega/omega-spring-tx/pom.xml index f15b6682..68579fa7 100644 --- a/omega/omega-spring-tx/pom.xml +++ b/omega/omega-spring-tx/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>omega</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-transaction/pom.xml b/omega/omega-transaction/pom.xml index 5d2379df..04270850 100644 --- a/omega/omega-transaction/pom.xml +++ b/omega/omega-transaction/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>omega</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-transport/omega-transport-dubbo/pom.xml b/omega/omega-transport/omega-transport-dubbo/pom.xml index fc290d63..19c5a7b8 100644 --- a/omega/omega-transport/omega-transport-dubbo/pom.xml +++ b/omega/omega-transport/omega-transport-dubbo/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>omega-transport</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-transport/omega-transport-feign/pom.xml b/omega/omega-transport/omega-transport-feign/pom.xml index 6f85a6f8..21d7158f 100644 --- a/omega/omega-transport/omega-transport-feign/pom.xml +++ b/omega/omega-transport/omega-transport-feign/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>omega-transport</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-transport/omega-transport-hystrix/pom.xml b/omega/omega-transport/omega-transport-hystrix/pom.xml index 4c628605..d3a07539 100644 --- a/omega/omega-transport/omega-transport-hystrix/pom.xml +++ b/omega/omega-transport/omega-transport-hystrix/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>omega-transport</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-transport/omega-transport-resttemplate/pom.xml b/omega/omega-transport/omega-transport-resttemplate/pom.xml index b09db657..52ced2df 100644 --- a/omega/omega-transport/omega-transport-resttemplate/pom.xml +++ b/omega/omega-transport/omega-transport-resttemplate/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>omega-transport</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-transport/omega-transport-servicecomb/pom.xml b/omega/omega-transport/omega-transport-servicecomb/pom.xml index cbb9e07c..070d367e 100644 --- a/omega/omega-transport/omega-transport-servicecomb/pom.xml +++ b/omega/omega-transport/omega-transport-servicecomb/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>omega-transport</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/omega-transport/pom.xml b/omega/omega-transport/pom.xml index b8eb9de1..25df02b7 100644 --- a/omega/omega-transport/pom.xml +++ b/omega/omega-transport/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>omega</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/omega/pom.xml b/omega/pom.xml index 50c493a8..afd4bdd0 100644 --- a/omega/pom.xml +++ b/omega/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>pack-dependencies</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pack-dependencies</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pack-common/pom.xml b/pack-common/pom.xml index 9d8d6fbc..23bf3c7e 100644 --- a/pack-common/pom.xml +++ b/pack-common/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>pack-dependencies</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pack-dependencies</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pack-contracts/pack-contract-grpc/pom.xml b/pack-contracts/pack-contract-grpc/pom.xml index e1bf8bc5..fecdfcb8 100644 --- a/pack-contracts/pack-contract-grpc/pom.xml +++ b/pack-contracts/pack-contract-grpc/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>pack-contracts</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pack-contracts/pom.xml b/pack-contracts/pom.xml index 39ece362..c4172ec7 100644 --- a/pack-contracts/pom.xml +++ b/pack-contracts/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>pack-dependencies</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pack-dependencies</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml index 95ce48fb..ed72f86c 100644 --- a/pack-dependencies/pom.xml +++ b/pack-dependencies/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>pack</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -843,4 +843,52 @@ </dependency> </dependencies> </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>${flatten-maven-plugin.version}</version> + <inherited>true</inherited> + <executions> + <execution> + <id>flatten</id> + <phase>process-resources</phase> + <goals> + <goal>flatten</goal> + </goals> + <configuration> + <updatePomFile>true</updatePomFile> + <flattenMode>bom</flattenMode> + <pomElements> + <parent>expand</parent> + <dependencies>keep</dependencies> + <dependencyManagement>keep</dependencyManagement> + <pluginManagement>keep</pluginManagement> + <distributionManagement>keep</distributionManagement> + <repositories>keep</repositories> + <properties>keep</properties> + </pomElements> + </configuration> + </execution> + <execution> + <id>flatten-clean</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + </plugin> + </plugins> + </build> </project> \ No newline at end of file diff --git a/pom.xml b/pom.xml index e78f7840..9f0ed993 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <groupId>org.apache.servicecomb.pack</groupId> <artifactId>pack</artifactId> <packaging>pom</packaging> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> <modules> <module>pack-dependencies</module> @@ -45,7 +45,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.8</java.version> - + <revision>0.7.0-SNAPSHOT</revision> <!-- plugins --> <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version> <license-maven-plugin.version>1.19</license-maven-plugin.version> @@ -69,6 +69,7 @@ <protobuf-maven-plugin.version>0.5.0</protobuf-maven-plugin.version> <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version> <dependency-check-maven.version>6.5.3</dependency-check-maven.version> + <flatten-maven-plugin.version>1.2.5</flatten-maven-plugin.version> </properties> <name>Apache ServiceComb Pack</name> @@ -196,7 +197,7 @@ <mixin> <groupId>org.apache.servicecomb.pack</groupId> <artifactId>docker-build-config</artifactId> - <version>${project.version}</version> + <version>${revision}</version> </mixin> </mixins> </configuration> diff --git a/web/pom.xml b/web/pom.xml index 48a6fbbb..ce13c5cd 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>pack-dependencies</artifactId> <groupId>org.apache.servicecomb.pack</groupId> - <version>0.7.0-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pack-dependencies</relativePath> </parent> <modelVersion>4.0.0</modelVersion>