Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Maven 3.9.2 should not produce warnings for jacoco-maven-plugin #1468

Merged
merged 1 commit into from
May 26, 2023
Merged

Maven 3.9.2 should not produce warnings for jacoco-maven-plugin #1468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion jacoco-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>file-management</artifactId>
<version>1.2.1</version>
<version>3.1.0</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jacoco-maven-plugin/src/org/jacoco/maven/MergeMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private void executeMerge() throws MojoExecutionException {

private void load(final ExecFileLoader loader)
throws MojoExecutionException {
final FileSetManager fileSetManager = new FileSetManager(getLog());
final FileSetManager fileSetManager = new FileSetManager();
for (final FileSet fileSet : fileSets) {
for (final String includedFilename : fileSetManager
.getIncludedFiles(fileSet)) {
Expand Down
5 changes: 4 additions & 1 deletion org.jacoco.doc/docroot/doc/changes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@ <h2>Snapshot Build @qualified.bundle.version@ (@build.date@)</h2>

<h3>New Features</h3>
<ul>
<li>Maven 3.9.2 should not produce warnings for jacoco-maven-plugin
(GitHub <a href="https://github.com/jacoco/jacoco/issues/1468">#1468</a>).</li>
<li>jacoco-maven-plugin now requires at least Java 8
(GitHub <a href="https://github.com/jacoco/jacoco/issues/1466">#1466</a>).</li>
(GitHub <a href="https://github.com/jacoco/jacoco/issues/1466">#1466</a>,
<a href="https://github.com/jacoco/jacoco/issues/1468">#1468</a>).</li>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it intentional that the PR is listed twice? If so maybe the commit message should be extended to explain the dependency on Java 8.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marchof Yes - it is intentional in order to express the link between these changes in the changelog.
I updated the commit message.

</ul>

<h3>Fixed bugs</h3>
Expand Down