diff --git a/0001-add-javadoc-plugin.patch b/0001-add-javadoc-plugin.patch new file mode 100644 index 0000000000000000000000000000000000000000..980b7d07bc5b3158122ba3a43df94f0b9e96da40 --- /dev/null +++ b/0001-add-javadoc-plugin.patch @@ -0,0 +1,37 @@ +From 56e8b640dbf2642dda8c49c2c1760ca7478b4e71 Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Wed, 15 Jun 2022 15:39:58 +0800 +Subject: [PATCH] add javadoc plugin + +--- + pom.xml | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/pom.xml b/pom.xml +index fd2d55d..fa432b8 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -316,6 +316,20 @@ + apache-rat-plugin + + ++ ++ org.apache.maven.plugins ++ maven-javadoc-plugin ++ 3.0.0-M1 ++ ++ ++ attach-javadocs ++ ++ jar ++ ++ ++ ++ ++ + + + +-- +2.27.0 + diff --git a/apache-commons-csv.spec b/apache-commons-csv.spec index 94223be9d2414246fd0d6abb691494f308ddfa39..690836c0f4d6555df43e6341b735825bc97c9a27 100644 --- a/apache-commons-csv.spec +++ b/apache-commons-csv.spec @@ -1,16 +1,16 @@ Name: apache-commons-csv -Version: 1.7 +Version: 1.9.0 Release: 1 Summary: Utilities to assist with handling of CSV files -License: ASL 2.0 +License: Apache-2.0 URL: https://commons.apache.org/proper/commons-csv/ BuildArch: noarch Source0: http://archive.apache.org/dist/commons/csv/source/commons-csv-%{version}-src.tar.gz -BuildRequires: maven-local mvn(commons-io:commons-io) mvn(junit:junit) -BuildRequires: mvn(org.apache.commons:commons-lang3) -BuildRequires: mvn(org.apache.commons:commons-parent:pom:) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.mockito:mockito-all) +Source1: xmvn-reactor + +Patch1: 0001-add-javadoc-plugin.patch +BuildRequires: maven-local +BuildRequires: java-1.8.0-openjdk-devel maven %description Commons CSV was started to unify a common and simple interface for @@ -24,6 +24,7 @@ This package contains the API documentation for %{name}. %prep %setup -q -n commons-csv-%{version}-src +%patch1 -p1 sed -i 's/\r//' *.txt find -name profile.jacoco -delete %pom_remove_plugin :maven-assembly-plugin @@ -33,21 +34,33 @@ find -name profile.jacoco -delete rm src/test/java/org/apache/commons/csv/CSVPrinterTest.java %mvn_file ":{*}" %{name} @1 %mvn_alias : commons-csv: +cp %{SOURCE1} ./.xmvn-reactor +echo `pwd` > absolute_prefix.log +sed -i 's/\//\\\//g' absolute_prefix.log +absolute_prefix=`head -n 1 absolute_prefix.log` +sed -i 's/absolute-prefix/'"$absolute_prefix"'/g' .xmvn-reactor %build -%mvn_build +export LC_ALL=en_US.UTF-8 +mvn package -DskipTests -Dtar -Drat.skip=true %install %mvn_install +install -d -m 0755 %{buildroot}/%{_javadocdir}/%{name} +install -m 0755 target/commons-csv-1.9.0-javadoc.jar %{buildroot}/%{_javadocdir}/%{name} %files -f .mfiles %doc RELEASE-NOTES.txt %license LICENSE.txt NOTICE.txt -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license LICENSE.txt NOTICE.txt %changelog +* Mon Jun 13 2022 Ge Wang - 1.9.0-1 +- Upgrade to version 1.9.0 + * Tue Jan 18 2022 SimpleUpdate Robot - 1.7-1 - Upgrade to version 1.7 diff --git a/commons-csv-1.7-src.tar.gz b/commons-csv-1.9.0-src.tar.gz similarity index 92% rename from commons-csv-1.7-src.tar.gz rename to commons-csv-1.9.0-src.tar.gz index bd90798adc827261042246557aab530c299fd1fd..60bcfbe30f7ede388644aa3d37083c6850ff5790 100644 Binary files a/commons-csv-1.7-src.tar.gz and b/commons-csv-1.9.0-src.tar.gz differ diff --git a/xmvn-reactor b/xmvn-reactor new file mode 100644 index 0000000000000000000000000000000000000000..1471e0125896fba75da4cb11c412fe2443d84795 --- /dev/null +++ b/xmvn-reactor @@ -0,0 +1,26 @@ + + + + + org.apache.commons + commons-csv + 1.9.0 + absolute-prefix/target/commons-csv-1.9.0.jar + + jar + 1.8 + + + + org.apache.commons + commons-csv + pom + 1.9.0 + absolute-prefix/pom.xml + + jar + 1.8 + + + +