#2 update to version 3.3.3
Merged 2 months ago by decathorpe. Opened 3 months ago by decathorpe.

file modified
+6 -2

@@ -1,5 +1,8 @@

- wagon-1.0-beta-6-src.tar.gz

- wagon-1.0-source-release.zip

+ /results_*

+ /*.src.rpm

+ 

+ /wagon-1.0-beta-6-src.tar.gz

+ /wagon-1.0-source-release.zip

  /wagon-2.4-source-release.zip

  /wagon-2.5-source-release.zip

  /wagon-2.6-source-release.zip

@@ -9,3 +12,4 @@

  /wagon-2.10-source-release.zip

  /wagon-3.0.0-source-release.zip

  /wagon-3.1.0-source-release.zip

+ /wagon-3.3.3-source-release.zip

file modified
+11 -3

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

- %bcond_without  scm

+ %bcond_with     scm

  %bcond_without  ssh

  

  Name:           maven-wagon

  Epoch:          0

- Version:        3.2.0

+ Version:        3.3.3

  Release:        2%{?dist}

  Summary:        Tools to manage artifacts and deployment

  License:        ASL 2.0

@@ -22,12 +22,12 @@

  BuildRequires:  mvn(commons-net:commons-net)

  BuildRequires:  mvn(org.apache.httpcomponents:httpclient)

  BuildRequires:  mvn(org.apache.httpcomponents:httpcore)

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

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

  %if %{with scm}

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

  BuildRequires:  mvn(org.apache.maven.scm:maven-scm-manager-plexus)

  %endif

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

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

  BuildRequires:  mvn(org.codehaus.plexus:plexus-interactivity-api)

  BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)

@@ -37,6 +37,7 @@

  

  Obsoletes:      %{name}-manual < %{epoch}:%{version}-%{release}

  Obsoletes:      %{name}-provider-test < %{epoch}:%{version}-%{release}

+ Obsoletes:      %{name}-scm < %{epoch}:%{version}-%{release}

  

  %description

  Maven Wagon is a transport abstraction that is used in Maven's

@@ -191,6 +192,12 @@

  %doc LICENSE NOTICE DEPENDENCIES

  

  %changelog

+ * Fri Jul 12 2019 Fabio Valentini <decathorpe@gmail.com> - 0:3.3.3-2

+ - Disable SCM leaf subpackage to fix FTBFS on 32bit architectures.

+ 

+ * Thu Jun 27 2019 Fabio Valentini <decathorpe@gmail.com> - 0:3.3.3-1

+ - Update to version 3.3.3.

+ 

  * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.2.0-2

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

  

@@ -390,3 +397,4 @@

  

  * Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a5.1jpp

  - First JPackage build

+ 

file modified
+1 -1

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

- SHA512 (wagon-3.2.0-source-release.zip) = 31d79dc25c66f14739b4fd51aa906e4f884287f690d133db4a4021ff013e939618b772124f1a8efb009261facbe229d1a86512ef75b4dc37e95589f1717749b5

+ SHA512 (wagon-3.3.3-source-release.zip) = 3fae2bea760a03896df395cee1896aa4a02e031fdc86daaba781243cad9aefa1c1c99fc7daa95e04da0248e5aa7649511d08503807dad5fc92d80e25202c999e

Test rebuilds of dependent packages were done in COPR:
https://copr.fedorainfracloud.org/coprs/decathorpe/maven-wagon-pr/monitor/

New build failures compared to koschei are:

  • openhft-affinity
  • py4j

They seem to fail in COPR due to reasons unrelated to this PR (unreliable test suites / race conditions / timeouts).

Related: maven-wagon was updated to version 3.3.2 in these module branches already:

The differences between versions 3.3.2 and 3.3.3 should be minor.

Looks like we need to switch %bcond_without scm to %bcond_with scm, because mvn(org.eclipse.jgit:org.eclipse.jgit), which is required by maven-scm, is not available on 32bit architectures anymore.

I think we can do that safely, since it looks like the scm subpackage is a leaf package:

dnf --quiet repoquery --repo=rawhide --repo=rawhide-source \
    --alldeps --whatrequires maven-wagon-scm

(chirp chirp chirp)

Additionally, both the scm and ssh modules have already been disabled in all stream branches. What do you think?

1 new commit added

  • disable SCM leaf subpackage to fix FTBFS on 32bit architectures
2 months ago

Done - the last commit disables the -scm subpackage and its BuildRequires by flipping the bcond, and fixes building the package on i686:

https://copr.fedorainfracloud.org/coprs/g/stewardship-sig/javapackages/build/968430/

Pull-Request has been merged by decathorpe

2 months ago