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
commit 76446cb300989a4d47c02ed40907de35048a560d Author: liubao <[email protected]> AuthorDate: Sat Feb 8 17:11:47 2025 +0800 [#4690]use profile to replace mixin-maven-plugin --- demo/demo-consul/consumer/pom.xml | 16 ++------- demo/demo-consul/gateway/pom.xml | 16 ++------- demo/demo-consul/provider/pom.xml | 16 ++------- demo/pom.xml | 73 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 39 deletions(-) diff --git a/demo/demo-consul/consumer/pom.xml b/demo/demo-consul/consumer/pom.xml index 3059e452f..ce11fa144 100644 --- a/demo/demo-consul/consumer/pom.xml +++ b/demo/demo-consul/consumer/pom.xml @@ -52,6 +52,9 @@ <profiles> <profile> <id>docker</id> + <properties> + <build.enable.docker.image>true</build.enable.docker.image> + </properties> <build> <plugins> <plugin> @@ -62,19 +65,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-consul/gateway/pom.xml b/demo/demo-consul/gateway/pom.xml index 47d13456a..c21ce220d 100644 --- a/demo/demo-consul/gateway/pom.xml +++ b/demo/demo-consul/gateway/pom.xml @@ -55,6 +55,9 @@ <profiles> <profile> <id>docker</id> + <properties> + <build.enable.docker.image>true</build.enable.docker.image> + </properties> <build> <plugins> <plugin> @@ -65,19 +68,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-consul/provider/pom.xml b/demo/demo-consul/provider/pom.xml index dff8eb60e..0b862228c 100644 --- a/demo/demo-consul/provider/pom.xml +++ b/demo/demo-consul/provider/pom.xml @@ -62,6 +62,9 @@ <profiles> <profile> <id>docker</id> + <properties> + <build.enable.docker.image>true</build.enable.docker.image> + </properties> <build> <plugins> <plugin> @@ -72,19 +75,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/pom.xml b/demo/pom.xml index 1cf9c7049..706e70b4f 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -187,4 +187,77 @@ </plugins> </pluginManagement> </build> + + <profiles> + <profile> + <id>build-docker-image</id> + <activation> + <property> + <name>build.enable.docker.image</name> + <value>true</value> + </property> + </activation> + <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> + </profile> + </profiles> </project>
