Skip to content

Commit

Permalink
(WIP) Upgrade maven-plugin-plugin to 3.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Godin committed Feb 16, 2024
1 parent 971af84 commit e38c608
Show file tree
Hide file tree
Showing 6 changed files with 238 additions and 204 deletions.
33 changes: 22 additions & 11 deletions jacoco-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,26 +113,37 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<!-- TODO NOTE starting from 3.6.1 produces HelpMojo that requires Java 7 - see https://issues.apache.org/jira/browse/MPLUGIN-353 -->
<!-- TODO
starting from 3.7.0 report is deprecated, moved into separate plugin - https://issues.apache.org/jira/browse/MPLUGIN-423
starting from 3.9.0 report is removed - https://issues.apache.org/jira/browse/MPLUGIN-467
??? throws NPE starting from 3.10.1 - https://issues.apache.org/jira/browse/MPLUGIN-442
-->
<!-- TODO also check
https://issues.apache.org/jira/browse/MPLUGIN-379
https://issues.apache.org/jira/browse/MPLUGIN-477
-->
<!-- TODO NOTE maven-shade-plugin 3.5.0 can process bytecode only up to version 19 -->
<executions>
<execution>
<id>default-descriptor</id>
<phase>process-classes</phase>
</execution>
<execution>
<id>help-goal</id>
<goals>
<goal>helpmojo</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>package</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<!-- FIXME remove - works only for site -->
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-report-plugin</artifactId>
<version>3.8.2</version>
</plugin>
</plugins>
</reporting>
</project>
16 changes: 4 additions & 12 deletions org.jacoco.build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -365,15 +365,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.6.0</version>
<dependencies>
<dependency>
<!-- Workaround to be able to compile into Java 13 bytecode -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>7.1</version>
</dependency>
</dependencies>
<version>3.8.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -414,7 +406,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<version>4.0.0-M12</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -797,10 +789,10 @@
</build>
</profile>

<!--
<!-- TODO
Following profiles enable compilation into bytecode version 13
when requested "bytecode.version" greater than 13,
because this is maximum that can be processed by maven-plugin-plugin.
because this is maximum that can be processed by
This is overridden for tests.
-->
<profile>
Expand Down
25 changes: 17 additions & 8 deletions org.jacoco.doc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@
</dependencySourceIncludes>
<dependencySourceExcludes>
<dependencySourceExclude>org.jacoco:*.test</dependencySourceExclude>
<!-- TODO -->
<dependencySourceExclude>org.jacoco:jacoco-maven-plugin</dependencySourceExclude>
</dependencySourceExcludes>
<doctitle>JaCoCo ${qualified.bundle.version} API</doctitle>
<windowtitle>JaCoCo ${qualified.bundle.version} API</windowtitle>
Expand Down Expand Up @@ -240,6 +242,14 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
<dependencies>
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon</artifactId>
<!-- TODO newer version? -->
<version>8.7</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>transform-generated-doc</id>
Expand All @@ -249,17 +259,16 @@
<configuration>
<transformationSets>
<transformationSet>
<dir>../jacoco-maven-plugin/target/generated-site/xdoc</dir>
<dir>../jacoco-maven-plugin/target</dir>
<includes>
<include>*.xml</include>
<include>plugin-enhanced.xml</include>
</includes>
<stylesheet>xsl/maven-goal.xsl</stylesheet>
<fileMappers>
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
<targetExtension>.html</targetExtension>
</fileMapper>
</fileMappers>
<stylesheet>xsl/maven-plugin.xsl</stylesheet>
<parameters>
<parameter>
<name>outdir</name>
<value>${project.build.directory}/generated-resources/xml/xslt</value>
</parameter>
<parameter>
<name>qualified.bundle.version</name>
<value>${qualified.bundle.version}</value>
Expand Down
2 changes: 1 addition & 1 deletion org.jacoco.doc/xsl/cli.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xdoc">
xmlns="http://www.w3.org/1999/xhtml">

<xsl:output method="xml" indent="yes" encoding="UTF-8"
doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" />
Expand Down
172 changes: 0 additions & 172 deletions org.jacoco.doc/xsl/maven-goal.xsl

This file was deleted.

Loading

0 comments on commit e38c608

Please sign in to comment.