Skip to content

Commit ecee95e

Browse files
liubao68liubao68
authored
[#4690]replace not maintained mixin-maven-plugin (#4713)
1 parent 63135ba commit ecee95e

File tree

17 files changed

+617
-679
lines changed
  • .github/workflows
  • demo
    • demo-consul/test-client/src/test/java/org/apache/servicecomb/samples
    • demo-jaxrs/jaxrs-client
    • demo-local-registry/demo-local-registry-client
    • demo-multi-registries/demo-multi-registries-client
    • demo-multi-service-center/demo-multi-service-center-client
    • demo-multiple/multiple-client
    • demo-register-url-prefix/demo-register-url-prefix-client
    • demo-spring-boot-transport
      • demo-spring-boot-pojo-client
      • demo-spring-boot-springmvc-client
    • demo-springmvc/springmvc-client
    • demo-zeroconfig-registry/demo-zeroconfig-registry-tests
    • docker-run-config-edge
    • docker-run-config-local
    • docker-run-config
    • pom.xml
  • pom.xml

17 files changed

+617
-679
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Set up Maven
4242
uses: stCarolas/setup-maven@v4.5
4343
with:
44-
maven-version: 3.8.4
44+
maven-version: 3.9.9
4545
- uses: actions/cache@v4
4646
with:
4747
path: ~/.m2/repository

demo/demo-consul/test-client/src/test/java/org/apache/servicecomb/samples/ConsulT.java renamed to demo/demo-consul/test-client/src/test/java/org/apache/servicecomb/samples/ConsulIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
@ExtendWith(SpringExtension.class)
3131
@SpringBootTest(classes = TestClientApplication.class)
32-
public class ConsulT {
33-
private static final Logger LOGGER = LoggerFactory.getLogger(ConsulT.class);
32+
public class ConsulIT {
33+
private static final Logger LOGGER = LoggerFactory.getLogger(ConsulIT.class);
3434

3535
@BeforeEach
3636
public void setUp() {

‎demo/demo-jaxrs/jaxrs-client/pom.xml‎

Lines changed: 77 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,24 +45,88 @@
4545
<demo.service.name>jaxrs-server</demo.service.name>
4646
</properties>
4747
<build>
48+
<pluginManagement>
49+
<plugins>
50+
<plugin>
51+
<groupId>io.fabric8</groupId>
52+
<artifactId>docker-maven-plugin</artifactId>
53+
<configuration>
54+
<images>
55+
<image>
56+
<name>servicecomb/service-center</name>
57+
<alias>service-center</alias>
58+
<run>
59+
<wait>
60+
<log>server is ready</log>
61+
<tcp>
62+
<ports>
63+
<port>30100</port>
64+
</ports>
65+
</tcp>
66+
<time>60000</time>
67+
</wait>
68+
<ports>
69+
<port>30100:30100</port>
70+
</ports>
71+
</run>
72+
</image>
73+
<image>
74+
<name>${demo.service.name}:${project.version}</name>
75+
<alias>${demo.service.name}</alias>
76+
<run>
77+
<env>
78+
<JAVA_OPTS>
79+
-Dservicecomb.registry.sc.address=http://sc.servicecomb.io:30100
80+
</JAVA_OPTS>
81+
<JAR_PATH>/maven/maven/${demo.service.name}-${project.version}.jar</JAR_PATH>
82+
</env>
83+
<links>
84+
<link>service-center:sc.servicecomb.io</link>
85+
</links>
86+
<wait>
87+
<log>ServiceComb is ready</log>
88+
<tcp>
89+
<ports>
90+
<port>8080</port>
91+
</ports>
92+
</tcp>
93+
<time>120000</time>
94+
</wait>
95+
<ports>
96+
<port>7070:7070</port>
97+
<port>8080:8080</port>
98+
</ports>
99+
<dependsOn>
100+
<container>service-center</container>
101+
</dependsOn>
102+
</run>
103+
</image>
104+
</images>
105+
</configuration>
106+
<executions>
107+
<execution>
108+
<id>start</id>
109+
<phase>pre-integration-test</phase>
110+
<goals>
111+
<goal>start</goal>
112+
</goals>
113+
</execution>
114+
<execution>
115+
<id>stop</id>
116+
<phase>post-integration-test</phase>
117+
<goals>
118+
<goal>stop</goal>
119+
</goals>
120+
</execution>
121+
</executions>
122+
</plugin>
123+
</plugins>
124+
</pluginManagement>
48125
<plugins>
49126
<plugin>
50127
<groupId>io.fabric8</groupId>
51128
<artifactId>docker-maven-plugin</artifactId>
52129
</plugin>
53-
<plugin>
54-
<groupId>com.github.odavid.maven.plugins</groupId>
55-
<artifactId>mixin-maven-plugin</artifactId>
56-
<configuration>
57-
<mixins>
58-
<mixin>
59-
<groupId>org.apache.servicecomb.demo</groupId>
60-
<artifactId>docker-run-config</artifactId>
61-
<version>${project.version}</version>
62-
</mixin>
63-
</mixins>
64-
</configuration>
65-
</plugin>
66130
</plugins>
67131
</build>
68132
</profile>

‎demo/demo-local-registry/demo-local-registry-client/pom.xml‎

Lines changed: 49 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,24 +45,60 @@
4545
<demo.service.name>demo-local-registry-server</demo.service.name>
4646
</properties>
4747
<build>
48+
<pluginManagement>
49+
<plugins>
50+
<plugin>
51+
<groupId>io.fabric8</groupId>
52+
<artifactId>docker-maven-plugin</artifactId>
53+
<configuration>
54+
<images>
55+
<image>
56+
<name>${demo.service.name}:${project.version}</name>
57+
<alias>${demo.service.name}</alias>
58+
<run>
59+
<env>
60+
<JAR_PATH>/maven/maven/${demo.service.name}-${project.version}.jar</JAR_PATH>
61+
</env>
62+
<wait>
63+
<log>ServiceComb is ready</log>
64+
<tcp>
65+
<ports>
66+
<port>8080</port>
67+
</ports>
68+
</tcp>
69+
<time>120000</time>
70+
</wait>
71+
<ports>
72+
<port>8080:8080</port>
73+
</ports>
74+
</run>
75+
</image>
76+
</images>
77+
</configuration>
78+
<executions>
79+
<execution>
80+
<id>start</id>
81+
<phase>pre-integration-test</phase>
82+
<goals>
83+
<goal>start</goal>
84+
</goals>
85+
</execution>
86+
<execution>
87+
<id>stop</id>
88+
<phase>post-integration-test</phase>
89+
<goals>
90+
<goal>stop</goal>
91+
</goals>
92+
</execution>
93+
</executions>
94+
</plugin>
95+
</plugins>
96+
</pluginManagement>
4897
<plugins>
4998
<plugin>
5099
<groupId>io.fabric8</groupId>
51100
<artifactId>docker-maven-plugin</artifactId>
52101
</plugin>
53-
<plugin>
54-
<groupId>com.github.odavid.maven.plugins</groupId>
55-
<artifactId>mixin-maven-plugin</artifactId>
56-
<configuration>
57-
<mixins>
58-
<mixin>
59-
<groupId>org.apache.servicecomb.demo</groupId>
60-
<artifactId>docker-run-config-local</artifactId>
61-
<version>${project.version}</version>
62-
</mixin>
63-
</mixins>
64-
</configuration>
65-
</plugin>
66102
</plugins>
67103
</build>
68104
</profile>

‎demo/demo-multi-registries/demo-multi-registries-client/pom.xml‎

Lines changed: 77 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,24 +45,88 @@
4545
<demo.service.name>demo-multi-registries-server</demo.service.name>
4646
</properties>
4747
<build>
48+
<pluginManagement>
49+
<plugins>
50+
<plugin>
51+
<groupId>io.fabric8</groupId>
52+
<artifactId>docker-maven-plugin</artifactId>
53+
<configuration>
54+
<images>
55+
<image>
56+
<name>servicecomb/service-center</name>
57+
<alias>service-center</alias>
58+
<run>
59+
<wait>
60+
<log>server is ready</log>
61+
<tcp>
62+
<ports>
63+
<port>30100</port>
64+
</ports>
65+
</tcp>
66+
<time>60000</time>
67+
</wait>
68+
<ports>
69+
<port>30100:30100</port>
70+
</ports>
71+
</run>
72+
</image>
73+
<image>
74+
<name>${demo.service.name}:${project.version}</name>
75+
<alias>${demo.service.name}</alias>
76+
<run>
77+
<env>
78+
<JAVA_OPTS>
79+
-Dservicecomb.registry.sc.address=http://sc.servicecomb.io:30100
80+
</JAVA_OPTS>
81+
<JAR_PATH>/maven/maven/${demo.service.name}-${project.version}.jar</JAR_PATH>
82+
</env>
83+
<links>
84+
<link>service-center:sc.servicecomb.io</link>
85+
</links>
86+
<wait>
87+
<log>ServiceComb is ready</log>
88+
<tcp>
89+
<ports>
90+
<port>8080</port>
91+
</ports>
92+
</tcp>
93+
<time>120000</time>
94+
</wait>
95+
<ports>
96+
<port>7070:7070</port>
97+
<port>8080:8080</port>
98+
</ports>
99+
<dependsOn>
100+
<container>service-center</container>
101+
</dependsOn>
102+
</run>
103+
</image>
104+
</images>
105+
</configuration>
106+
<executions>
107+
<execution>
108+
<id>start</id>
109+
<phase>pre-integration-test</phase>
110+
<goals>
111+
<goal>start</goal>
112+
</goals>
113+
</execution>
114+
<execution>
115+
<id>stop</id>
116+
<phase>post-integration-test</phase>
117+
<goals>
118+
<goal>stop</goal>
119+
</goals>
120+
</execution>
121+
</executions>
122+
</plugin>
123+
</plugins>
124+
</pluginManagement>
48125
<plugins>
49126
<plugin>
50127
<groupId>io.fabric8</groupId>
51128
<artifactId>docker-maven-plugin</artifactId>
52129
</plugin>
53-
<plugin>
54-
<groupId>com.github.odavid.maven.plugins</groupId>
55-
<artifactId>mixin-maven-plugin</artifactId>
56-
<configuration>
57-
<mixins>
58-
<mixin>
59-
<groupId>org.apache.servicecomb.demo</groupId>
60-
<artifactId>docker-run-config</artifactId>
61-
<version>${project.version}</version>
62-
</mixin>
63-
</mixins>
64-
</configuration>
65-
</plugin>
66130
</plugins>
67131
</build>
68132
</profile>

‎demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -177,21 +177,6 @@
177177
<groupId>io.fabric8</groupId>
178178
<artifactId>docker-maven-plugin</artifactId>
179179
</plugin>
180-
<plugin>
181-
<groupId>org.apache.maven.plugins</groupId>
182-
<artifactId>maven-failsafe-plugin</artifactId>
183-
<configuration>
184-
<argLine>${jacoco.failsafe.argLine}</argLine>
185-
</configuration>
186-
<executions>
187-
<execution>
188-
<goals>
189-
<goal>integration-test</goal>
190-
<goal>verify</goal>
191-
</goals>
192-
</execution>
193-
</executions>
194-
</plugin>
195180
</plugins>
196181
</build>
197182
</profile>

0 commit comments

Comments
 (0)