#3 Upgraded to latest upstream version 3.6.0
Merged 4 years ago by decathorpe. Opened 4 years ago by jhuttana.
rpms/ jhuttana/maven-plugin-tools master  into  master

@@ -1,68 +0,0 @@ 

- From 0ebe12503766c6a76c507498e9e7f0cb1c4469c2 Mon Sep 17 00:00:00 2001

- From: Michael Simacek <msimacek@redhat.com>

- Date: Mon, 16 Mar 2015 14:29:21 +0100

- Subject: [PATCH 1/3] Avoid duplicate MOJO parameters

- 

- ---

-  .../JavaAnnotationsMojoDescriptorExtractor.java    | 24 ++++++++++++++++++++--

-  1 file changed, 22 insertions(+), 2 deletions(-)

- 

- diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java

- index 587ddad..231ed12 100644

- --- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java

- +++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java

- @@ -29,6 +29,7 @@ import java.util.Collection;

-  import java.util.Collections;

-  import java.util.HashMap;

-  import java.util.HashSet;

- +import java.util.Iterator;

-  import java.util.List;

-  import java.util.Map;

-  import java.util.Set;

- @@ -573,7 +574,7 @@ public class JavaAnnotationsMojoDescriptorExtractor

-                  parameter.setSince( parameterAnnotationContent.getSince() );

-                  parameter.setRequired( parameterAnnotationContent.required() );

-  

- -                mojoDescriptor.addParameter( parameter );

- +                addParameter( mojoDescriptor, parameter );

-              }

-  

-              // Component annotations

- @@ -614,7 +615,7 @@ public class JavaAnnotationsMojoDescriptorExtractor

-                  //parameter.setRequired( ... );

-                  parameter.setEditable( false );

-  

- -                mojoDescriptor.addParameter( parameter );

- +                addParameter( mojoDescriptor, parameter );

-              }

-  

-              mojoDescriptor.setPluginDescriptor( pluginDescriptor );

- @@ -624,6 +625,25 @@ public class JavaAnnotationsMojoDescriptorExtractor

-          return mojoDescriptors;

-      }

-  

- +    private void addParameter( ExtendedMojoDescriptor mojoDescriptor,

- +                               org.apache.maven.plugin.descriptor.Parameter parameter )

- +        throws DuplicateParameterException

- +    {

- +        if ( mojoDescriptor.getParameters() != null )

- +        {

- +            for ( Iterator<?> it = mojoDescriptor.getParameters().iterator(); it.hasNext(); )

- +            {

- +                if ( it.next().equals( parameter ) )

- +                {

- +                    getLogger().warn( "Duplicate parameter " + parameter.getName() + " field in MOJO descriptor" );

- +                    it.remove();

- +                }

- +            }

- +        }

- +

- +        mojoDescriptor.addParameter( parameter );

- +    }

- +

-      protected ExecuteAnnotationContent findExecuteInParentHierarchy( MojoAnnotatedClass mojoAnnotatedClass,

-                                                                   Map<String, MojoAnnotatedClass> mojoAnnotatedClasses )

