[#4690]replace not maintained mixin-maven-plugin (#4713)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index dbb4ed1..15a8cd1 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml
@@ -41,7 +41,7 @@ - name: Set up Maven uses: stCarolas/setup-maven@v4.5 with: - maven-version: 3.8.4 + maven-version: 3.9.9 - uses: actions/cache@v4 with: path: ~/.m2/repository
diff --git a/demo/demo-consul/test-client/src/test/java/org/apache/servicecomb/samples/ConsulT.java b/demo/demo-consul/test-client/src/test/java/org/apache/servicecomb/samples/ConsulIT.java similarity index 97% rename from demo/demo-consul/test-client/src/test/java/org/apache/servicecomb/samples/ConsulT.java rename to demo/demo-consul/test-client/src/test/java/org/apache/servicecomb/samples/ConsulIT.java index dc687e0..6286274 100644 --- a/demo/demo-consul/test-client/src/test/java/org/apache/servicecomb/samples/ConsulT.java +++ b/demo/demo-consul/test-client/src/test/java/org/apache/servicecomb/samples/ConsulIT.java
@@ -29,8 +29,8 @@ @ExtendWith(SpringExtension.class) @SpringBootTest(classes = TestClientApplication.class) -public class ConsulT { - private static final Logger LOGGER = LoggerFactory.getLogger(ConsulT.class); +public class ConsulIT { + private static final Logger LOGGER = LoggerFactory.getLogger(ConsulIT.class); @BeforeEach public void setUp() {
diff --git a/demo/demo-jaxrs/jaxrs-client/pom.xml b/demo/demo-jaxrs/jaxrs-client/pom.xml index 7ded2d6..cc6f702 100644 --- a/demo/demo-jaxrs/jaxrs-client/pom.xml +++ b/demo/demo-jaxrs/jaxrs-client/pom.xml
@@ -45,24 +45,88 @@ <demo.service.name>jaxrs-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-local-registry/demo-local-registry-client/pom.xml b/demo/demo-local-registry/demo-local-registry-client/pom.xml index 587b1bf..5f824d7 100644 --- a/demo/demo-local-registry/demo-local-registry-client/pom.xml +++ b/demo/demo-local-registry/demo-local-registry-client/pom.xml
@@ -45,24 +45,60 @@ <demo.service.name>demo-local-registry-server</demo.service.name> </properties> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <configuration> + <images> + <image> + <name>${demo.service.name}:${project.version}</name> + <alias>${demo.service.name}</alias> + <run> + <env> + <JAR_PATH>/maven/maven/${demo.service.name}-${project.version}.jar</JAR_PATH> + </env> + <wait> + <log>ServiceComb is ready</log> + <tcp> + <ports> + <port>8080</port> + </ports> + </tcp> + <time>120000</time> + </wait> + <ports> + <port>8080:8080</port> + </ports> + </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-local</artifactId> - <version>${project.version}</version> - </mixin> - </mixins> - </configuration> - </plugin> </plugins> </build> </profile>
diff --git a/demo/demo-multi-registries/demo-multi-registries-client/pom.xml b/demo/demo-multi-registries/demo-multi-registries-client/pom.xml index 63fa50d..9fcc4b7 100644 --- a/demo/demo-multi-registries/demo-multi-registries-client/pom.xml +++ b/demo/demo-multi-registries/demo-multi-registries-client/pom.xml
@@ -45,24 +45,88 @@ <demo.service.name>demo-multi-registries-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-multi-service-center/demo-multi-service-center-client/pom.xml b/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml index ecdbfed..41d6c38 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
@@ -177,21 +177,6 @@ <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <argLine>${jacoco.failsafe.argLine}</argLine> - </configuration> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </profile>
diff --git a/demo/demo-multiple/multiple-client/pom.xml b/demo/demo-multiple/multiple-client/pom.xml index d337063..ac1aa66 100644 --- a/demo/demo-multiple/multiple-client/pom.xml +++ b/demo/demo-multiple/multiple-client/pom.xml
@@ -48,24 +48,88 @@ <demo.service.name>multiple-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-client/pom.xml b/demo/demo-register-url-prefix/demo-register-url-prefix-client/pom.xml index d1d1859..11faba2 100644 --- a/demo/demo-register-url-prefix/demo-register-url-prefix-client/pom.xml +++ b/demo/demo-register-url-prefix/demo-register-url-prefix-client/pom.xml
@@ -45,24 +45,88 @@ <demo.service.name>demo-register-url-prefix-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-spring-boot-transport/demo-spring-boot-pojo-client/pom.xml b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/pom.xml index 776a577..359371d 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/pom.xml +++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/pom.xml
@@ -39,24 +39,88 @@ <demo.service.name>demo-spring-boot-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-spring-boot-transport/demo-spring-boot-springmvc-client/pom.xml b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/pom.xml index b6afa72..75a97d1 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/pom.xml +++ b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/pom.xml
@@ -42,24 +42,88 @@ <demo.service.name>demo-spring-boot-springmvc-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-springmvc/springmvc-client/pom.xml b/demo/demo-springmvc/springmvc-client/pom.xml index fb9f903..e38a29d 100644 --- a/demo/demo-springmvc/springmvc-client/pom.xml +++ b/demo/demo-springmvc/springmvc-client/pom.xml
@@ -42,24 +42,88 @@ <demo.service.name>springmvc-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-zeroconfig-registry/demo-zeroconfig-registry-tests/pom.xml b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/pom.xml index 47d2859..d82db63 100644 --- a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/pom.xml +++ b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-tests/pom.xml
@@ -151,21 +151,6 @@ <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <argLine>${jacoco.failsafe.argLine}</argLine> - </configuration> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </profile>
diff --git a/demo/docker-run-config-edge/pom.xml b/demo/docker-run-config-edge/pom.xml deleted file mode 100644 index 942ba68..0000000 --- a/demo/docker-run-config-edge/pom.xml +++ /dev/null
@@ -1,268 +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-run-config-edge</artifactId> - <name>Java Chassis::Demo::Docker Run Config</name> - - <packaging>pom</packaging> - - <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>authentication:${project.version}</name> - <alias>authentication</alias> - <run> - <env> - <JAVA_OPTS> - -Dservicecomb.registry.sc.address=http://sc.servicecomb.io:30100 - </JAVA_OPTS> - <JAR_PATH>/maven/maven/authentication-${project.version}.jar</JAR_PATH> - </env> - <links> - <link>service-center:sc.servicecomb.io</link> - </links> - <wait> - <log>ServiceComb is ready</log> - <tcp> - <ports> - <port>7070</port> - </ports> - </tcp> - <time>120000</time> - </wait> - <ports> - <port>7070:7070</port> - </ports> - <dependsOn> - <container>service-center</container> - </dependsOn> - </run> - </image> - <image> - <name>business-1-0-0:${project.version}</name> - <alias>business-1-0-0</alias> - <run> - <env> - <JAVA_OPTS> - -Dservicecomb.registry.sc.address=http://sc.servicecomb.io:30100 - </JAVA_OPTS> - <JAR_PATH>/maven/maven/business-1-0-0-${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>8080:8080</port> - </ports> - <dependsOn> - <container>service-center</container> - </dependsOn> - </run> - </image> - <image> - <name>business-1-1-0:${project.version}</name> - <alias>business-1-1-0</alias> - <run> - <env> - <JAVA_OPTS> - -Dservicecomb.registry.sc.address=http://sc.servicecomb.io:30100 - </JAVA_OPTS> - <JAR_PATH>/maven/maven/business-1-1-0-${project.version}.jar</JAR_PATH> - </env> - <links> - <link>service-center:sc.servicecomb.io</link> - </links> - <wait> - <log>ServiceComb is ready</log> - <tcp> - <ports> - <port>8090</port> - </ports> - </tcp> - <time>120000</time> - </wait> - <ports> - <port>8090:8090</port> - </ports> - <dependsOn> - <container>service-center</container> - </dependsOn> - </run> - </image> - <image> - <name>business-2-0-0:${project.version}</name> - <alias>business-2-0-0</alias> - <run> - <env> - <JAVA_OPTS> - -Dservicecomb.registry.sc.address=http://sc.servicecomb.io:30100 - </JAVA_OPTS> - <JAR_PATH>/maven/maven/business-2-0-0-${project.version}.jar</JAR_PATH> - </env> - <links> - <link>service-center:sc.servicecomb.io</link> - </links> - <wait> - <log>Register microservice instance success</log> - <tcp> - <ports> - <port>8091</port> - </ports> - </tcp> - <time>120000</time> - </wait> - <ports> - <port>8091:8091</port> - </ports> - <dependsOn> - <container>service-center</container> - </dependsOn> - </run> - </image> - <image> - <name>edge-service:${project.version}</name> - <alias>edge-service</alias> - <run> - <env> - <JAVA_OPTS> - -Dservicecomb.registry.sc.address=http://sc.servicecomb.io:30100 - </JAVA_OPTS> - <JAR_PATH>/maven/maven/edge-service-${project.version}.jar</JAR_PATH> - </env> - <links> - <link>service-center:sc.servicecomb.io</link> - </links> - <wait> - <log>Register microservice instance success</log> - <!-- - the log waiting of the plugin has a bug and fails frequently - refer to https://github.com/fabric8io/docker-maven-plugin/issues/767 - this http checking is used as a temporary solution - --> - <tcp> - <ports> - <port>18090</port> - </ports> - </tcp> - <time>120000</time> - </wait> - <ports> - <port>18090:18090</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> - </build> - - <profiles> - <profile> - <id>docker</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <argLine>${jacoco.failsafe.argLine}</argLine> - </configuration> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>docker-machine</id> - <build> - <plugins> - </plugins> - </build> - </profile> - </profiles> -</project>
diff --git a/demo/docker-run-config-local/pom.xml b/demo/docker-run-config-local/pom.xml deleted file mode 100644 index 35a23d5..0000000 --- a/demo/docker-run-config-local/pom.xml +++ /dev/null
@@ -1,116 +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-run-config-local</artifactId> - <name>Java Chassis::Demo::Docker Run Config Local</name> - - <packaging>pom</packaging> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <configuration> - <images> - <image> - <name>${demo.service.name}:${project.version}</name> - <alias>${demo.service.name}</alias> - <run> - <env> - <JAR_PATH>/maven/maven/${demo.service.name}-${project.version}.jar</JAR_PATH> - </env> - <wait> - <log>ServiceComb is ready</log> - <tcp> - <ports> - <port>8080</port> - </ports> - </tcp> - <time>120000</time> - </wait> - <ports> - <port>8080:8080</port> - </ports> - </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> - </build> - - <profiles> - <profile> - <id>docker</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <argLine>${jacoco.failsafe.argLine}</argLine> - </configuration> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>docker-machine</id> - <build> - <plugins> - </plugins> - </build> - </profile> - </profiles> -</project>
diff --git a/demo/docker-run-config/pom.xml b/demo/docker-run-config/pom.xml deleted file mode 100644 index 547f8f4..0000000 --- a/demo/docker-run-config/pom.xml +++ /dev/null
@@ -1,144 +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-run-config</artifactId> - <name>Java Chassis::Demo::Docker Run Config</name> - - <packaging>pom</packaging> - - <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> - </build> - - <profiles> - <profile> - <id>docker</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <argLine>${jacoco.failsafe.argLine}</argLine> - </configuration> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>docker-machine</id> - <build> - <plugins> - </plugins> - </build> - </profile> - </profiles> -</project>
diff --git a/demo/pom.xml b/demo/pom.xml index 172e422..d21bb83 100644 --- a/demo/pom.xml +++ b/demo/pom.xml
@@ -35,9 +35,6 @@ <packaging>pom</packaging> <modules> - <module>docker-run-config</module> - <module>docker-run-config-edge</module> - <module>docker-run-config-local</module> <module>demo-schema</module> <module>demo-pojo</module> <module>demo-filter</module> @@ -142,12 +139,6 @@ <pluginManagement> <plugins> <plugin> - <groupId>com.github.odavid.maven.plugins</groupId> - <artifactId>mixin-maven-plugin</artifactId> - <version>0.1-alpha-40</version> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.commonjava.maven.plugins</groupId> <artifactId>directory-maven-plugin</artifactId> <version>1.0</version> @@ -212,4 +203,30 @@ </plugin> </plugins> </build> + + <profiles> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>${maven-failsafe-plugin.version}</version> + <configuration> + <argLine>${jacoco.failsafe.argLine}</argLine> + </configuration> + <executions> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>
diff --git a/pom.xml b/pom.xml index 5234b38..ce5e6b4 100644 --- a/pom.xml +++ b/pom.xml
@@ -316,11 +316,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <version>${maven-failsafe-plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <version>${maven-jar-plugin.version}</version> <configuration>