Skip to content

Commit a50585b

Browse files
GodinGodin
authored
Upgrade maven-plugin-plugin to 3.6.4 (#1604)
1 parent fd63cc5 commit a50585b

1 file changed

Lines changed: 21 additions & 80 deletions

File tree

‎org.jacoco.build/pom.xml‎

Lines changed: 21 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -361,15 +361,7 @@
361361
<plugin>
362362
<groupId>org.apache.maven.plugins</groupId>
363363
<artifactId>maven-plugin-plugin</artifactId>
364-
<version>3.6.0</version>
365-
<dependencies>
366-
<dependency>
367-
<!-- Workaround to be able to compile into Java 13 bytecode -->
368-
<groupId>org.ow2.asm</groupId>
369-
<artifactId>asm</artifactId>
370-
<version>7.1</version>
371-
</dependency>
372-
</dependencies>
364+
<version>3.6.4</version>
373365
</plugin>
374366
<plugin>
375367
<groupId>org.apache.maven.plugins</groupId>
@@ -794,67 +786,16 @@
794786
</profile>
795787

796788
<!--
797-
Following profiles enable compilation into bytecode version 13
798-
when requested "bytecode.version" greater than 13,
799-
because this is maximum that can be processed by maven-plugin-plugin.
789+
Following profiles enable compilation into bytecode version 17
790+
when requested "bytecode.version" greater than 17. This is needed even though
791+
maven-shade-plugin 3.5.0 can process bytecode up to version 19
792+
and maven-plugin-plugin 3.6.4 can process bytecode up to version 18,
793+
because we use JDK 17 to launch Maven while compiling by more recent JDKs
794+
and unfortunately maven-plugin-plugin loads project classes using the same JDK that is used for Maven
795+
(see https://github.com/apache/maven-plugin-tools/blob/maven-plugin-tools-3.6.4/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java#L661-L720)
796+
and maven-invoker-plugin for forked Maven invocations uses the same JDK that is used for Maven.
800797
This is overridden for tests.
801798
-->
802-
<profile>
803-
<id>java14-bytecode</id>
804-
<activation>
805-
<property>
806-
<name>bytecode.version</name>
807-
<value>14</value>
808-
</property>
809-
</activation>
810-
<properties>
811-
<maven.compiler.source>13</maven.compiler.source>
812-
<maven.compiler.target>13</maven.compiler.target>
813-
</properties>
814-
</profile>
815-
816-
<profile>
817-
<id>java15-bytecode</id>
818-
<activation>
819-
<property>
820-
<name>bytecode.version</name>
821-
<value>15</value>
822-
</property>
823-
</activation>
824-
<properties>
825-
<maven.compiler.source>13</maven.compiler.source>
826-
<maven.compiler.target>13</maven.compiler.target>
827-
</properties>
828-
</profile>
829-
830-
<profile>
831-
<id>java16-bytecode</id>
832-
<activation>
833-
<property>
834-
<name>bytecode.version</name>
835-
<value>16</value>
836-
</property>
837-
</activation>
838-
<properties>
839-
<maven.compiler.source>13</maven.compiler.source>
840-
<maven.compiler.target>13</maven.compiler.target>
841-
</properties>
842-
</profile>
843-
844-
<profile>
845-
<id>java17-bytecode</id>
846-
<activation>
847-
<property>
848-
<name>bytecode.version</name>
849-
<value>17</value>
850-
</property>
851-
</activation>
852-
<properties>
853-
<maven.compiler.source>13</maven.compiler.source>
854-
<maven.compiler.target>13</maven.compiler.target>
855-
</properties>
856-
</profile>
857-
858799
<profile>
859800
<id>java18-bytecode</id>
860801
<activation>
@@ -864,8 +805,8 @@
864805
</property>
865806
</activation>
866807
<properties>
867-
<maven.compiler.source>13</maven.compiler.source>
868-
<maven.compiler.target>13</maven.compiler.target>
808+
<maven.compiler.source>17</maven.compiler.source>
809+
<maven.compiler.target>17</maven.compiler.target>
869810
</properties>
870811
</profile>
871812

@@ -878,8 +819,8 @@
878819
</property>
879820
</activation>
880821
<properties>
881-
<maven.compiler.source>13</maven.compiler.source>
882-
<maven.compiler.target>13</maven.compiler.target>
822+
<maven.compiler.source>17</maven.compiler.source>
823+
<maven.compiler.target>17</maven.compiler.target>
883824
</properties>
884825
</profile>
885826

@@ -892,8 +833,8 @@
892833
</property>
893834
</activation>
894835
<properties>
895-
<maven.compiler.source>13</maven.compiler.source>
896-
<maven.compiler.target>13</maven.compiler.target>
836+
<maven.compiler.source>17</maven.compiler.source>
837+
<maven.compiler.target>17</maven.compiler.target>
897838
</properties>
898839
</profile>
899840

@@ -906,8 +847,8 @@
906847
</property>
907848
</activation>
908849
<properties>
909-
<maven.compiler.source>13</maven.compiler.source>
910-
<maven.compiler.target>13</maven.compiler.target>
850+
<maven.compiler.source>17</maven.compiler.source>
851+
<maven.compiler.target>17</maven.compiler.target>
911852
</properties>
912853
</profile>
913854

@@ -920,8 +861,8 @@
920861
</property>
921862
</activation>
922863
<properties>
923-
<maven.compiler.source>13</maven.compiler.source>
924-
<maven.compiler.target>13</maven.compiler.target>
864+
<maven.compiler.source>17</maven.compiler.source>
865+
<maven.compiler.target>17</maven.compiler.target>
925866
</properties>
926867
</profile>
927868

@@ -934,8 +875,8 @@
934875
</property>
935876
</activation>
936877
<properties>
937-
<maven.compiler.source>13</maven.compiler.source>
938-
<maven.compiler.target>13</maven.compiler.target>
878+
<maven.compiler.source>17</maven.compiler.source>
879+
<maven.compiler.target>17</maven.compiler.target>
939880
</properties>
940881
</profile>
941882

0 commit comments

Comments
 (0)