-      {

- -- 

- 2.14.3

- 

0001-Port-to-plexus-utils-3.0.24.patch 0003-Port-to-plexus-utils-3.0.24.patch
file renamed
file was moved with no change to the file
@@ -1,66 +0,0 @@ 

- From ea64c5b59f5f820a73ab3e82b6898762e55a8719 Mon Sep 17 00:00:00 2001

- From: Michael Simacek <msimacek@redhat.com>

- Date: Mon, 16 Mar 2015 16:42:20 +0100

- Subject: [PATCH 2/3] Deal with nulls from getComment

- 

- ---

-  .../annotations/JavaAnnotationsMojoDescriptorExtractor.java         | 6 +++---

-  .../extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java       | 4 ++--

-  2 files changed, 5 insertions(+), 5 deletions(-)

- 

- diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java

- index 231ed12..6ac677b 100644

- --- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java

- +++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java

- @@ -269,7 +269,7 @@ public class JavaAnnotationsMojoDescriptorExtractor

-              MojoAnnotationContent mojoAnnotationContent = entry.getValue().getMojo();

-              if ( mojoAnnotationContent != null )

-              {

- -                mojoAnnotationContent.setDescription( javaClass.getComment() );

- +                mojoAnnotationContent.setDescription( javaClass.getComment() != null ? javaClass.getComment() : "" );

-  

-                  DocletTag since = findInClassHierarchy( javaClass, "since" );

-                  if ( since != null )

- @@ -300,7 +300,7 @@ public class JavaAnnotationsMojoDescriptorExtractor

-                  }

-  

-                  ParameterAnnotationContent parameterAnnotationContent = parameter.getValue();

- -                parameterAnnotationContent.setDescription( javaField.getComment() );

- +                parameterAnnotationContent.setDescription( javaClass.getComment() != null ? javaClass.getComment() : "" );

-  

-                  DocletTag deprecated = javaField.getTagByName( "deprecated" );

-                  if ( deprecated != null )

- @@ -326,7 +326,7 @@ public class JavaAnnotationsMojoDescriptorExtractor

-                  }

-  

-                  ComponentAnnotationContent componentAnnotationContent = component.getValue();

- -                componentAnnotationContent.setDescription( javaField.getComment() );

- +                componentAnnotationContent.setDescription( javaClass.getComment() != null ? javaClass.getComment() : "" );

-  

-                  DocletTag deprecated = javaField.getTagByName( "deprecated" );

-                  if ( deprecated != null )

- diff --git a/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java b/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java

- index 137d90d..36b30dc 100644

- --- a/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java

- +++ b/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java

- @@ -115,7 +115,7 @@ public class JavaJavadocMojoDescriptorExtractor

-          ExtendedMojoDescriptor mojoDescriptor = new ExtendedMojoDescriptor();

-          mojoDescriptor.setLanguage( "java" );

-          mojoDescriptor.setImplementation( javaClass.getFullyQualifiedName() );

- -        mojoDescriptor.setDescription( javaClass.getComment() );

- +        mojoDescriptor.setDescription( javaClass.getComment() != null ? javaClass.getComment() : "" );

-  

-          // ----------------------------------------------------------------------

-          // Mojo annotations in alphabetical order

- @@ -392,7 +392,7 @@ public class JavaJavadocMojoDescriptorExtractor

-  

-              pd.setType( type.getFullyQualifiedName() );

-  

- -            pd.setDescription( field.getComment() );

- +            pd.setDescription( javaClass.getComment() != null ? javaClass.getComment() : "" );

-  

-              DocletTag deprecationTag = field.getTagByName( JavadocMojoAnnotation.DEPRECATED );

-  

- -- 

- 2.14.3

- 

file modified
+11 -66
@@ -1,20 +1,17 @@ 

  Name:           maven-plugin-tools

- Version:        3.5.1

- Release:        7%{?dist}

+ Version:        3.6.0

+ Release:        1%{?dist}

  Epoch:          0

  Summary:        Maven Plugin Tools

  License:        ASL 2.0

  URL:            http://maven.apache.org/plugin-tools/

  BuildArch:      noarch

  

- Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip

+ Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip

  

- Patch0:         0001-Avoid-duplicate-MOJO-parameters.patch

- Patch1:         0002-Deal-with-nulls-from-getComment.patch

- Patch2:         0003-Port-to-plexus-utils-3.0.24.patch

+ Patch0:         0001-Port-to-plexus-utils-3.0.24.patch

  

  BuildRequires:  maven-local

- BuildRequires:  mvn(com.sun:tools)

  BuildRequires:  mvn(com.thoughtworks.qdox:qdox)

  BuildRequires:  mvn(net.sf.jtidy:jtidy)

  BuildRequires:  mvn(org.apache.ant:ant)
@@ -22,13 +19,11 @@ 

  BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)

  BuildRequires:  mvn(org.apache.maven.doxia:doxia-site-renderer)

  BuildRequires:  mvn(org.apache.maven:maven-artifact)

