This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch 0.7.x in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 6d787714b07f44980bd178a78ce32c0e6f37bc06 Author: Lei Zhang <zhang...@apache.org> AuthorDate: Mon Aug 1 17:45:18 2022 +0800 SCB-2657 Fix wrong version placeholder --- demo/saga-dubbo-demo/service-api/pom.xml | 2 +- demo/saga-dubbo-demo/serviceb/pom.xml | 2 +- demo/saga-dubbo-demo/servicec/pom.xml | 2 +- integration-tests/coverage-aggregate/pom.xml | 4 +-- pom.xml | 43 ++++++++++++++++++++++++++-- 5 files changed, 46 insertions(+), 7 deletions(-) diff --git a/demo/saga-dubbo-demo/service-api/pom.xml b/demo/saga-dubbo-demo/service-api/pom.xml index 54841f2b..abbb2057 100644 --- a/demo/saga-dubbo-demo/service-api/pom.xml +++ b/demo/saga-dubbo-demo/service-api/pom.xml @@ -24,7 +24,7 @@ <dependency> <groupId>org.apache.servicecomb.pack.demo</groupId> <artifactId>service-pub</artifactId> - <version>${revision}</version> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/demo/saga-dubbo-demo/serviceb/pom.xml b/demo/saga-dubbo-demo/serviceb/pom.xml index d5261d45..ab4c6862 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>${revision}</version> + <version>${project.version}</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/demo/saga-dubbo-demo/servicec/pom.xml b/demo/saga-dubbo-demo/servicec/pom.xml index 2704a054..9d9839e0 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>${revision}</version> + <version>${project.version}</version> <scope>compile</scope> </dependency> </dependencies> diff --git a/integration-tests/coverage-aggregate/pom.xml b/integration-tests/coverage-aggregate/pom.xml index ddae2d8c..45733f06 100644 --- a/integration-tests/coverage-aggregate/pom.xml +++ b/integration-tests/coverage-aggregate/pom.xml @@ -76,12 +76,12 @@ <dependency> <groupId>org.apache.servicecomb.pack.tests</groupId> <artifactId>pack-tests</artifactId> - <version>${revision}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb.pack.tests</groupId> <artifactId>explicit-transaction-context-tests</artifactId> - <version>${revision}</version> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/pom.xml b/pom.xml index 4e0ac16e..926e12b4 100644 --- a/pom.xml +++ b/pom.xml @@ -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</revision> + <revision>0.7.1-SNAPSHOT</revision> <!-- plugins --> <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version> <license-maven-plugin.version>1.19</license-maven-plugin.version> @@ -197,7 +197,7 @@ <mixin> <groupId>org.apache.servicecomb.pack</groupId> <artifactId>docker-build-config</artifactId> - <version>${revision}</version> + <version>${project.version}</version> </mixin> </mixins> </configuration> @@ -344,6 +344,41 @@ <artifactId>maven-failsafe-plugin</artifactId> <version>${maven.failsafe.version}</version> </plugin> + <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>remove</dependencyManagement> + <pluginManagement>remove</pluginManagement> + <distributionManagement>remove</distributionManagement> + <repositories>remove</repositories> + <properties>remove</properties> + </pomElements> + </configuration> + </execution> + <execution> + <id>flatten-clean</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> <!-- enable the rat check by default --> @@ -369,6 +404,10 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + </plugin> </plugins> </build>