Skip to content

Commit 7e06055

Browse files
zrlwzrlw
authored
Add os-maven-plugin to the maven extensions of the modules which need OS type detection (#15540)
1 parent 0da04e1 commit 7e06055

4 files changed

Lines changed: 61 additions & 1 deletion

File tree

  • dubbo-demo/dubbo-demo-spring-boot-idl
  • dubbo-plugin/dubbo-security
  • dubbo-remoting/dubbo-remoting-http3
  • dubbo-rpc/dubbo-rpc-triple

‎dubbo-demo/dubbo-demo-spring-boot-idl/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
<build>
9191
<plugins>
9292
<plugin>
93+
<!-- add os-maven-plugin to plugins just for Eclipse m2e, not for `mvn install` -->
9394
<groupId>kr.motd.maven</groupId>
9495
<artifactId>os-maven-plugin</artifactId>
9596
<version>${maven_os_plugin_version}</version>
@@ -112,5 +113,13 @@
112113
</configuration>
113114
</plugin>
114115
</plugins>
116+
<extensions>
117+
<!-- add os-maven-plugin to extensions for `mvn install` -->
118+
<extension>
119+
<groupId>kr.motd.maven</groupId>
120+
<artifactId>os-maven-plugin</artifactId>
121+
<version>${maven_os_plugin_version}</version>
122+
</extension>
123+
</extensions>
115124
</build>
116125
</project>

‎dubbo-plugin/dubbo-security/pom.xml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,27 @@
124124
<skip>true</skip>
125125
</configuration>
126126
</plugin>
127+
<!-- add os-maven-plugin to plugins just for Eclipse m2e, not for `mvn install` -->
128+
<plugin>
129+
<groupId>kr.motd.maven</groupId>
130+
<artifactId>os-maven-plugin</artifactId>
131+
<version>${maven_os_plugin_version}</version>
132+
<executions>
133+
<execution>
134+
<goals>
135+
<goal>detect</goal>
136+
</goals>
137+
<phase>initialize</phase>
138+
</execution>
139+
</executions>
140+
</plugin>
127141
</plugins>
128142
<extensions>
143+
<!-- add os-maven-plugin to extensions for `mvn install` -->
129144
<extension>
130145
<groupId>kr.motd.maven</groupId>
131146
<artifactId>os-maven-plugin</artifactId>
132-
<version>1.7.1</version>
147+
<version>${maven_os_plugin_version}</version>
133148
</extension>
134149
</extensions>
135150
</build>

‎dubbo-remoting/dubbo-remoting-http3/pom.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,31 @@
5353
<scope>test</scope>
5454
</dependency>
5555
</dependencies>
56+
57+
<build>
58+
<plugins>
59+
<!-- add os-maven-plugin to plugins just for Eclipse m2e, not for `mvn install` -->
60+
<plugin>
61+
<groupId>kr.motd.maven</groupId>
62+
<artifactId>os-maven-plugin</artifactId>
63+
<version>${maven_os_plugin_version}</version>
64+
<executions>
65+
<execution>
66+
<goals>
67+
<goal>detect</goal>
68+
</goals>
69+
<phase>initialize</phase>
70+
</execution>
71+
</executions>
72+
</plugin>
73+
</plugins>
74+
<extensions>
75+
<!-- add os-maven-plugin to extensions for `mvn install` -->
76+
<extension>
77+
<groupId>kr.motd.maven</groupId>
78+
<artifactId>os-maven-plugin</artifactId>
79+
<version>${maven_os_plugin_version}</version>
80+
</extension>
81+
</extensions>
82+
</build>
5683
</project>

‎dubbo-rpc/dubbo-rpc-triple/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
</dependencies>
133133
<build>
134134
<plugins>
135+
<!-- add os-maven-plugin to plugins just for Eclipse m2e, not for `mvn install` -->
135136
<plugin>
136137
<groupId>kr.motd.maven</groupId>
137138
<artifactId>os-maven-plugin</artifactId>
@@ -193,5 +194,13 @@
193194
</executions>
194195
</plugin>
195196
</plugins>
197+
<extensions>
198+
<!-- add os-maven-plugin to extensions for `mvn install` -->
199+
<extension>
200+
<groupId>kr.motd.maven</groupId>
201+
<artifactId>os-maven-plugin</artifactId>
202+
<version>${maven_os_plugin_version}</version>
203+
</extension>
204+
</extensions>
196205
</build>
197206
</project>

0 commit comments

Comments
 (0)