!2 Update to version 3.5.1

From: @wang--ge 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530

zxing-3.2.1-deprecated-JCommander-usage.patch

@@ -1,26 +0,0 @@
-diff -r -u ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java
---- ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java	2015-08-19 07:21:00.000000000 -0500
-+++ ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java	2018-01-24 08:59:39.472655785 -0600
-@@ -35,7 +35,8 @@
- 
-   public static void main(String[] args) throws Exception {
-     EncoderConfig config = new EncoderConfig();
--    JCommander jCommander = new JCommander(config, args);
-+    JCommander jCommander = new JCommander(config);
-+    jCommander.parse(args);
-     jCommander.setProgramName(CommandLineEncoder.class.getSimpleName());
-     if (config.help) {
-       jCommander.usage();
-diff -r -u ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java
---- ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java	2015-08-19 07:21:00.000000000 -0500
-+++ ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java	2018-01-24 08:59:39.473655761 -0600
-@@ -49,7 +49,8 @@
- 
-   public static void main(String[] args) throws Exception {
-     DecoderConfig config = new DecoderConfig();
--    JCommander jCommander = new JCommander(config, args);
-+    JCommander jCommander = new JCommander(config);
-+    jCommander.parse(args);
-     jCommander.setProgramName(CommandLineRunner.class.getSimpleName());
-     if (config.help) {
-       jCommander.usage();

zxing.spec

@@ -1,14 +1,12 @@
 Name:                zxing
-Version:             3.2.1
+Version:             3.5.1
 Release:             1
 Summary:             Java multi-format 1D/2D bar-code image processing library
 License:             ASL 2.0
 URL:                 https://github.com/zxing/zxing/
-Source0:             https://github.com/zxing/zxing/archive/%{name}-%{version}.tar.gz
+Source0:             https://github.com/zxing/zxing/archive/refs/tags/%{name}-%{version}.tar.gz
-# FTBFS fix manually cherry picked from upstream commit
-#   https://github.com/zxing/zxing/commit/e2afb336e2f7afaa9d0895c4d16e9e85013c2f3d
-Patch0:              zxing-3.2.1-deprecated-JCommander-usage.patch
 BuildRequires:       maven-local mvn(com.beust:jcommander) mvn(junit:junit)
+BuildRequires:       mvn(biz.aQute.bnd:bnd-maven-plugin)
 Provides:            bundled(barcode4j)
 BuildArch:           noarch
 %description
@@ -33,10 +31,10 @@ This package contains javadoc for %{name}.
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
-%patch0
 %pom_remove_dep com.google.android:
 %pom_remove_dep :android-core
 %pom_remove_dep :android-integration
+%pom_remove_dep com.github.jai-imageio:jai-imageio-core javase/pom.xml
 %pom_disable_module android-core
 %pom_disable_module android-integration
 %pom_disable_module zxing.appspot.com
@@ -50,43 +48,7 @@ This package contains javadoc for %{name}.
 %pom_remove_plugin -r :maven-enforcer-plugin
 %pom_remove_plugin -r :apache-rat-plugin
 %pom_remove_plugin -r :clirr-maven-plugin
-rm -r core/src/test/java/com/google/zxing/qrcode/QRCodeWriterTestCase.java \
+rm -r javase/src/test/java/com/google/zxing/client/j2se/MatrixToImageWriterTestCase.java
- core/src/test/java/com/google/zxing/qrcode/QRCodeBlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/datamatrix/DataMatrixBlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/pdf417/PDF417BlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/oned/EAN13BlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/oned/Code39BlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/oned/UPCEANExtensionBlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/oned/UPCABlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/oned/Code93BlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/oned/UPCEBlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/oned/Code128BlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/oned/CodabarBlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/oned/ITFBlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/negative \
- core/src/test/java/com/google/zxing/oned/EAN8BlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/oned/Code39ExtendedBlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/oned/rss/RSS14BlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedBlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedStackedBlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/aztec/AztecBlackBox*TestCase.java \
- core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedInternalTestCase.java \
- core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedStackedInternalTestCase.java \
- core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedImage2stringTestCase.java \
- core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedImage2binaryTestCase.java \
- core/src/test/java/com/google/zxing/oned/rss/expanded/RSSExpandedImage2resultTestCase.java
-sed -i '/DataMatrixBlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java
-sed -i '/Code39BlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java
-sed -i '/EAN13BlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java
-sed -i '/UPCABlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java
-sed -i '/UPCABlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java
-sed -i '/UPCEBlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java
-sed -i '/PDF417BlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java
-sed -i '/QRCodeBlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java
-sed -i '/Code128BlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java
-sed -i '/ITFBlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java
-sed -i '/EAN8BlackBox/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java
-sed -i '/Code39ExtendedBlackBox2TestCase/d' core/src/test/java/com/google/zxing/AllPositiveBlackBoxTester.java
 
 %build
 %mvn_build -s
@@ -96,17 +58,20 @@ sed -i '/Code39ExtendedBlackBox2TestCase/d' core/src/test/java/com/google/zxing/
 
 %files -f .mfiles-core
 %doc AUTHORS CHANGES README.md
-%license COPYING NOTICE
+%license LICENSE NOTICE
 
 %files javase -f .mfiles-javase
-%license COPYING NOTICE
+%license LICENSE NOTICE
 
 %files parent -f .mfiles-zxing-parent
-%license COPYING NOTICE
+%license LICENSE NOTICE
 
 %files javadoc -f .mfiles-javadoc
-%license COPYING NOTICE
+%license LICENSE NOTICE
 
 %changelog
+* Wed Dec 27 2023 Ge Wang <wang__ge@126.com> - 3.5.1-1
+- update to version 3.5.1
+
 * Thu Aug 20 2020 maminjie <maminjie1@huawei.com> - 3.2.1-1
 - package init