You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by sh...@apache.org on 2022/07/30 07:13:28 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2651] Use gmaven-plus plugin instead of gmaven plugin (#3245)
This is an automated email from the ASF dual-hosted git repository.
shoothzj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 26e08641b [SCB-2651] Use gmaven-plus plugin instead of gmaven plugin (#3245)
26e08641b is described below
commit 26e08641ba65930c113380a254df43ec86d23901
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Sat Jul 30 15:13:22 2022 +0800
[SCB-2651] Use gmaven-plus plugin instead of gmaven plugin (#3245)
---
.../demo-multi-service-center-client/pom.xml | 14 ++++++----
.../pom.xml | 14 ++++++----
demo/docker-run-config-edge/pom.xml | 32 ++++++++++++----------
demo/docker-run-config-local/pom.xml | 32 ++++++++++++----------
demo/docker-run-config/pom.xml | 32 ++++++++++++----------
demo/pom.xml | 7 +++++
pom.xml | 6 ++++
7 files changed, 83 insertions(+), 54 deletions(-)
diff --git a/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml b/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml
index 929dd17b6..205370cd6 100644
--- a/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml
+++ b/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml
@@ -184,8 +184,8 @@
<artifactId>docker-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>add-default-properties</id>
@@ -194,10 +194,12 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- project.properties.setProperty('docker.hostname', 'localhost')
- log.info("Docker hostname is " + project.properties['docker.hostname'])
- </source>
+ <scripts>
+ <script>
+ project.properties.setProperty('docker.hostname', 'localhost')
+ log.info("Docker hostname is " + project.properties['docker.hostname'])
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/pom.xml b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/pom.xml
index 51c49e3a5..2a92d9db6 100644
--- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/pom.xml
+++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/pom.xml
@@ -152,8 +152,8 @@
<artifactId>docker-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>add-default-properties</id>
@@ -162,10 +162,12 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- project.properties.setProperty('docker.hostname', 'localhost')
- log.info("Docker hostname is " + project.properties['docker.hostname'])
- </source>
+ <scripts>
+ <script>
+ project.properties.setProperty('docker.hostname', 'localhost')
+ log.info("Docker hostname is " + project.properties['docker.hostname'])
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
diff --git a/demo/docker-run-config-edge/pom.xml b/demo/docker-run-config-edge/pom.xml
index 463b21241..daaf8a5ce 100644
--- a/demo/docker-run-config-edge/pom.xml
+++ b/demo/docker-run-config-edge/pom.xml
@@ -260,8 +260,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>add-default-properties</id>
@@ -270,10 +270,12 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- project.properties.setProperty('docker.hostname', 'localhost')
- log.info("Docker hostname is " + project.properties['docker.hostname'])
- </source>
+ <scripts>
+ <script>
+ project.properties.setProperty('docker.hostname', 'localhost')
+ log.info("Docker hostname is " + project.properties['docker.hostname'])
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
@@ -304,8 +306,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>add-dynamic-properties</id>
@@ -314,13 +316,15 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- def process = "docker-machine ip default".execute()
- process.waitFor()
- project.properties.setProperty('docker.hostname', process.in.text.trim())
+ <scripts>
+ <script>
+ def process = "docker-machine ip default".execute()
+ process.waitFor()
+ project.properties.setProperty('docker.hostname', process.in.text.trim())
- log.info("Docker hostname is " + project.properties['docker.hostname'])
- </source>
+ log.info("Docker hostname is " + project.properties['docker.hostname'])
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
diff --git a/demo/docker-run-config-local/pom.xml b/demo/docker-run-config-local/pom.xml
index f89e824bc..0565a0621 100644
--- a/demo/docker-run-config-local/pom.xml
+++ b/demo/docker-run-config-local/pom.xml
@@ -91,8 +91,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>add-default-properties</id>
@@ -101,10 +101,12 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- project.properties.setProperty('docker.hostname', 'localhost')
- log.info("Docker hostname is " + project.properties['docker.hostname'])
- </source>
+ <scripts>
+ <script>
+ project.properties.setProperty('docker.hostname', 'localhost')
+ log.info("Docker hostname is " + project.properties['docker.hostname'])
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
@@ -132,8 +134,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>add-dynamic-properties</id>
@@ -142,13 +144,15 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- def process = "docker-machine ip default".execute()
- process.waitFor()
- project.properties.setProperty('docker.hostname', process.in.text.trim())
+ <scripts>
+ <script>
+ def process = "docker-machine ip default".execute()
+ process.waitFor()
+ project.properties.setProperty('docker.hostname', process.in.text.trim())
- log.info("Docker hostname is " + project.properties['docker.hostname'])
- </source>
+ log.info("Docker hostname is " + project.properties['docker.hostname'])
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
diff --git a/demo/docker-run-config/pom.xml b/demo/docker-run-config/pom.xml
index 66d984e79..cb9803981 100644
--- a/demo/docker-run-config/pom.xml
+++ b/demo/docker-run-config/pom.xml
@@ -122,8 +122,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>add-default-properties</id>
@@ -132,10 +132,12 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- project.properties.setProperty('docker.hostname', 'localhost')
- log.info("Docker hostname is " + project.properties['docker.hostname'])
- </source>
+ <scripts>
+ <script>
+ project.properties.setProperty('docker.hostname', 'localhost')
+ log.info("Docker hostname is " + project.properties['docker.hostname'])
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
@@ -166,8 +168,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>add-dynamic-properties</id>
@@ -176,13 +178,15 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- def process = "docker-machine ip default".execute()
- process.waitFor()
- project.properties.setProperty('docker.hostname', process.in.text.trim())
+ <scripts>
+ <script>
+ def process = "docker-machine ip default".execute()
+ process.waitFor()
+ project.properties.setProperty('docker.hostname', process.in.text.trim())
- log.info("Docker hostname is " + project.properties['docker.hostname'])
- </source>
+ log.info("Docker hostname is " + project.properties['docker.hostname'])
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
diff --git a/demo/pom.xml b/demo/pom.xml
index 19a4be353..1a4e445c2 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -130,6 +130,13 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<pluginManagement>
<plugins>
diff --git a/pom.xml b/pom.xml
index cdd7299f7..f4f6566b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,7 @@
<dependency-check-maven-plugin.version>7.1.1</dependency-check-maven-plugin.version>
<docker-maven-plugin.version>0.40.1</docker-maven-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
+ <gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
<gpg-maven-plugin.version>3.0.1</gpg-maven-plugin.version>
<lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
@@ -499,6 +500,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>${gmavenplus-plugin.version}</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>