SOURCES/0001-Resolve-import-clash-with-OpenJDK-17.patch

@@ -0,0 +1,157 @@
+From 00d00ce9fca82fd4ad126dd916c8a8fa5ab0241d Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Wed, 3 Nov 2021 10:01:12 +0100
+Subject: [PATCH] Resolve import clash with OpenJDK 17
+
+Explititly import com.univocity.parsers.common.record.Record to
+resolve import clash caused by wildcard imports.
+
+Patch generated with the following sed invocation:
+
+sed -i '17iimport com.univocity.parsers.common.record.Record;' \
+  src/main/java/com/univocity/parsers/common/Context.java \
+  src/main/java/com/univocity/parsers/common/AbstractWriter.java \
+  src/main/java/com/univocity/parsers/common/AbstractParser.java \
+  src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java \
+  src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java \
+  src/main/java/com/univocity/parsers/common/ContextWrapper.java \
+  src/main/java/com/univocity/parsers/common/NoopParsingContext.java \
+  src/main/java/com/univocity/parsers/common/DefaultContext.java \
+  src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java \
+  src/main/java/com/univocity/parsers/fixed/Lookup.java \
+---
+ src/main/java/com/univocity/parsers/common/AbstractParser.java   | 1 +
+ src/main/java/com/univocity/parsers/common/AbstractWriter.java   | 1 +
+ src/main/java/com/univocity/parsers/common/Context.java          | 1 +
+ src/main/java/com/univocity/parsers/common/ContextWrapper.java   | 1 +
+ src/main/java/com/univocity/parsers/common/DefaultContext.java   | 1 +
+ .../java/com/univocity/parsers/common/NoopParsingContext.java    | 1 +
+ .../java/com/univocity/parsers/common/ParsingContextWrapper.java | 1 +
+ .../com/univocity/parsers/common/iterators/RecordIterator.java   | 1 +
+ src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java  | 1 +
+ src/main/java/com/univocity/parsers/fixed/Lookup.java            | 1 +
+ 10 files changed, 10 insertions(+)
+
+diff --git a/src/main/java/com/univocity/parsers/common/AbstractParser.java b/src/main/java/com/univocity/parsers/common/AbstractParser.java
+index b908d26..c84798c 100644
+--- a/src/main/java/com/univocity/parsers/common/AbstractParser.java
++++ b/src/main/java/com/univocity/parsers/common/AbstractParser.java
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  ******************************************************************************/
+ package com.univocity.parsers.common;
++import com.univocity.parsers.common.record.Record;
+ 
+ import com.univocity.parsers.common.input.EOFException;
+ import com.univocity.parsers.common.input.*;
+diff --git a/src/main/java/com/univocity/parsers/common/AbstractWriter.java b/src/main/java/com/univocity/parsers/common/AbstractWriter.java
+index 6a19562..3136f0f 100644
+--- a/src/main/java/com/univocity/parsers/common/AbstractWriter.java
++++ b/src/main/java/com/univocity/parsers/common/AbstractWriter.java
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  ******************************************************************************/
+ package com.univocity.parsers.common;
++import com.univocity.parsers.common.record.Record;
+ 
+ import com.univocity.parsers.common.fields.*;
+ import com.univocity.parsers.common.input.*;
+diff --git a/src/main/java/com/univocity/parsers/common/Context.java b/src/main/java/com/univocity/parsers/common/Context.java
+index d0adf5f..29dbbac 100644
+--- a/src/main/java/com/univocity/parsers/common/Context.java
++++ b/src/main/java/com/univocity/parsers/common/Context.java
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  ******************************************************************************/
+ package com.univocity.parsers.common;
++import com.univocity.parsers.common.record.Record;
+ 
+ import com.univocity.parsers.common.record.*;
+ 
+diff --git a/src/main/java/com/univocity/parsers/common/ContextWrapper.java b/src/main/java/com/univocity/parsers/common/ContextWrapper.java
+index bee87e8..0b7b120 100644
+--- a/src/main/java/com/univocity/parsers/common/ContextWrapper.java
++++ b/src/main/java/com/univocity/parsers/common/ContextWrapper.java
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  ******************************************************************************/
+ package com.univocity.parsers.common;
++import com.univocity.parsers.common.record.Record;
+ 
+ import com.univocity.parsers.common.record.*;
+ 
+diff --git a/src/main/java/com/univocity/parsers/common/DefaultContext.java b/src/main/java/com/univocity/parsers/common/DefaultContext.java
+index 11ea961..ec558d3 100644
+--- a/src/main/java/com/univocity/parsers/common/DefaultContext.java
++++ b/src/main/java/com/univocity/parsers/common/DefaultContext.java
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  */
+ package com.univocity.parsers.common;
++import com.univocity.parsers.common.record.Record;
+ 
+ import com.univocity.parsers.common.record.*;
+ 
+diff --git a/src/main/java/com/univocity/parsers/common/NoopParsingContext.java b/src/main/java/com/univocity/parsers/common/NoopParsingContext.java
+index fe1f07d..c92a5ab 100644
+--- a/src/main/java/com/univocity/parsers/common/NoopParsingContext.java
++++ b/src/main/java/com/univocity/parsers/common/NoopParsingContext.java
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  ******************************************************************************/
+ package com.univocity.parsers.common;
++import com.univocity.parsers.common.record.Record;
+ 
+ import com.univocity.parsers.common.record.*;
+ 
+diff --git a/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java b/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java
+index 20a59d8..a6dd3a2 100644
+--- a/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java
++++ b/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  */
+ package com.univocity.parsers.common;
++import com.univocity.parsers.common.record.Record;
+ 
+ import com.univocity.parsers.common.record.*;
+ 
+diff --git a/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java b/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java
+index 01b22cb..4478ab8 100644
+--- a/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java
++++ b/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  ******************************************************************************/
+ package com.univocity.parsers.common.iterators;
++import com.univocity.parsers.common.record.Record;
+ 
+ import com.univocity.parsers.common.*;
+ import com.univocity.parsers.common.record.*;
+diff --git a/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java b/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java
+index b38bc99..07f6560 100644
+--- a/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java
++++ b/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  ******************************************************************************/
+ package com.univocity.parsers.fixed;
++import com.univocity.parsers.common.record.Record;
+ 
+ import com.univocity.parsers.common.*;
+ import com.univocity.parsers.common.input.*;
+diff --git a/src/main/java/com/univocity/parsers/fixed/Lookup.java b/src/main/java/com/univocity/parsers/fixed/Lookup.java
+index 1aeff0d..072c95b 100644
+--- a/src/main/java/com/univocity/parsers/fixed/Lookup.java
++++ b/src/main/java/com/univocity/parsers/fixed/Lookup.java
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  ******************************************************************************/
+ package com.univocity.parsers.fixed;
++import com.univocity.parsers.common.record.Record;
+ 
+ import com.univocity.parsers.common.*;
+ import com.univocity.parsers.common.record.*;
+-- 
+2.32.0
+

