#2 disable ssh, bouncycastle, and vfs support
Closed 4 years ago by decathorpe. Opened 4 years ago by decathorpe.
Unknown source master  into  master

file modified
+4 -1
@@ -1,4 +1,7 @@

- apache-ivy-2.1.0-src.tar.gz

+ /results_*

+ /*.src.rpm

+ 

+ /apache-ivy-2.1.0-src.tar.gz

  /apache-ivy-2.2.0-src.tar.gz

  /apache-ivy-2.3.0-src.tar.gz

  /apache-ivy-2.4.0-src.tar.gz

file modified
+15 -4
@@ -1,10 +1,10 @@

- %bcond_without  ssh

- %bcond_without  vfs

- %bcond_without  bouncycastle

+ %bcond_with bouncycastle

+ %bcond_with ssh

+ %bcond_with vfs

  

  Name:           apache-ivy

  Version:        2.4.0

- Release:        17%{?dist}

+ Release:        18%{?dist}

  Summary:        Java-based dependency manager

  

  License:        ASL 2.0
@@ -124,6 +124,14 @@

  rm test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java

  rm test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java

  

+ %if %{without vfs}

+ rm test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java

+ rm test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java

+ rm test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java

+ rm test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java

+ rm test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java

+ %endif

+ 

  # XXX Disable test which fails due to non-existing files

  rm test/java/org/apache/ivy/ant/IvyBuildListTest.java

  
@@ -148,6 +156,9 @@

  %license LICENSE NOTICE

  

  %changelog

+ * Wed Aug 14 2019 Fabio Valentini <decathorpe@gmail.com> - 2.4.0-18

+ - Disable ssh, bouncycastle, and vfs support.

+ 

  * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-17

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

  

This PR disables the (unused) support for ssh, bouncycastle, and vfs.

It drops dependencies on multiple packages at build- or runtime (or both), including:

  • apache-commons-vfs
  • bouncycastle
  • bouncycastle-pg
  • jsch-agent-proxy-connector-factory
  • jsch-agent-proxy-core
  • jsch-agent-proxy-jsch

Tests for the disabled modules are dropped as well.

This change is already available from the stream-javapackages-tools-201901 module branch:
https://src.fedoraproject.org/fork/decathorpe/rpms/apache-ivy/c/200c951?branch=stream-javapackages-tools-201901

A test rebuild of all dependent packages went well:
https://copr.fedorainfracloud.org/coprs/decathorpe/apache-ivy-pr/monitor/

There were no additional build failures compared to koschei.

ACK, all for dropping deps.

Thanks for the review.

I'll close and reopen this PR to work around a pagure bug which prevents me from merging it here.

Pull-Request has been closed by decathorpe

4 years ago