Skip to content

Commit e4bd023

Browse files
authored
Merge pull request #157 from maxmind/greg/fix-exec-windows
Upgrade exec-maven-plugin
2 parents 05c9051 + 99fc67c commit e4bd023

File tree

1 file changed

+28
-32
lines changed

1 file changed

+28
-32
lines changed

pom.xml

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
<artifactId>maven-compiler-plugin</artifactId>
148148
<version>3.12.1</version>
149149
<configuration>
150+
<release>11</release>
150151
<source>11</source>
151152
<target>11</target>
152153
</configuration>
@@ -156,33 +157,6 @@
156157
<artifactId>maven-surefire-plugin</artifactId>
157158
<version>3.2.5</version>
158159
</plugin>
159-
<plugin>
160-
<!--
161-
We need this for updating the submodule during release. Maven SCM
162-
doesn't support this itself apparently. See
163-
https://github.com/apache/maven-scm/pull/179
164-
-->
165-
<groupId>org.codehaus.mojo</groupId>
166-
<artifactId>exec-maven-plugin</artifactId>
167-
<!--
168-
We are using 3.0.0 as 3.1.1 fails due to this issue:
169-
https://github.com/mojohaus/exec-maven-plugin/issues/373
170-
-->
171-
<version>3.0.0</version>
172-
<executions>
173-
<execution>
174-
<phase>initialize</phase>
175-
<id>invoke build</id>
176-
<goals>
177-
<goal>exec</goal>
178-
</goals>
179-
</execution>
180-
</executions>
181-
<configuration>
182-
<executable>git</executable>
183-
<commandlineArgs>submodule update --init --recursive</commandlineArgs>
184-
</configuration>
185-
</plugin>
186160
<plugin>
187161
<groupId>org.codehaus.mojo</groupId>
188162
<artifactId>versions-maven-plugin</artifactId>
@@ -215,17 +189,39 @@
215189
</properties>
216190
<profiles>
217191
<profile>
218-
<id>active-on-jdk-9-plus</id>
192+
<id>not-windows</id>
193+
<!--
194+
Starting with 3.1.0, this fails on Windows. Given that we only
195+
technically need this when release and we don't release on Windows,
196+
we can just disable it on Widnows. See this issue:
197+
https://github.com/mojohaus/exec-maven-plugin/issues/373
198+
-->
219199
<activation>
220-
<jdk>[9,)</jdk>
200+
<os><family>!Windows</family></os>
221201
</activation>
222202
<build>
223203
<plugins>
224204
<plugin>
225-
<artifactId>maven-compiler-plugin</artifactId>
226-
<version>3.12.1</version>
205+
<!--
206+
We need this for updating the submodule during release. Maven SCM
207+
doesn't support this itself apparently. See
208+
https://github.com/apache/maven-scm/pull/179
209+
-->
210+
<groupId>org.codehaus.mojo</groupId>
211+
<artifactId>exec-maven-plugin</artifactId>
212+
<version>3.2.0</version>
213+
<executions>
214+
<execution>
215+
<phase>initialize</phase>
216+
<id>invoke build</id>
217+
<goals>
218+
<goal>exec</goal>
219+
</goals>
220+
</execution>
221+
</executions>
227222
<configuration>
228-
<release>11</release>
223+
<executable>git</executable>
224+
<commandlineArgs>submodule update --init --recursive</commandlineArgs>
229225
</configuration>
230226
</plugin>
231227
</plugins>

0 commit comments

Comments
 (0)