Upgrade joni to 2.1.24 to resolve compilation failures.

(cherry picked from commit cc966630b8a35e00588ea49a118fc57ef62bcffe)
This commit is contained in:
starlet-dx 2022-02-15 17:36:05 +08:00 committed by openeuler-sync-bot
parent a05eed6dc9
commit 54fdddb45e
4 changed files with 24 additions and 25 deletions

BIN
joni-2.1.24.zip Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,15 +0,0 @@
--- pom.xml 2012-10-08 20:53:08.000000000 +0200
+++ pom.xml.orig 2013-02-26 15:43:53.961731353 +0100
@@ -95,12 +95,6 @@
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<finalName>joni</finalName>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- </extension>
- </extensions>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>

View File

@ -1,11 +1,10 @@
Name: joni
Version: 2.1.3
Version: 2.1.24
Release: 1
Summary: Java port of Oniguruma regexp library
License: MIT
URL: https://github.com/jruby/%{name}
Source0: https://github.com/jruby/%{name}/archive/%{name}-%{version}.zip
Patch1: joni-remove-useless-wagon-dependency.patch
BuildArch: noarch
BuildRequires: java-devel jcodings jpackage-utils junit maven-local maven-compiler-plugin
BuildRequires: maven-jar-plugin maven-surefire-plugin sonatype-oss-parent
@ -22,24 +21,39 @@ Requires: jpackage-utils
API documentation for %{name}.
%prep
%setup -q -n %{name}-%{name}-%{version}
%patch1 -p0
sed -i -e 's|\r||' test/org/joni/test/TestC.java
sed -i -e 's|\r||' test/org/joni/test/TestU.java
sed -i -e 's|\r||' test/org/joni/test/TestA.java
%mvn_file : %{name}
%autosetup -n %{name}-%{name}-%{version} -p1
find -type f '(' -iname '*.jar' -o -iname '*.class' ')' -print -delete
# Remove pointless parent pom
%pom_remove_parent
# Remove wagon extension
%pom_xpath_remove 'pom:build/pom:extensions'
# Remove plugins not relevant for downstream RPM builds
%pom_remove_plugin :maven-javadoc-plugin
%pom_remove_plugin :maven-source-plugin
%build
%mvn_build -f
%mvn_build -j -- -P !release-on-9
# Avoid module not found: org.objectweb.asm org.jruby.jcodings
find -name module-info.java -delete
xmvn --batch-mode --offline org.fedoraproject.xmvn:xmvn-mojo:javadoc
%install
%mvn_install
%files -f .mfiles
%doc MANIFEST.MF
%doc MANIFEST.MF README.md
%license LICENSE
%files help -f .mfiles-javadoc
%changelog
* Tue Feb 15 2022 yaoxin <yaoxin30@huawei.com> - 2.1.24-1
- Upgrade joni to 2.1.24 to resolve compilation failures.
* Mon Jul 27 2020 shaoqiang kang <kangshaoqiang1@huawei.com> - 2.1.3-1
- Package init