- BuildRequires:  mvn(org.apache.maven:maven-artifact:2.2.1)

  BuildRequires:  mvn(org.apache.maven:maven-compat)

  BuildRequires:  mvn(org.apache.maven:maven-core)

- BuildRequires:  mvn(org.apache.maven:maven-model:2.2.1)

+ BuildRequires:  mvn(org.apache.maven:maven-model)

  BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)

  BuildRequires:  mvn(org.apache.maven:maven-plugin-api)

- BuildRequires:  mvn(org.apache.maven:maven-plugin-registry)

  BuildRequires:  mvn(org.apache.maven:maven-repository-metadata)

  BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)

  BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
@@ -50,6 +45,8 @@ 

  BuildRequires:  mvn(org.ow2.asm:asm)

  BuildRequires:  mvn(org.ow2.asm:asm-commons)

  

+ Obsoletes:      maven-plugin-tools-javadoc < 0:3.6.0-1

+ 

  %description

  The Maven Plugin Tools contains the necessary tools to be able to produce Maven

  Plugins in a variety of languages.
@@ -116,18 +113,6 @@ 

  %description java

  Descriptor extractor for plugins written in Java.

  

- # Note that this package contains code, not documentation.

- # See comments about "javadocs" subpackage below.

- %package javadoc

- Summary:        Maven Plugin Tools Javadoc

- 

- %description javadoc

- The Maven Plugin Tools Javadoc provides several Javadoc taglets to be used when

- generating Javadoc.

- 

- Java API documentation for %{name} is contained in

- %{name}-javadocs package. This package does not contain it.

- 

  %package model

  Summary:        Maven Plugin Metadata Model

  Obsoletes:      maven-shared-plugin-tools-model < 0:%{version}-%{release}
@@ -172,55 +157,13 @@ 

  %prep

  %setup -q

  %patch0 -p1

- %patch1 -p1

- %patch2 -p1

  

  %pom_remove_plugin :maven-enforcer-plugin

  

- # For com.sun:tools use scope "compile" instead of "system"

- %pom_remove_dep com.sun:tools maven-plugin-tools-javadoc

- %pom_add_dep com.sun:tools maven-plugin-tools-javadoc

- 

  %pom_xpath_inject "pom:project/pom:properties" "

      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

      <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>"

  

- # Remove test dependencies because tests are skipped anyways.

- %pom_xpath_remove "pom:dependency[pom:scope='test']"

- 

- # Use Maven 3.1.1 APIs

- %pom_remove_dep :maven-project maven-plugin-plugin

- %pom_remove_dep :maven-plugin-descriptor maven-plugin-plugin

- %pom_remove_dep :maven-plugin-registry maven-plugin-plugin

- %pom_remove_dep :maven-artifact-manager maven-plugin-plugin

- 

- %pom_change_dep :maven-project :maven-core maven-plugin-tools-annotations

- %pom_change_dep :maven-plugin-descriptor :maven-compat maven-plugin-tools-annotations

- 

- %pom_remove_dep :maven-plugin-descriptor maven-script/maven-plugin-tools-ant

- %pom_change_dep :maven-project :maven-core maven-script/maven-plugin-tools-ant

- 

- %pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-api

- %pom_change_dep :maven-project :maven-core maven-plugin-tools-api

- 

- %pom_remove_dep :maven-plugin-descriptor maven-script/maven-plugin-tools-beanshell

- 

- %pom_remove_dep :maven-project maven-plugin-tools-generators

- %pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-generators

- 

- %pom_change_dep :maven-project :maven-core maven-plugin-tools-java

- %pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-java

- 

- %pom_change_dep :maven-plugin-descriptor :maven-plugin-api maven-script/maven-plugin-tools-model

- 

- %pom_remove_dep :maven-project maven-script/maven-script-ant

- %pom_remove_dep :maven-plugin-descriptor maven-script/maven-script-ant

