#1 drop useless parent POM and powermock build dependencies
Merged 3 years ago by mbooth. Opened 3 years ago by decathorpe.
Unknown source master  into  master

file modified
+10 -5
@@ -1,6 +1,6 @@

  Name:             jline

  Version:          2.14.6

- Release:          9%{?dist}

+ Release:          10%{?dist}

  Summary:          JLine is a Java library for handling console input

  License:          BSD

  URL:              https://github.com/jline/jline2
@@ -14,9 +14,6 @@

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

  BuildRequires:  mvn(org.easymock:easymock)

  BuildRequires:  mvn(org.fusesource.jansi:jansi)

- BuildRequires:  mvn(org.powermock:powermock-api-easymock)

- BuildRequires:  mvn(org.powermock:powermock-module-junit4)

- BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)

  

  Obsoletes: jline2 < %{version}-%{release}

  Provides: jline2 = %{version}-%{release}
@@ -39,6 +36,9 @@

  %prep

  %setup -q -n jline2-jline-%{version}

  

+ # remove unnecessary dependency on parent POM

+ %pom_remove_parent

+ 

  # Remove maven-shade-plugin usage

  %pom_remove_plugin "org.apache.maven.plugins:maven-shade-plugin"

  # Remove animal sniffer plugin in order to reduce deps
@@ -65,8 +65,10 @@

  mkdir -p target/generated-sources/annotations

  mkdir -p target/generated-test-sources/test-annotations

  

- # nondeterministic

+ # drop a nondeterministic test

  find -name TerminalFactoryTest.java -delete

+ # it's also the only test that uses powermock, so drop the powermock dependency

+ %pom_remove_dep org.powermock:

  

  # Fix javadoc generation on java 11

  %pom_xpath_inject pom:build/pom:plugins "<plugin>
@@ -85,6 +87,9 @@

  %files javadoc -f .mfiles-javadoc

  

  %changelog

+ * Sun Aug 09 2020 Fabio Valentini <decathorpe@gmail.com> - 2.14.6-10

+ - Drop useless parent POM and powermock build dependencies.

+ 

  * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.6-9

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

  

  • sonatype-oss-parent is marked as deprecated and can be removed without consequences
  • powermock is only used in a test that is dropped anyway, so drop the dependency too

Pull-Request has been merged by mbooth

3 years ago