#2 port to commons-lang3
Merged 3 years ago by decathorpe. Opened 3 years ago by decathorpe.
Unknown source master  into  master

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

  Name:           apache-rat

  Summary:        Apache Release Audit Tool (RAT)

  Version:        0.13

- Release:        5%{?dist}

+ Release:        6%{?dist}

  License:        ASL 2.0

  

  URL:            http://creadur.apache.org/rat/
@@ -22,6 +22,7 @@

  BuildRequires:  mvn(org.apache.ant:ant-testutil)

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

  BuildRequires:  mvn(org.apache.commons:commons-compress)

+ BuildRequires:  mvn(org.apache.commons:commons-lang3)

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

  BuildRequires:  mvn(org.apache.maven.doxia:doxia-decoration-model)

  BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
@@ -123,6 +124,16 @@

  # wagon-ssh is not needed in Fedora.

  %pom_xpath_remove pom:extensions

  

+ # trivial port to commons-lang3

+ %pom_change_dep -r :commons-lang org.apache.commons:commons-lang3:3.8.1

+ 

+ sed -i "s/org.apache.commons.lang./org.apache.commons.lang3./g" \

+     apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/GuessUtils.java

+ sed -i "s/org.apache.commons.lang./org.apache.commons.lang3./g" \

+     apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java

+ sed -i "s/org.apache.commons.lang./org.apache.commons.lang3./g" \

+     apache-rat-core/src/main/java/org/apache/rat/Report.java

+ 

  # incompatible with our plexus-container

  rm apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java

  
@@ -163,6 +174,9 @@

  

  

  %changelog

+ * Tue Jul 28 2020 Fabio Valentini <decathorpe@gmail.com> - 0.13-6

+ - Port to commons-lang3.

+ 

  * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.13-5

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

  

Pretty trivial port, as RAT does not use any of the removed APIs.

  • change :commons-lang dependency to :commons-lang3
  • change import statements from org.apache.commons.lang to org.apache.commons.lang3

rebased onto d07ed11

3 years ago

rebased onto 659c2d4

3 years ago

Pull-Request has been merged by decathorpe

3 years ago