- 

- %pom_remove_dep :maven-project

- %pom_remove_dep :maven-plugin-descriptor

- %pom_add_dep org.apache.maven:maven-compat

- %pom_add_dep org.apache.maven:maven-plugin-registry

- 

  %build

  %mvn_build -s -f

  
@@ -250,8 +193,6 @@ 

  

  %files java -f .mfiles-maven-plugin-tools-java

  

- %files javadoc -f .mfiles-maven-plugin-tools-javadoc

- 

  %files model -f .mfiles-maven-plugin-tools-model

  %license LICENSE NOTICE

  
@@ -268,6 +209,10 @@ 

  

  

  %changelog

+ * Thu Feb 27 2020 Jayashree Huttanagoudar <jhuttana@redhat.com> - 0:3.6.0-1

+ - Update to upstream version 3.6.0.

+ - Section related to javadoc is removed because in the latest upstream source javadoc module is removed.

+ 

  * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.5.1-7

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (maven-plugin-tools-3.5.1-source-release.zip) = 0ef29773db58f9457debba1b8d989d8809be162b7617ad5ebe7d99882d63713b28adad26fcf99ba75631aa3ecf66cdd1c17d70c9cbc08ad656614a14cc17af99

+ SHA512 (maven-plugin-tools-3.6.0-source-release.zip) = d0028acaf5a9a083230272fa49a93c1acb9a6f8677d5609649bb95e4f27340d692b14e1987b0ddba218bc7afbd38652d04660607a97b6a932d3e4b36734dfbc3

In upstream source javadoc module is removed in the latest version. Therefore the sections which are not necessary for upgrading v3.6.0 are removed in the specfile.

Release should reset to 1 after a Version bump.

The changelog entry is missing -<Release> suffix. Should be 0:3.6.0-1 (after Release has been reset back to 1).

It's worth mentioning that this update to 3.6.0 is needed for the objectweb-asm 7.3.1 update.

@decathorpe thanks for the pointer. @jhuttana Please check whether this is still the case.

@decathorpe thanks for the pointer. @jhuttana Please check whether this is still the case.

@decathorpe : Thanks for directing me to the link.

@jerboaa and @decathorpe
I understood the context from the link provided above. For me the build is not breaking hawtjni and maven-surefire.
I am using :
maven-surefire v2.22.0
hawtjni v1.16
Fedora-30

@decathorpe : Could you please let me know if i have missed anything to reproduce the issue you are seeing at your end? So that I can also triage in the same way.

@jhuttana since you're updating packages in rawhide, you should also test builds on rawhide.

I've run rebuilds of all packages that depend on maven-plugin-tools in COPR against 3.6.0 from your branch, and hawtjni and maven-surefire are still broken:

https://copr.fedorainfracloud.org/coprs/decathorpe/maven-plugin-tools-3.6.0-pr/monitor/

For example, hawtjni fails to build with this error:

