diff --git a/.gitignore b/.gitignore index 621755d58..8e9d9c44f 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 e48816b6d..b835d166a 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 @@ acceptance-tests org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/acceptance-tests/acceptance-pack-cluster-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-cluster-spring-demo/pom.xml index ce15e9769..24747a2ac 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 @@ acceptance-tests org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml index 54c0d39a6..29dbccae6 100644 --- a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml +++ b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml @@ -22,7 +22,7 @@ acceptance-tests org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 Pack:Acceptance Tests::Dubbo 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 9d2556699..1b37fb57b 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 @@ acceptance-tests org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 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 3b3e2dc05..65e8f8bd8 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 @@ acceptance-tests org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 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 b8b315156..5fc832fea 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 @@ acceptance-tests org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/acceptance-tests/acceptance-pack-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-spring-demo/pom.xml index e7b360c2f..d1e6a9181 100644 --- a/acceptance-tests/acceptance-pack-spring-demo/pom.xml +++ b/acceptance-tests/acceptance-pack-spring-demo/pom.xml @@ -22,7 +22,7 @@ acceptance-tests org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml index 0f2ca4711..d54a4a7cb 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 @@ acceptance-tests org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/acceptance-tests/acceptance-test-common/pom.xml b/acceptance-tests/acceptance-test-common/pom.xml index ed3da7c56..d1c7199cd 100644 --- a/acceptance-tests/acceptance-test-common/pom.xml +++ b/acceptance-tests/acceptance-test-common/pom.xml @@ -21,7 +21,7 @@ acceptance-tests org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/acceptance-tests/pom.xml b/acceptance-tests/pom.xml index 36df85982..e7320356f 100644 --- a/acceptance-tests/pom.xml +++ b/acceptance-tests/pom.xml @@ -22,7 +22,7 @@ pack-dependencies org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} ../pack-dependencies 4.0.0 diff --git a/alpha/alpha-benchmark/pom.xml b/alpha/alpha-benchmark/pom.xml index 877745d89..ce9c35e44 100644 --- a/alpha/alpha-benchmark/pom.xml +++ b/alpha/alpha-benchmark/pom.xml @@ -22,7 +22,7 @@ alpha org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/alpha/alpha-core/pom.xml b/alpha/alpha-core/pom.xml index a069feb07..11680d881 100644 --- a/alpha/alpha-core/pom.xml +++ b/alpha/alpha-core/pom.xml @@ -22,7 +22,7 @@ alpha org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/alpha/alpha-persistence-jpa/pom.xml b/alpha/alpha-persistence-jpa/pom.xml index 64868cc7c..4320258c7 100644 --- a/alpha/alpha-persistence-jpa/pom.xml +++ b/alpha/alpha-persistence-jpa/pom.xml @@ -22,7 +22,7 @@ alpha org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml index b194a6989..6f0d89880 100644 --- a/alpha/alpha-server/pom.xml +++ b/alpha/alpha-server/pom.xml @@ -22,7 +22,7 @@ alpha org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/alpha/alpha-spec-saga-akka/pom.xml b/alpha/alpha-spec-saga-akka/pom.xml index a7617b926..825aff44f 100644 --- a/alpha/alpha-spec-saga-akka/pom.xml +++ b/alpha/alpha-spec-saga-akka/pom.xml @@ -22,7 +22,7 @@ alpha org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/alpha/alpha-spec-saga-db/pom.xml b/alpha/alpha-spec-saga-db/pom.xml index 81a89702f..4cf8907e9 100644 --- a/alpha/alpha-spec-saga-db/pom.xml +++ b/alpha/alpha-spec-saga-db/pom.xml @@ -22,7 +22,7 @@ alpha org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/alpha/alpha-spec-tcc-db/pom.xml b/alpha/alpha-spec-tcc-db/pom.xml index 865b1f4f4..46a44e90d 100644 --- a/alpha/alpha-spec-tcc-db/pom.xml +++ b/alpha/alpha-spec-tcc-db/pom.xml @@ -22,7 +22,7 @@ alpha org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/alpha/alpha-spring-cloud-starter-consul/pom.xml b/alpha/alpha-spring-cloud-starter-consul/pom.xml index 7806c7481..0863d639f 100644 --- a/alpha/alpha-spring-cloud-starter-consul/pom.xml +++ b/alpha/alpha-spring-cloud-starter-consul/pom.xml @@ -22,7 +22,7 @@ alpha org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/alpha/alpha-spring-cloud-starter-eureka/pom.xml b/alpha/alpha-spring-cloud-starter-eureka/pom.xml index 4aada33da..56afac485 100644 --- a/alpha/alpha-spring-cloud-starter-eureka/pom.xml +++ b/alpha/alpha-spring-cloud-starter-eureka/pom.xml @@ -22,7 +22,7 @@ alpha org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/alpha/alpha-spring-cloud-starter-nacos/pom.xml b/alpha/alpha-spring-cloud-starter-nacos/pom.xml index 8cd96b5f0..95f1bbb11 100644 --- a/alpha/alpha-spring-cloud-starter-nacos/pom.xml +++ b/alpha/alpha-spring-cloud-starter-nacos/pom.xml @@ -22,7 +22,7 @@ alpha org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/alpha/alpha-spring-cloud-starter-zookeeper/pom.xml b/alpha/alpha-spring-cloud-starter-zookeeper/pom.xml index 37b1eefcb..5240aea13 100644 --- a/alpha/alpha-spring-cloud-starter-zookeeper/pom.xml +++ b/alpha/alpha-spring-cloud-starter-zookeeper/pom.xml @@ -22,7 +22,7 @@ alpha org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/alpha/alpha-ui/pom.xml b/alpha/alpha-ui/pom.xml index 9dc2f6550..0bcaa9223 100644 --- a/alpha/alpha-ui/pom.xml +++ b/alpha/alpha-ui/pom.xml @@ -22,7 +22,7 @@ alpha org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/alpha/pom.xml b/alpha/pom.xml index 1f37b85d4..86e767e4d 100644 --- a/alpha/pom.xml +++ b/alpha/pom.xml @@ -22,7 +22,7 @@ pack-dependencies org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} ../pack-dependencies 4.0.0 diff --git a/demo/pom.xml b/demo/pom.xml index 1ed912a20..60d637bcf 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -20,7 +20,7 @@ pack-dependencies org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} ../pack-dependencies 4.0.0 diff --git a/demo/saga-dubbo-demo/pom.xml b/demo/saga-dubbo-demo/pom.xml index 9647820b0..c3f17053c 100644 --- a/demo/saga-dubbo-demo/pom.xml +++ b/demo/saga-dubbo-demo/pom.xml @@ -21,7 +21,7 @@ pack-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/demo/saga-dubbo-demo/service-api/pom.xml b/demo/saga-dubbo-demo/service-api/pom.xml index 06f370a03..54841f2be 100644 --- a/demo/saga-dubbo-demo/service-api/pom.xml +++ b/demo/saga-dubbo-demo/service-api/pom.xml @@ -24,14 +24,14 @@ org.apache.servicecomb.pack.demo service-pub - 0.7.0-SNAPSHOT + ${revision} saga-dubbo-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} service-api diff --git a/demo/saga-dubbo-demo/service-pub/pom.xml b/demo/saga-dubbo-demo/service-pub/pom.xml index 2dae34816..96b195be8 100644 --- a/demo/saga-dubbo-demo/service-pub/pom.xml +++ b/demo/saga-dubbo-demo/service-pub/pom.xml @@ -21,7 +21,7 @@ saga-dubbo-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/demo/saga-dubbo-demo/servicea/pom.xml b/demo/saga-dubbo-demo/servicea/pom.xml index 1e71f0642..e9845dbd9 100644 --- a/demo/saga-dubbo-demo/servicea/pom.xml +++ b/demo/saga-dubbo-demo/servicea/pom.xml @@ -36,7 +36,7 @@ org.apache.servicecomb.pack.demo saga-dubbo-demo - 0.7.0-SNAPSHOT + ${revision} servicea diff --git a/demo/saga-dubbo-demo/serviceb/pom.xml b/demo/saga-dubbo-demo/serviceb/pom.xml index 156ea9d1f..d5261d45f 100644 --- a/demo/saga-dubbo-demo/serviceb/pom.xml +++ b/demo/saga-dubbo-demo/serviceb/pom.xml @@ -24,7 +24,7 @@ org.apache.servicecomb.pack.demo service-api - 0.7.0-SNAPSHOT + ${revision} compile @@ -32,7 +32,7 @@ org.apache.servicecomb.pack.demo saga-dubbo-demo - 0.7.0-SNAPSHOT + ${revision} serviceb diff --git a/demo/saga-dubbo-demo/servicec/pom.xml b/demo/saga-dubbo-demo/servicec/pom.xml index 311e24d1e..2704a0546 100644 --- a/demo/saga-dubbo-demo/servicec/pom.xml +++ b/demo/saga-dubbo-demo/servicec/pom.xml @@ -24,7 +24,7 @@ org.apache.servicecomb.pack.demo service-api - 0.7.0-SNAPSHOT + ${revision} compile @@ -32,7 +32,7 @@ org.apache.servicecomb.pack.demo saga-dubbo-demo - 0.7.0-SNAPSHOT + ${revision} servicec diff --git a/demo/saga-servicecomb-demo/pom.xml b/demo/saga-servicecomb-demo/pom.xml index 56a3fd2e7..9efef80a6 100644 --- a/demo/saga-servicecomb-demo/pom.xml +++ b/demo/saga-servicecomb-demo/pom.xml @@ -22,7 +22,7 @@ pack-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/demo/saga-servicecomb-demo/scb-booking/pom.xml b/demo/saga-servicecomb-demo/scb-booking/pom.xml index 0da0f271e..0232abf5f 100644 --- a/demo/saga-servicecomb-demo/scb-booking/pom.xml +++ b/demo/saga-servicecomb-demo/scb-booking/pom.xml @@ -22,7 +22,7 @@ saga-servicecomb-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/demo/saga-servicecomb-demo/scb-car/pom.xml b/demo/saga-servicecomb-demo/scb-car/pom.xml index 0a883903c..d648b220e 100644 --- a/demo/saga-servicecomb-demo/scb-car/pom.xml +++ b/demo/saga-servicecomb-demo/scb-car/pom.xml @@ -22,7 +22,7 @@ saga-servicecomb-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/demo/saga-servicecomb-demo/scb-hotel/pom.xml b/demo/saga-servicecomb-demo/scb-hotel/pom.xml index 11d5bb0c4..7f2d764b0 100644 --- a/demo/saga-servicecomb-demo/scb-hotel/pom.xml +++ b/demo/saga-servicecomb-demo/scb-hotel/pom.xml @@ -22,7 +22,7 @@ saga-servicecomb-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/demo/saga-spring-demo/booking/pom.xml b/demo/saga-spring-demo/booking/pom.xml index fa0b78792..0024a19ef 100644 --- a/demo/saga-spring-demo/booking/pom.xml +++ b/demo/saga-spring-demo/booking/pom.xml @@ -20,7 +20,7 @@ saga-spring-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/demo/saga-spring-demo/car/pom.xml b/demo/saga-spring-demo/car/pom.xml index 6039ef50f..17b31e587 100644 --- a/demo/saga-spring-demo/car/pom.xml +++ b/demo/saga-spring-demo/car/pom.xml @@ -20,7 +20,7 @@ saga-spring-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/demo/saga-spring-demo/hotel/pom.xml b/demo/saga-spring-demo/hotel/pom.xml index a925c875a..27c58781b 100644 --- a/demo/saga-spring-demo/hotel/pom.xml +++ b/demo/saga-spring-demo/hotel/pom.xml @@ -20,7 +20,7 @@ saga-spring-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/demo/saga-spring-demo/pom.xml b/demo/saga-spring-demo/pom.xml index d729bd33e..3a1da9af6 100644 --- a/demo/saga-spring-demo/pom.xml +++ b/demo/saga-spring-demo/pom.xml @@ -20,7 +20,7 @@ pack-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/demo/tcc-spring-demo/inventory/pom.xml b/demo/tcc-spring-demo/inventory/pom.xml index 2c040675a..fbddd0073 100644 --- a/demo/tcc-spring-demo/inventory/pom.xml +++ b/demo/tcc-spring-demo/inventory/pom.xml @@ -22,7 +22,7 @@ tcc-spring-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/demo/tcc-spring-demo/ordering/pom.xml b/demo/tcc-spring-demo/ordering/pom.xml index 6226f6aa6..791d69d21 100644 --- a/demo/tcc-spring-demo/ordering/pom.xml +++ b/demo/tcc-spring-demo/ordering/pom.xml @@ -22,7 +22,7 @@ tcc-spring-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/demo/tcc-spring-demo/payment/pom.xml b/demo/tcc-spring-demo/payment/pom.xml index baa89d4f1..c308b27dc 100644 --- a/demo/tcc-spring-demo/payment/pom.xml +++ b/demo/tcc-spring-demo/payment/pom.xml @@ -20,7 +20,7 @@ tcc-spring-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/demo/tcc-spring-demo/pom.xml b/demo/tcc-spring-demo/pom.xml index 492eed1ab..443db1ecf 100644 --- a/demo/tcc-spring-demo/pom.xml +++ b/demo/tcc-spring-demo/pom.xml @@ -20,7 +20,7 @@ pack-demo org.apache.servicecomb.pack.demo - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/distribution/pom.xml b/distribution/pom.xml index 9ba01ff3a..6e9da6e28 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"> 4.0.0 - org.apache.servicecomb.pack - pack - 0.7.0-SNAPSHOT + pack-dependencies + org.apache.servicecomb.pack + ${revision} + ../pack-dependencies apache-servicecomb-pack-distribution Pack::Distribution diff --git a/docker-build-config/pom.xml b/docker-build-config/pom.xml index be39ffe76..1ee9f2e93 100644 --- a/docker-build-config/pom.xml +++ b/docker-build-config/pom.xml @@ -18,9 +18,10 @@ - pack + pack-dependencies org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} + ../pack-dependencies 4.0.0 diff --git a/integration-tests/coverage-aggregate/pom.xml b/integration-tests/coverage-aggregate/pom.xml index 2c40aa928..ddae2d8cc 100644 --- a/integration-tests/coverage-aggregate/pom.xml +++ b/integration-tests/coverage-aggregate/pom.xml @@ -20,7 +20,7 @@ org.apache.servicecomb.pack.tests integration-tests - 0.7.0-SNAPSHOT + ${revision} 4.0.0 @@ -76,12 +76,12 @@ org.apache.servicecomb.pack.tests pack-tests - 0.7.0-SNAPSHOT + ${revision} org.apache.servicecomb.pack.tests explicit-transaction-context-tests - 0.7.0-SNAPSHOT + ${revision} diff --git a/integration-tests/explicit-transaction-context-tests/pom.xml b/integration-tests/explicit-transaction-context-tests/pom.xml index 7f26e757a..b03085f20 100644 --- a/integration-tests/explicit-transaction-context-tests/pom.xml +++ b/integration-tests/explicit-transaction-context-tests/pom.xml @@ -22,7 +22,7 @@ integration-tests org.apache.servicecomb.pack.tests - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/integration-tests/pack-tests/pom.xml b/integration-tests/pack-tests/pom.xml index d3b8d3466..5bcdf3c6a 100644 --- a/integration-tests/pack-tests/pom.xml +++ b/integration-tests/pack-tests/pom.xml @@ -22,7 +22,7 @@ integration-tests org.apache.servicecomb.pack.tests - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index a77d48f4e..1eefcd74c 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -20,7 +20,7 @@ pack-dependencies org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} ../pack-dependencies 4.0.0 diff --git a/omega/omega-connector/omega-connector-grpc/pom.xml b/omega/omega-connector/omega-connector-grpc/pom.xml index 8d5cd2d1a..4b30a5493 100644 --- a/omega/omega-connector/omega-connector-grpc/pom.xml +++ b/omega/omega-connector/omega-connector-grpc/pom.xml @@ -24,7 +24,7 @@ omega-connector org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-connector/pom.xml b/omega/omega-connector/pom.xml index 5d4bfee19..fbff49ef6 100644 --- a/omega/omega-connector/pom.xml +++ b/omega/omega-connector/pom.xml @@ -22,7 +22,7 @@ omega org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-context/pom.xml b/omega/omega-context/pom.xml index a8a99695b..641f73953 100644 --- a/omega/omega-context/pom.xml +++ b/omega/omega-context/pom.xml @@ -22,7 +22,7 @@ omega org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-format/pom.xml b/omega/omega-format/pom.xml index ca242806c..4b85e3589 100644 --- a/omega/omega-format/pom.xml +++ b/omega/omega-format/pom.xml @@ -22,7 +22,7 @@ omega org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-spring-cloud-consul-starter/pom.xml b/omega/omega-spring-cloud-consul-starter/pom.xml index 3ef7d6c64..d0c3a069a 100644 --- a/omega/omega-spring-cloud-consul-starter/pom.xml +++ b/omega/omega-spring-cloud-consul-starter/pom.xml @@ -22,7 +22,7 @@ omega org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-spring-cloud-eureka-starter/pom.xml b/omega/omega-spring-cloud-eureka-starter/pom.xml index 6ce84d9bf..dc37c9327 100644 --- a/omega/omega-spring-cloud-eureka-starter/pom.xml +++ b/omega/omega-spring-cloud-eureka-starter/pom.xml @@ -22,7 +22,7 @@ omega org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-spring-cloud-nacos-starter/pom.xml b/omega/omega-spring-cloud-nacos-starter/pom.xml index 3c4e7bce7..8ee3eb105 100644 --- a/omega/omega-spring-cloud-nacos-starter/pom.xml +++ b/omega/omega-spring-cloud-nacos-starter/pom.xml @@ -22,7 +22,7 @@ omega org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-spring-cloud-zookeeper-starter/pom.xml b/omega/omega-spring-cloud-zookeeper-starter/pom.xml index f38467afb..886350948 100644 --- a/omega/omega-spring-cloud-zookeeper-starter/pom.xml +++ b/omega/omega-spring-cloud-zookeeper-starter/pom.xml @@ -22,7 +22,7 @@ omega org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-spring-starter/pom.xml b/omega/omega-spring-starter/pom.xml index f1b5c4061..bfbeb408c 100644 --- a/omega/omega-spring-starter/pom.xml +++ b/omega/omega-spring-starter/pom.xml @@ -22,7 +22,7 @@ omega org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-spring-tx/pom.xml b/omega/omega-spring-tx/pom.xml index f15b66823..68579fa7b 100644 --- a/omega/omega-spring-tx/pom.xml +++ b/omega/omega-spring-tx/pom.xml @@ -22,7 +22,7 @@ omega org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-transaction/pom.xml b/omega/omega-transaction/pom.xml index 5d2379df1..042708504 100644 --- a/omega/omega-transaction/pom.xml +++ b/omega/omega-transaction/pom.xml @@ -22,7 +22,7 @@ omega org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-transport/omega-transport-dubbo/pom.xml b/omega/omega-transport/omega-transport-dubbo/pom.xml index fc290d63b..19c5a7b8d 100644 --- a/omega/omega-transport/omega-transport-dubbo/pom.xml +++ b/omega/omega-transport/omega-transport-dubbo/pom.xml @@ -23,7 +23,7 @@ omega-transport org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-transport/omega-transport-feign/pom.xml b/omega/omega-transport/omega-transport-feign/pom.xml index 6f85a6f8e..21d7158f2 100644 --- a/omega/omega-transport/omega-transport-feign/pom.xml +++ b/omega/omega-transport/omega-transport-feign/pom.xml @@ -23,7 +23,7 @@ omega-transport org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-transport/omega-transport-hystrix/pom.xml b/omega/omega-transport/omega-transport-hystrix/pom.xml index 4c6286055..d3a075393 100644 --- a/omega/omega-transport/omega-transport-hystrix/pom.xml +++ b/omega/omega-transport/omega-transport-hystrix/pom.xml @@ -21,7 +21,7 @@ omega-transport org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-transport/omega-transport-resttemplate/pom.xml b/omega/omega-transport/omega-transport-resttemplate/pom.xml index b09db6570..52ced2df1 100644 --- a/omega/omega-transport/omega-transport-resttemplate/pom.xml +++ b/omega/omega-transport/omega-transport-resttemplate/pom.xml @@ -23,7 +23,7 @@ omega-transport org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-transport/omega-transport-servicecomb/pom.xml b/omega/omega-transport/omega-transport-servicecomb/pom.xml index cbb9e07c0..070d367e3 100644 --- a/omega/omega-transport/omega-transport-servicecomb/pom.xml +++ b/omega/omega-transport/omega-transport-servicecomb/pom.xml @@ -22,7 +22,7 @@ omega-transport org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/omega-transport/pom.xml b/omega/omega-transport/pom.xml index b8eb9de11..25df02b71 100644 --- a/omega/omega-transport/pom.xml +++ b/omega/omega-transport/pom.xml @@ -23,7 +23,7 @@ omega org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/omega/pom.xml b/omega/pom.xml index 50c493a8f..afd4bdd0e 100644 --- a/omega/pom.xml +++ b/omega/pom.xml @@ -22,7 +22,7 @@ pack-dependencies org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} ../pack-dependencies 4.0.0 diff --git a/pack-common/pom.xml b/pack-common/pom.xml index 9d8d6fbc8..23bf3c7e5 100644 --- a/pack-common/pom.xml +++ b/pack-common/pom.xml @@ -22,7 +22,7 @@ pack-dependencies org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} ../pack-dependencies 4.0.0 diff --git a/pack-contracts/pack-contract-grpc/pom.xml b/pack-contracts/pack-contract-grpc/pom.xml index e1bf8bc59..fecdfcb8a 100644 --- a/pack-contracts/pack-contract-grpc/pom.xml +++ b/pack-contracts/pack-contract-grpc/pom.xml @@ -25,7 +25,7 @@ pack-contracts org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 diff --git a/pack-contracts/pom.xml b/pack-contracts/pom.xml index 39ece3625..c4172ec7e 100644 --- a/pack-contracts/pom.xml +++ b/pack-contracts/pom.xml @@ -22,7 +22,7 @@ pack-dependencies org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} ../pack-dependencies 4.0.0 diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml index 95ce48fb9..627fcbd37 100644 --- a/pack-dependencies/pom.xml +++ b/pack-dependencies/pom.xml @@ -22,7 +22,7 @@ pack org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} 4.0.0 @@ -843,4 +843,53 @@ + + + + + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + true + + + flatten + process-resources + + flatten + + + true + bom + + expand + keep + keep + keep + keep + keep + keep + + + + + flatten-clean + clean + + clean + + + + + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index e78f78401..9f0ed9932 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.servicecomb.pack pack pom - 0.7.0-SNAPSHOT + ${revision} pack-dependencies @@ -45,7 +45,7 @@ UTF-8 UTF-8 1.8 - + 0.7.0-SNAPSHOT 0.8.6 1.19 @@ -69,6 +69,7 @@ 0.5.0 1.5.0.Final 6.5.3 + 1.2.5 Apache ServiceComb Pack @@ -196,7 +197,7 @@ org.apache.servicecomb.pack docker-build-config - ${project.version} + ${revision} diff --git a/web/pom.xml b/web/pom.xml index 48a6fbbbf..ce13c5cd1 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -22,7 +22,7 @@ pack-dependencies org.apache.servicecomb.pack - 0.7.0-SNAPSHOT + ${revision} ../pack-dependencies 4.0.0