diff --git a/joni-2.1.24.zip b/joni-2.1.24.zip
new file mode 100644
index 0000000000000000000000000000000000000000..0512b759a4289f57d69e887a3d79cf7370e158fc
Binary files /dev/null and b/joni-2.1.24.zip differ
diff --git a/joni-2.1.3.zip b/joni-2.1.3.zip
deleted file mode 100644
index f8db97fdcba32ade2420e0fc2f934aacd5a613df..0000000000000000000000000000000000000000
Binary files a/joni-2.1.3.zip and /dev/null differ
diff --git a/joni-remove-useless-wagon-dependency.patch b/joni-remove-useless-wagon-dependency.patch
deleted file mode 100644
index 6672d7c361923cc513e9e854485e1f4ac6bf1dc5..0000000000000000000000000000000000000000
--- a/joni-remove-useless-wagon-dependency.patch
+++ /dev/null
@@ -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>
diff --git a/joni.spec b/joni.spec
index 558483a66b12d3be0bed90ae47b4cb163547ea79..10e2baf989b6c4c0f914b200347513a2f4d5532b 100644
--- a/joni.spec
+++ b/joni.spec
@@ -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