Skip to content

Commit 6b34423

Browse files
slachiewiczslachiewicz
committed
Bump org.apache.maven.plugins:maven-plugins from 45 to 46
Bumps [org.apache.maven.plugins:maven-plugins](https://github.com/apache/maven-parent) from 45 to 46. - [Release notes](https://github.com/apache/maven-parent/releases) - [Commits](https://github.com/apache/maven-parent/commits)
1 parent aaeb9c6 commit 6b34423

5 files changed

Lines changed: 28 additions & 14 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ under the License.
2323
<parent>
2424
<groupId>org.apache.maven.plugins</groupId>
2525
<artifactId>maven-plugins</artifactId>
26-
<version>45</version>
26+
<version>46</version>
2727
<relativePath />
2828
</parent>
2929

‎src/it/multirelease-patterns/multiproject/multirelease-base/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
-->
2020
<project xmlns="http://maven.apache.org/POM/4.0.0"
2121
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
22+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
2323
http://maven.apache.org/xsd/maven-4.0.0.xsd">
2424
<modelVersion>4.0.0</modelVersion>
2525

@@ -49,8 +49,7 @@
4949
<groupId>org.apache.maven.plugins</groupId>
5050
<artifactId>maven-compiler-plugin</artifactId>
5151
<configuration>
52-
<source>1.8</source>
53-
<target>1.8</target>
52+
<release>${base.java.version}</release>
5453
</configuration>
5554
</plugin>
5655
</plugins>

‎src/it/multirelease-patterns/multiproject/pom.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
~ under the License.
1919
-->
2020
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
2222
http://maven.apache.org/xsd/maven-4.0.0.xsd">
2323
<modelVersion>4.0.0</modelVersion>
2424

@@ -34,6 +34,9 @@
3434
<groupId>org.apache.maven.plugins</groupId>
3535
<artifactId>maven-compiler-plugin</artifactId>
3636
<version>@project.version@</version>
37+
<configuration>
38+
<release>${base.java.version}</release>
39+
</configuration>
3740
</plugin>
3841
<plugin>
3942
<groupId>org.apache.maven.plugins</groupId>

‎src/it/multirelease-patterns/packaging-plugin/pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
~ under the License.
1919
-->
2020
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
2222
http://maven.apache.org/xsd/maven-4.0.0.xsd">
2323
<modelVersion>4.0.0</modelVersion>
2424
<groupId>multirelease</groupId>
@@ -30,6 +30,11 @@
3030
<build>
3131
<pluginManagement>
3232
<plugins>
33+
<plugin>
34+
<groupId>org.apache.maven.plugins</groupId>
35+
<artifactId>maven-compiler-plugin</artifactId>
36+
<version>@project.version@</version>
37+
</plugin>
3338
<plugin>
3439
<groupId>org.apache.maven.plugins</groupId>
3540
<artifactId>maven-resources-plugin</artifactId>
@@ -74,7 +79,7 @@
7479
<configuration>
7580
<includes>
7681
<include>**/*Test.java</include>
77-
</includes>
82+
</includes>
7883
</configuration>
7984
</plugin>
8085
</plugins>

‎src/it/multirelease-patterns/singleproject-toolchains/pom.xml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
~ under the License.
1919
-->
2020
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
2222
http://maven.apache.org/xsd/maven-4.0.0.xsd">
2323
<modelVersion>4.0.0</modelVersion>
2424

@@ -31,13 +31,22 @@
3131
<properties>
3232
<!-- The oldest Java version supported by this tool. -->
3333
<!-- Will control compilation of the main code and the unit tests. -->
34-
<base.java.version>1.8</base.java.version>
34+
<base.java.version>8</base.java.version>
3535

3636
<!-- set the property when running from the release plugin -->
3737
<arguments>-Dmulti_release=true</arguments>
3838
</properties>
3939

4040
<build>
41+
<pluginManagement>
42+
<plugins>
43+
<plugin>
44+
<groupId>org.apache.maven.plugins</groupId>
45+
<artifactId>maven-compiler-plugin</artifactId>
46+
<version>@project.version@</version>
47+
</plugin>
48+
</plugins>
49+
</pluginManagement>
4150
<plugins>
4251

4352
<!-- Use toolchains to select the compilers -->
@@ -65,10 +74,8 @@
6574
<plugin>
6675
<groupId>org.apache.maven.plugins</groupId>
6776
<artifactId>maven-compiler-plugin</artifactId>
68-
<version>@project.version@</version>
6977
<configuration>
70-
<source>${base.java.version}</source>
71-
<target>${base.java.version}</target>
78+
<release>${base.java.version}</release>
7279
</configuration>
7380
<executions>
7481
<!-- for Java 9 -->
@@ -126,7 +133,7 @@
126133
<configuration>
127134
<includes>
128135
<include>**/*Test.java</include>
129-
</includes>
136+
</includes>
130137
</configuration>
131138
</plugin>
132139
</plugins>
@@ -140,7 +147,7 @@
140147
<scope>test</scope>
141148
</dependency>
142149
</dependencies>
143-
150+
144151
<profiles>
145152

146153
<!-- enable java9 compilation -->

0 commit comments

Comments
 (0)