SPECS/univocity-parsers.spec

@@ -2,18 +2,21 @@
 
 Name:           univocity-parsers
 Version:        2.9.1
-Release:        6%{?dist}
+Release:        9%{?dist}
 Summary:        Collection of parsers for Java
 License:        ASL 2.0
 URL:            https://github.com/uniVocity/univocity-parsers
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://github.com/uniVocity/univocity-parsers/archive/v%{version}.tar.gz
 
-BuildRequires:  maven-local
+Patch0:         0001-Resolve-import-clash-with-OpenJDK-17.patch
+
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
+BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 %endif
@@ -32,13 +35,15 @@ API documentation for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %pom_remove_plugin :nexus-staging-maven-plugin
+%pom_remove_plugin :maven-compiler-plugin
 %pom_remove_plugin :maven-javadoc-plugin
 
 %build
 # Tests require univocity-output-tester, which is not packaged yet.
-%mvn_build -f
+%mvn_build -f -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7
 
 %install
 %mvn_install
@@ -51,18 +56,29 @@ API documentation for %{name}.
 %license LICENSE-2.0.html
 
 %changelog
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 2.9.1-6
-- Rebuild with regenerated Requires on Java
+* Tue May 07 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.9.1-9
+- Rebuilt for MSVSphere 8.9
+
+* Thu Feb 08 2024 Marián Konček <mkoncek@redhat.com> - 2.9.1-9
+- Rebuild to regenerate auto-requires
+
+* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.9.1-8
+- Rebuild to regenerate auto-requires
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.9.1-6
+- Rebuilt for java-17-openjdk as system jdk
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.9.1-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.9.1-4
-- Rebuild to workaround DistroBaker issue
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.9.1-4
+- Fix build with OpenJDK 17
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.9.1-3
-- Bootstrap Maven for CentOS Stream 9
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.9.1-2
 - Bootstrap build