This is an automated email from the ASF dual-hosted git repository.
liubao 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 63135ba27 [#4690]replace not maintained mixin-maven-plugin (#4712)
63135ba27 is described below
commit 63135ba272e4ee5aa05dfa21a3346ca3e6ccb425
Author: liubao68 <[email protected]>
AuthorDate: Mon Feb 10 14:41:46 2025 +0800
[#4690]replace not maintained mixin-maven-plugin (#4712)
---
demo/demo-consul/provider/pom.xml | 6 --
demo/demo-etcd/consumer/pom.xml | 6 --
demo/demo-etcd/gateway/pom.xml | 6 --
demo/demo-etcd/provider/pom.xml | 6 --
demo/demo-filter/filter-client/pom.xml | 56 +++++++++----
demo/demo-filter/filter-edge/pom.xml | 56 +++++++++----
demo/demo-filter/filter-server/pom.xml | 56 +++++++++----
demo/demo-jaxrs/jaxrs-server/pom.xml | 56 +++++++++----
.../demo-local-registry-server/pom.xml | 56 +++++++++----
.../demo-multi-registries-server/pom.xml | 56 +++++++++----
.../demo-multi-service-center-serverA/pom.xml | 56 +++++++++----
.../demo-multi-service-center-serverB/pom.xml | 56 +++++++++----
demo/demo-multiple/multiple-server/pom.xml | 56 +++++++++----
demo/demo-pojo/pojo-client/pom.xml | 90 ++++++++++++++++++---
.../demo-register-url-prefix-server/pom.xml | 56 +++++++++----
.../demo-spring-boot-pojo-server/pom.xml | 56 +++++++++----
.../demo-spring-boot-springmvc-server/pom.xml | 56 +++++++++----
demo/demo-springmvc/springmvc-server/pom.xml | 56 +++++++++----
.../demo-zeroconfig-registry-client/pom.xml | 56 +++++++++----
.../demo-zeroconfig-registry-edge/pom.xml | 56 +++++++++----
.../demo-zeroconfig-registry-server/pom.xml | 52 +++++++++---
demo/demo-zookeeper/consumer/pom.xml | 6 --
demo/demo-zookeeper/gateway/pom.xml | 6 --
demo/demo-zookeeper/provider/pom.xml | 6 --
demo/docker-build-config/pom.xml | 94 ----------------------
demo/pom.xml | 1 -
26 files changed, 701 insertions(+), 418 deletions(-)
diff --git a/demo/demo-consul/provider/pom.xml
b/demo/demo-consul/provider/pom.xml
index 1636940be..039c98852 100644
--- a/demo/demo-consul/provider/pom.xml
+++ b/demo/demo-consul/provider/pom.xml
@@ -60,12 +60,6 @@
</build>
<profiles>
- <profile>
- <id>build-docker-image</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
<profile>
<id>docker</id>
<build>
diff --git a/demo/demo-etcd/consumer/pom.xml b/demo/demo-etcd/consumer/pom.xml
index 8951a8460..50140d5f6 100644
--- a/demo/demo-etcd/consumer/pom.xml
+++ b/demo/demo-etcd/consumer/pom.xml
@@ -60,12 +60,6 @@
</build>
<profiles>
- <profile>
- <id>build-docker-image</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
<profile>
<id>docker</id>
<build>
diff --git a/demo/demo-etcd/gateway/pom.xml b/demo/demo-etcd/gateway/pom.xml
index e4188fe58..5febf28db 100644
--- a/demo/demo-etcd/gateway/pom.xml
+++ b/demo/demo-etcd/gateway/pom.xml
@@ -59,12 +59,6 @@
</build>
<profiles>
- <profile>
- <id>build-docker-image</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
<profile>
<id>docker</id>
<build>
diff --git a/demo/demo-etcd/provider/pom.xml b/demo/demo-etcd/provider/pom.xml
index 272a6e7f3..991a1b65f 100644
--- a/demo/demo-etcd/provider/pom.xml
+++ b/demo/demo-etcd/provider/pom.xml
@@ -69,12 +69,6 @@
</build>
<profiles>
- <profile>
- <id>build-docker-image</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
<profile>
<id>docker</id>
<build>
diff --git a/demo/demo-filter/filter-client/pom.xml
b/demo/demo-filter/filter-client/pom.xml
index 42e9c6af0..769a420e9 100644
--- a/demo/demo-filter/filter-client/pom.xml
+++ b/demo/demo-filter/filter-client/pom.xml
@@ -56,28 +56,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/demo/demo-filter/filter-edge/pom.xml
b/demo/demo-filter/filter-edge/pom.xml
index 6f6d63a47..5c6ec05f7 100644
--- a/demo/demo-filter/filter-edge/pom.xml
+++ b/demo/demo-filter/filter-edge/pom.xml
@@ -60,28 +60,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/demo/demo-filter/filter-server/pom.xml
b/demo/demo-filter/filter-server/pom.xml
index 3710a3efb..f2a10c52b 100644
--- a/demo/demo-filter/filter-server/pom.xml
+++ b/demo/demo-filter/filter-server/pom.xml
@@ -51,28 +51,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/demo/demo-jaxrs/jaxrs-server/pom.xml
b/demo/demo-jaxrs/jaxrs-server/pom.xml
index 41f99ae1c..d75e6cbbc 100644
--- a/demo/demo-jaxrs/jaxrs-server/pom.xml
+++ b/demo/demo-jaxrs/jaxrs-server/pom.xml
@@ -61,28 +61,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/demo/demo-local-registry/demo-local-registry-server/pom.xml
b/demo/demo-local-registry/demo-local-registry-server/pom.xml
index c9a005569..5e52643fa 100644
--- a/demo/demo-local-registry/demo-local-registry-server/pom.xml
+++ b/demo/demo-local-registry/demo-local-registry-server/pom.xml
@@ -55,28 +55,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/demo/demo-multi-registries/demo-multi-registries-server/pom.xml
b/demo/demo-multi-registries/demo-multi-registries-server/pom.xml
index 2418d2994..10ca21f2a 100644
--- a/demo/demo-multi-registries/demo-multi-registries-server/pom.xml
+++ b/demo/demo-multi-registries/demo-multi-registries-server/pom.xml
@@ -55,28 +55,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git
a/demo/demo-multi-service-center/demo-multi-service-center-serverA/pom.xml
b/demo/demo-multi-service-center/demo-multi-service-center-serverA/pom.xml
index 0455b6e69..3c0fd7397 100644
--- a/demo/demo-multi-service-center/demo-multi-service-center-serverA/pom.xml
+++ b/demo/demo-multi-service-center/demo-multi-service-center-serverA/pom.xml
@@ -55,28 +55,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git
a/demo/demo-multi-service-center/demo-multi-service-center-serverB/pom.xml
b/demo/demo-multi-service-center/demo-multi-service-center-serverB/pom.xml
index 6d860cf5e..4bf55b6d4 100644
--- a/demo/demo-multi-service-center/demo-multi-service-center-serverB/pom.xml
+++ b/demo/demo-multi-service-center/demo-multi-service-center-serverB/pom.xml
@@ -55,28 +55,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/demo/demo-multiple/multiple-server/pom.xml
b/demo/demo-multiple/multiple-server/pom.xml
index 21f04a247..68d1f5781 100644
--- a/demo/demo-multiple/multiple-server/pom.xml
+++ b/demo/demo-multiple/multiple-server/pom.xml
@@ -54,28 +54,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/demo/demo-pojo/pojo-client/pom.xml
b/demo/demo-pojo/pojo-client/pom.xml
index d9fbcab8c..23789ae4f 100644
--- a/demo/demo-pojo/pojo-client/pom.xml
+++ b/demo/demo-pojo/pojo-client/pom.xml
@@ -54,24 +54,88 @@
<demo.service.name>pojo-server</demo.service.name>
</properties>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>servicecomb/service-center</name>
+ <alias>service-center</alias>
+ <run>
+ <wait>
+ <log>server is ready</log>
+ <tcp>
+ <ports>
+ <port>30100</port>
+ </ports>
+ </tcp>
+ <time>60000</time>
+ </wait>
+ <ports>
+ <port>30100:30100</port>
+ </ports>
+ </run>
+ </image>
+ <image>
+ <name>${demo.service.name}:${project.version}</name>
+ <alias>${demo.service.name}</alias>
+ <run>
+ <env>
+ <JAVA_OPTS>
+
-Dservicecomb.registry.sc.address=http://sc.servicecomb.io:30100
+ </JAVA_OPTS>
+
<JAR_PATH>/maven/maven/${demo.service.name}-${project.version}.jar</JAR_PATH>
+ </env>
+ <links>
+ <link>service-center:sc.servicecomb.io</link>
+ </links>
+ <wait>
+ <log>ServiceComb is ready</log>
+ <tcp>
+ <ports>
+ <port>8080</port>
+ </ports>
+ </tcp>
+ <time>120000</time>
+ </wait>
+ <ports>
+ <port>7070:7070</port>
+ <port>8080:8080</port>
+ </ports>
+ <dependsOn>
+ <container>service-center</container>
+ </dependsOn>
+ </run>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-run-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git
a/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml
b/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml
index cd46fbe60..563ce0227 100644
--- a/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml
+++ b/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml
@@ -50,28 +50,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git
a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml
b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml
index 572394627..edf7ed504 100644
--- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml
+++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml
@@ -52,28 +52,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git
a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/pom.xml
b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/pom.xml
index 5fb051ba1..a614b00af 100644
--- a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/pom.xml
+++ b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/pom.xml
@@ -47,28 +47,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/demo/demo-springmvc/springmvc-server/pom.xml
b/demo/demo-springmvc/springmvc-server/pom.xml
index 57a8d1260..f1fff38f4 100644
--- a/demo/demo-springmvc/springmvc-server/pom.xml
+++ b/demo/demo-springmvc/springmvc-server/pom.xml
@@ -51,28 +51,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git
a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/pom.xml
b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/pom.xml
index 5887340b5..2ef78c974 100644
--- a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/pom.xml
+++ b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/pom.xml
@@ -62,28 +62,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git
a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-edge/pom.xml
b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-edge/pom.xml
index ebe16ceee..0266fe47b 100644
--- a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-edge/pom.xml
+++ b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-edge/pom.xml
@@ -67,28 +67,50 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git
a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-server/pom.xml
b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-server/pom.xml
index c5ed74d72..183b27bee 100644
--- a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-server/pom.xml
+++ b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-server/pom.xml
@@ -63,6 +63,45 @@
<profile>
<id>docker</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>${project.artifactId}:${project.version}</name>
+ <alias>${project.artifactId}</alias>
+ <build>
+ <from>openjdk:17-alpine</from>
+ <ports>
+ <port>7070</port>
+ <port>8080</port>
+ </ports>
+ <assembly>
+ <mode>tar</mode>
+
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
+ </assembly>
+ <entryPoint>
+ <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
+ </entryPoint>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
@@ -72,19 +111,6 @@
<groupId>org.commonjava.maven.plugins</groupId>
<artifactId>directory-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <configuration>
- <mixins>
- <mixin>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>docker-build-config</artifactId>
- <version>${project.version}</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/demo/demo-zookeeper/consumer/pom.xml
b/demo/demo-zookeeper/consumer/pom.xml
index d515ccaa7..6e60470ae 100644
--- a/demo/demo-zookeeper/consumer/pom.xml
+++ b/demo/demo-zookeeper/consumer/pom.xml
@@ -50,12 +50,6 @@
</build>
<profiles>
- <profile>
- <id>build-docker-image</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
<profile>
<id>docker</id>
<build>
diff --git a/demo/demo-zookeeper/gateway/pom.xml
b/demo/demo-zookeeper/gateway/pom.xml
index 1ffb4e92f..1cd29cbfe 100644
--- a/demo/demo-zookeeper/gateway/pom.xml
+++ b/demo/demo-zookeeper/gateway/pom.xml
@@ -53,12 +53,6 @@
</build>
<profiles>
- <profile>
- <id>build-docker-image</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
<profile>
<id>docker</id>
<build>
diff --git a/demo/demo-zookeeper/provider/pom.xml
b/demo/demo-zookeeper/provider/pom.xml
index bda558bc6..ea56074ef 100644
--- a/demo/demo-zookeeper/provider/pom.xml
+++ b/demo/demo-zookeeper/provider/pom.xml
@@ -62,12 +62,6 @@
</build>
<profiles>
- <profile>
- <id>build-docker-image</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
<profile>
<id>docker</id>
<build>
diff --git a/demo/docker-build-config/pom.xml b/demo/docker-build-config/pom.xml
deleted file mode 100644
index 746be5749..000000000
--- a/demo/docker-build-config/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>demo-parent</artifactId>
- <groupId>org.apache.servicecomb.demo</groupId>
- <version>3.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>docker-build-config</artifactId>
- <name>Java Chassis::Demo::Docker Build Config</name>
- <packaging>pom</packaging>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <configuration>
- <images>
- <image>
- <name>${project.artifactId}:${project.version}</name>
- <alias>${project.artifactId}</alias>
- <build>
- <from>openjdk:17-alpine</from>
- <ports>
- <port>7070</port>
- <port>8080</port>
- </ports>
- <assembly>
- <mode>tar</mode>
-
<descriptor>${root.basedir}/assembly/assembly.xml</descriptor>
- </assembly>
- <entryPoint>
- <shell>java -Xmx128m $JAVA_OPTS -jar $JAR_PATH</shell>
- </entryPoint>
- </build>
- </image>
- </images>
- </configuration>
- <executions>
- <execution>
- <id>build</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>directories</id>
- <goals>
- <goal>directory-of</goal>
- </goals>
- <phase>initialize</phase>
- <configuration>
- <property>root.basedir</property>
- <project>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>demo-parent</artifactId>
- </project>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
diff --git a/demo/pom.xml b/demo/pom.xml
index 5fe99cc27..172e42200 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -35,7 +35,6 @@
<packaging>pom</packaging>
<modules>
- <module>docker-build-config</module>
<module>docker-run-config</module>
<module>docker-run-config-edge</module>
<module>docker-run-config-local</module>
