#2 update to version 33
Merged 24 days ago by decathorpe. Opened 2 months ago by decathorpe.

file modified
+4

@@ -1,6 +1,10 @@

+ /results_*

+ /*.src.rpm

+ 

  /maven-parent-20-source-release.zip

  /maven-parent-23-source-release.zip

  /maven-parent-24-source-release.zip

  /maven-parent-25-source-release.zip

  /maven-parent-26-source-release.zip

  /maven-parent-27-source-release.zip

+ /maven-parent-33-source-release.zip

file added
+27

@@ -0,0 +1,27 @@

+ From 6b8b4446a11799cb38826881cdef5b13a7b8834e Mon Sep 17 00:00:00 2001

+ From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <hboutemy@apache.org>

+ Date: Sun, 3 Feb 2019 08:57:19 +0100

+ Subject: [PATCH] [MPOM-217] remove plexus javadoc taglet configuration

+ 

+ ---

+  pom.xml | 7 -------

+  1 file changed, 7 deletions(-)

+ 

+ diff --git a/pom.xml b/pom.xml

+ index 27321f9..1066805 100644

+ --- a/pom.xml

+ +++ b/pom.xml

+ @@ -1043,13 +1043,6 @@ under the License.

+              <quiet>true</quiet>

+              <detectLinks>true</detectLinks>

+              <locale>en</locale>

+ -            <tagletArtifacts>

+ -              <tagletArtifact combine.id="org.codehaus.plexus:plexus-javadoc">

+ -                <groupId>org.codehaus.plexus</groupId>

+ -                <artifactId>plexus-javadoc</artifactId>

+ -                <version>1.0</version>

+ -              </tagletArtifact>

+ -            </tagletArtifacts>

+            </configuration>

+          </plugin>

+          <!-- 

file modified
+34 -5

@@ -1,23 +1,48 @@

  Name:           maven-parent

- Version:        27

- Release:        7%{?dist}

+ Version:        33

+ Release:        1%{?dist}

  Summary:        Apache Maven parent POM

  License:        ASL 2.0

+ 

  URL:            http://maven.apache.org

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

+ 

+ # Upstream removed plexus-javadoc after the 33 release

+ # https://github.com/apache/maven-parent/commit/6b8b4446a11799cb38826881cdef5b13a7b8834e

+ Patch0:         6b8b444.patch

+ 

  BuildArch:      noarch

  

  BuildRequires:  maven-local

- BuildRequires:  apache-parent

+ BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)

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

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

+ BuildRequires:  mvn(org.apache.maven.plugins:maven-remote-resources-plugin)

+ BuildRequires:  mvn(org.apache:apache:pom:)

+ BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)

+ 

+ # explicitly require maven-plugin-tools-javadoc

+ Requires:       mvn(org.apache.maven.plugin-tools:maven-plugin-tools-javadoc)

+ 

+ # this package obsoletes maven-shared and maven-plugins-pom

+ Provides:       maven-shared = %{version}-%{release}

+ Obsoletes:      maven-shared < 22-9

+ 

+ Provides:       maven-plugins-pom = %{version}-%{release}

+ Obsoletes:      maven-plugins-pom < 28-9

  

  %description

  Apache Maven parent POM file used by other Maven projects.

  

  %prep

  %setup -q

- %pom_remove_plugin :maven-enforcer-plugin

- %pom_remove_plugin :maven-checkstyle-plugin

+ %patch0 -p1

+ 

  %pom_remove_plugin :apache-rat-plugin

+ %pom_remove_plugin :maven-checkstyle-plugin

+ %pom_remove_plugin -r :maven-enforcer-plugin

+ %pom_remove_plugin :maven-scm-publish-plugin

+ %pom_remove_plugin :maven-site-plugin

  

  %build

  %mvn_build

@@ -29,6 +54,10 @@

  %doc LICENSE NOTICE

  

  %changelog

+ * Fri May 17 2019 Fabio Valentini <decathorpe@gmail.com> - 33-1

+ - Update to upstream version 33

+ - Obsolete maven-shared and maven-plugins-pom.

+ 

  * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 27-7

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

  

file modified
+1 -1

@@ -1,1 +1,1 @@

- cc1549c64c6878d5917a770fa339893e  maven-parent-27-source-release.zip

+ SHA512 (maven-parent-33-source-release.zip) = ebbcf83d2d8b3f9ff681669cef54559eed42c1453dfc913888de90f23d1a6f7de73b43030d94803e037c41d8efa908f99ab25fefec1e250b3c8704e0b44d9c6b

That this update replaces maven-shared, maven-plugins-pom and maven-skins (already retired in Fedora) therefore appropriate Obsoletes/Provides should be added. After merging this PR maven-shared and maven-plugins-pom can be retired.

maven-shared is not maintained by the stewardship SIG - or not at all, I can't tell.
the package hasn't been touched by anyone but @mizdebsk or mass rebuilds for three years.

rebased onto 6f8ff5c

2 months ago

I'll happily retire it as a provenpackager.

Obsoletes/Provides for maven-skins were not added.

maven-skins has been retired since fedora 23. I don't see any reason to add references to it for fedora 31.

23? Well in that case I agree with you.

I have no idea how needed or dangerous this update is. I cannot provide more feedback.

rebased onto 98ec113

2 months ago

I did some test rebuilds of dependent packages, and found a lot of strange errors like these:

[ERROR] Failed to execute goal org.apache.maven.plugins:maven-javadoc-plugin:3.0.1:aggregate (default-cli) on project maven: An error has occurred in Javadoc report generation: Unable to resolve artifact:groupId = 'org.codehaus.plexus'
[ERROR] artifactId = 'plexus-javadoc'

Almost all maven plugins fail to build unless I add %pom_remove_plugin :maven-javadoc-plugin in this package (maven-parent). @mizdebsk do you know anything about this?

I did the test builds in this COPR repo:
https://copr.fedorainfracloud.org/coprs/decathorpe/maven-parent-pr/monitor/

No,I haven't seen this issue. In modules we are not using maven-javadoc-plugin - XMvn is used instead.

XMvn javadoc makes javadocs more consistent between packages - it unifies javadoc options, doclet used, CSS styles, and so on. It opens possibilities for better integration with distributions in the future, like for example distro-specific themes, links or dependencies between javadoc packages. It also has much fewer dependencies, which means smaller builroots and faster builds.

So ... what do you think we should do about this here?

I'd rather have modular and non-modular packages not diverge too far, otherwise it will get more and more difficult to merge necessary changes back and forth.

You need to add Requires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-javadoc) to maven-parent. This requires was not generated automatically and needs to be declared explicitly in the spec file.

rebased onto e2906a9

2 months ago

Adding this fixed some builds, but the majority still fails with the same error - for example, for maven2:

[WARNING] The POM for org.codehaus.plexus:plexus-javadoc:jar:1.0 is missing, no dependency information available
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO] 
[INFO] Maven 2.2.1 ........................................ FAILURE [  3.585 s]
[INFO] Maven Artifact ..................................... SUCCESS [  2.674 s]
[INFO] Maven Artifact Manager ............................. SUCCESS [  1.135 s]
[INFO] Maven Model ........................................ SUCCESS [  2.108 s]
[INFO] Maven Monitor ...................................... SUCCESS [  0.225 s]
[INFO] Maven Plugin Descriptor Model ...................... SUCCESS [  0.573 s]
[INFO] Maven Plugin Registry Model ........................ SUCCESS [  0.305 s]
[INFO] Maven Profile Model ................................ SUCCESS [  0.385 s]
[INFO] Maven Local Settings Model ......................... SUCCESS [  0.314 s]
[INFO] Maven Project Builder .............................. SUCCESS [  1.070 s]
[INFO] Maven Toolchains 2.2.1 ............................. SUCCESS [  0.670 s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 15.579 s
[INFO] Finished at: 2019-05-31T10:42:45Z
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-javadoc-plugin:3.0.1:aggregate (default-cli) on project maven: An error has occurred in Javadoc report generation: Unable to resolve artifact:groupId = 'org.codehaus.plexus'
[ERROR] artifactId = 'plexus-javadoc'
[ERROR] version = '1.0': Cannot access central (https://repo.maven.apache.org/maven2) in offline mode and the artifact org.codehaus.plexus:plexus-javadoc:jar:1.0 has not been downloaded from it before.

I tried querying the rawhide repos but it looks like the thing that's missing (org.codehaus.plexus:plexus-javadoc) isn't available from any existing package.

Upstream removed dependency plexus-javadoc in commit 6b8b444. You can backport that patch. More details are in JIRA: https://issues.apache.org/jira/browse/MPOM-217

rebased onto e3efc22

2 months ago

Yep, that did the trick. Thanks!

I did another round of rebuilds of affected packages, and this is the - much better - result:
https://copr.fedorainfracloud.org/coprs/decathorpe/maven-parent-pr-test/monitor/

As far as I can tell, nothing breaks that wasn't already broken - except one package (maven-stage-plugin), which fails due to usage of some "banned dependency" :laughing:

Build failure due to "banned dependencies" can be fixed by removing invocation of Maven Enforcer Plugin (%pom_remove_plugin -r :maven-enforcer-plugin in %prep)

Thanks, that worked. Now all packages that build successfully without this update also build successfully with this update.

rebased onto 5e33fe2

2 months ago

Pull-Request has been merged by decathorpe

24 days ago