[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.8.1:compile (default-compile) on project hawtjni-maven-plugin: Compilation failure: Compilation failure: 
[ERROR] /builddir/build/BUILD/hawtjni-hawtjni-project-1.17/hawtjni-maven-plugin/src/main/java/org/fusesource/hawtjni/maven/BuildMojo.java:[28,42] cannot find symbol
[ERROR]   symbol:   class ArtifactResolver
[ERROR]   location: package org.apache.maven.artifact.resolver
[ERROR] /builddir/build/BUILD/hawtjni-hawtjni-project-1.17/hawtjni-maven-plugin/src/main/java/org/fusesource/hawtjni/maven/BuildMojo.java:[84,15] cannot find symbol
[ERROR]   symbol:   class ArtifactResolver
[ERROR]   location: class org.fusesource.hawtjni.maven.BuildMojo

Other packages fail to build because of the removed javadoc subpackage:

Error: 
 Problem: package maven-plugin-tools-javadoc-3.5.1-7.fc32.noarch requires mvn(org.apache.maven.plugin-tools:maven-plugin-tools-java) = 3.5.1, but none of the providers can be installed
  - cannot install both maven-plugin-tools-java-3.5.1-7.fc32.noarch and maven-plugin-tools-java-3.6.0-8.fc33.noarch
  - package maven-parent-33-3.fc33.noarch requires mvn(org.apache.maven.plugin-tools:maven-plugin-tools-javadoc), but none of the providers can be installed
  - package maven-plugin-plugin-3.6.0-8.fc33.noarch requires mvn(org.apache.maven.plugin-tools:maven-plugin-tools-java) = 3.6.0, but none of the providers can be installed
  - cannot install the best candidate for the job

@jhuttana since you're updating packages in rawhide, you should also test builds on rawhide.
I've run rebuilds of all packages that depend on maven-plugin-tools in COPR against 3.6.0 from your branch, and hawtjni and maven-surefire are still broken:
https://copr.fedorainfracloud.org/coprs/decathorpe/maven-plugin-tools-3.6.0-pr/monitor/
For example, hawtjni fails to build with this error:
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.8.1:compile (default-compile) on project hawtjni-maven-plugin: Compilation failure: Compilation failure:
[ERROR] /builddir/build/BUILD/hawtjni-hawtjni-project-1.17/hawtjni-maven-plugin/src/main/java/org/fusesource/hawtjni/maven/BuildMojo.java:[28,42] cannot find symbol
[ERROR] symbol: class ArtifactResolver
[ERROR] location: package org.apache.maven.artifact.resolver
[ERROR] /builddir/build/BUILD/hawtjni-hawtjni-project-1.17/hawtjni-maven-plugin/src/main/java/org/fusesource/hawtjni/maven/BuildMojo.java:[84,15] cannot find symbol
[ERROR] symbol: class ArtifactResolver
[ERROR] location: class org.fusesource.hawtjni.maven.BuildMojo

Other packages fail to build because of the removed javadoc subpackage:
Error:
Problem: package maven-plugin-tools-javadoc-3.5.1-7.fc32.noarch requires mvn(org.apache.maven.plugin-tools:maven-plugin-tools-java) = 3.5.1, but none of the providers can be installed
- cannot install both maven-plugin-tools-java-3.5.1-7.fc32.noarch and maven-plugin-tools-java-3.6.0-8.fc33.noarch
- package maven-parent-33-3.fc33.noarch requires mvn(org.apache.maven.plugin-tools:maven-plugin-tools-javadoc), but none of the providers can be installed
- package maven-plugin-plugin-3.6.0-8.fc33.noarch requires mvn(org.apache.maven.plugin-tools:maven-plugin-tools-java) = 3.6.0, but none of the providers can be installed
- cannot install the best candidate for the job

Thanks for sharing the details. I will investigate further on this.

Hi!

Still, 3.6.0 is breaking hawtjni and maven-surefire:
https://src.fedoraproject.org/rpms/maven-plugin-tools/pull-request/1#comment-23826

I've proposed PRs for hawtjni and maven-surefire. They seem to silently depend on the maven compatibility layer. Upgrade to 3.6 maven-plugin-tools seems to have exposed this.

hawtjni: https://src.fedoraproject.org/rpms/hawtjni/pull-request/2
maven-surefire: https://src.fedoraproject.org/rpms/maven-surefire/pull-request/1

Other packages fail to build because of the removed javadoc subpackage:
Error:
Problem: package maven-plugin-tools-javadoc-3.5.1-7.fc32.noarch requires mvn(org.apache.maven.plugin-tools:maven-plugin-tools-java) = 3.5.1, but none of the providers can be installed
- cannot install both maven-plugin-tools-java-3.5.1-7.fc32.noarch and maven-plugin-tools-java-3.6.0-8.fc33.noarch
- package maven-parent-33-3.fc33.noarch requires mvn(org.apache.maven.plugin-tools:maven-plugin-tools-javadoc), but none of the providers can be installed
- package maven-plugin-plugin-3.6.0-8.fc33.noarch requires mvn(org.apache.maven.plugin-tools:maven-plugin-tools-java) = 3.6.0, but none of the providers can be installed
- cannot install the best candidate for the job

This seems to be a problem with maven-parent introduced with the 33 upgrade. Fabio, I wasn't able to reproduce the original problem which made you add the explicit requirement. It seems like the real fix for this was which would still be there.
https://src.fedoraproject.org/rpms/maven-parent/pull-request/2#comment-26003

Thus, I propose to:

0)
Get surefire and hawtjni PRs merged. They do no harm in current rawhide.

