upgrade to version 1.9.0

(cherry picked from commit bcc1b786f0647d930f288871aa8bc72baabdb7b2)
This commit is contained in:
wang--ge 2022-06-15 17:11:54 +08:00 committed by openeuler-sync-bot
parent 4050edffdd
commit 6df1fbe639
4 changed files with 85 additions and 9 deletions

View File

@ -0,0 +1,37 @@
From 56e8b640dbf2642dda8c49c2c1760ca7478b4e71 Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
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 @@
<artifactId>apache-rat-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.0.0-M1</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
--
2.27.0

View File

@ -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 <wangge20@h-partners.com> - 1.9.0-1
- Upgrade to version 1.9.0
* Tue Jan 18 2022 SimpleUpdate Robot <tc@openeuler.org> - 1.7-1
- Upgrade to version 1.7

26
xmvn-reactor Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://fedorahosted.org/xmvn/METADATA/3.0.0">
<artifacts>
<artifact>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.9.0</version>
<path>absolute-prefix/target/commons-csv-1.9.0.jar</path>
<properties>
<type>jar</type>
<requiresJava>1.8</requiresJava>
</properties>
</artifact>
<artifact>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<extension>pom</extension>
<version>1.9.0</version>
<path>absolute-prefix/pom.xml</path>
<properties>
<type>jar</type>
<requiresJava>1.8</requiresJava>
</properties>
</artifact>
</artifacts>
</metadata>