1)
Get maven-parent rebuilt without the explicit requirement on maven-plugin-tools-javadoc (no longer available with 3.6.0.

2)
Get maven-plugin-tools upgrade merged (once Jaya fixes the comments mentioned originally) and built.

3)
Get objectweb-asm 7.3.1 upgrade merged.

Thoughts?

This seems to be a problem with maven-parent introduced with the 33 upgrade. Fabio, I wasn't able to reproduce the original problem which made you add the explicit requirement. It seems like the real fix for this was which would still be there.
https://src.fedoraproject.org/rpms/maven-parent/pull-request/2#comment-26003
Thus, I propose to:
0)
Get surefire and hawtjni PRs merged. They do no harm in current rawhide.
1)
Get maven-parent rebuilt without the explicit requirement on maven-plugin-tools-javadoc (no longer available with 3.6.0.
2)
Get maven-plugin-tools upgrade merged (once Jaya fixes the comments mentioned originally) and built.
3)
Get objectweb-asm 7.3.1 upgrade merged.
Thoughts?

0) Sounds good to me.
1) Sounds good to me.
2) Sounds good to me.
3) I don't know about this package.

Still, we've commented on the changes in this PR, and none of the problems have been addressed yet. Until that happens we're not going to merge this PR.

Additionally to the issues pointed out in previous comments, the -javadoc subpackage is removed without proper Obsoletes being in place.

3 new commits added

  • Addressed review comments: javadoc package needs to be properly obsoleted and old patches porting to Maven 3 API removed
  • Deleted unapplicable patches
  • Renamed patch without changing the content
4 years ago

@jerboaa and @decathorpe
Sorry for loosing track on the changes originally mentioned.
I have made the changes requested with the help of pointer provided earlier.

Could you please review and provide me the comments?

This should be < 0:3.6.0-1 (full Epoch:Version-Release of the package EVR that first dropped the subpackage).

Otherwise, changes look good to me now!

It would be great if you could squash all changes into a single commit though.

Otherwise, changes look good to me now!
It would be great if you could squash all changes into a single commit though.

I concur.

1 new commit added

  • Addressed review comments
4 years ago

rebased onto b103a17

4 years ago

@jhuttana This looks almost right. One tiny nit: Please trim the commit message. Currently it's:

    Upgraded to the latest upstream version 3.6.0

    Renamed patch without changing the content

    Deleted unapplicable patches

    Addressed review comments: javadoc package needs to be properly obsoleted and old patches porting to Maven 3 API removed

    Addressed review comments

To something like:

Upgraded to the latest upstream version 3.6.0

Obsolete removed maven-plugin-tools-javadoc package.

Thanks!

rebased onto dc79dd9

4 years ago

Looks good to me now. Thanks!

@jerboaa any comments from you?

Looks good to me now. Thanks!
@jerboaa any comments from you?

No other than looks good. :)

Ship it!

Pull-Request has been merged by decathorpe

4 years ago

Thanks, everybody! I think with this, all necessary changes have been merged and built.

Thank you Fabio! Much appreciated.

@jerboaa I'm now getting build failures for some packages in koschei:

https://koschei.fedoraproject.org/affected-by/maven-plugin-tools-java?epoch1=0&version1=3.5.1&release1=7.fc32&epoch2=0&version2=3.6.0&release2=1.fc33&collection=f33

Looks like we still need to make modifications to the maven-javadoc-plugin package :(