From 123ab7ef23a61cb6f4aa9fa1dd1a64cbca6a7532 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 28 Jul 2022 12:46:11 +0200 Subject: [PATCH] Initial import from Fedora --- .gitignore | 13 ++ .univocity-parsers.metadata | 1 + ...Resolve-import-clash-with-OpenJDK-17.patch | 157 ++++++++++++++++++ README.md | 3 + sources | 1 + univocity-parsers.spec | 145 ++++++++++++++++ 6 files changed, 320 insertions(+) create mode 100644 .univocity-parsers.metadata create mode 100644 0001-Resolve-import-clash-with-OpenJDK-17.patch create mode 100644 README.md create mode 100644 sources create mode 100644 univocity-parsers.spec diff --git a/.gitignore b/.gitignore index e69de29..d349ce9 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,13 @@ +/results_* +/*.src.rpm + +/v2.5.5.tar.gz +/univocity-parsers-2.8.3.tar.gz +/univocity-parsers-2.8.4.tar.gz +/univocity-parsers-2.9.0.tar.gz +/univocity-parsers-2.9.1.tar.gz +/v2.8.2.tar.gz +/v2.8.3.tar.gz +/v2.8.4.tar.gz +/v2.9.0.tar.gz +/v2.9.1.tar.gz diff --git a/.univocity-parsers.metadata b/.univocity-parsers.metadata new file mode 100644 index 0000000..69acf21 --- /dev/null +++ b/.univocity-parsers.metadata @@ -0,0 +1 @@ +5c2eec2c406119634c6d0f6c8b60361a3129e0c4 v2.9.1.tar.gz diff --git a/0001-Resolve-import-clash-with-OpenJDK-17.patch b/0001-Resolve-import-clash-with-OpenJDK-17.patch new file mode 100644 index 0000000..c4930c3 --- /dev/null +++ b/0001-Resolve-import-clash-with-OpenJDK-17.patch @@ -0,0 +1,157 @@ +From 00d00ce9fca82fd4ad126dd916c8a8fa5ab0241d Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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 + diff --git a/README.md b/README.md new file mode 100644 index 0000000..25811b4 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# univocity-parsers + +The univocity-parsers package \ No newline at end of file diff --git a/sources b/sources new file mode 100644 index 0000000..728b0d0 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (v2.9.1.tar.gz) = f22062a277015c5f7fdc10b192ff07576baa6a8b67116bdc8e9aed37a70b6f3268a8faf0e422620be63deff13e3d74d4606f7c972cd9b4afda553f88feb75887 diff --git a/univocity-parsers.spec b/univocity-parsers.spec new file mode 100644 index 0000000..d07018d --- /dev/null +++ b/univocity-parsers.spec @@ -0,0 +1,145 @@ +%bcond_with bootstrap + +Name: univocity-parsers +Version: 2.9.1 +Release: 7%{?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 + +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 + +%description +uniVocity-parsers is a suite of extremely fast and reliable parsers +for Java. It provides a consistent interface for handling different +file formats, and a solid framework for the development of new +parsers. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +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 -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 + +%install +%mvn_install + +%files -f .mfiles +%doc README.md +%license LICENSE-2.0.html + +%files javadoc -f .mfiles-javadoc +%license LICENSE-2.0.html + +%changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.9.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 2.9.1-6 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 22 2022 Fedora Release Engineering - 2.9.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 2.9.1-4 +- Fix build with OpenJDK 17 + +* Fri Jul 23 2021 Fedora Release Engineering - 2.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 2.9.1-2 +- Bootstrap build +- Non-bootstrap build + +* Sat Jan 30 2021 Fabio Valentini - 2.9.1-1 +- Update to version 2.9.1. + +* Wed Jan 27 2021 Fedora Release Engineering - 2.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 26 2021 Marian Koncek - 2.9.1-1 +- Update to upstream version 2.9.1 + +* Fri Sep 11 2020 Marian Koncek - 2.9.0-1 +- Update to upstream version 2.9.0 + +* Fri Aug 28 2020 Fabio Valentini - 2.9.0-1 +- Update to version 2.9.0. + +* Thu Aug 13 2020 Mat Booth - 2.8.4-5 +- Make OSGi requirement on com.googlecode.openbeans optional + +* Wed Jul 29 2020 Fedora Release Engineering - 2.8.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Marian Koncek - 2.8.4-1 +- Update to upstream version 2.8.4 + +* Tue Jul 14 2020 Mat Booth - 2.8.4-3 +- Allow building without tests + +* Sat Jul 11 2020 Jiri Vanek - 2.8.4-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Feb 13 2020 Fabio Valentini - 2.8.4-1 +- Update to version 2.8.4. + +* Fri Jan 31 2020 Fedora Release Engineering - 2.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 2.8.3-2 +- Mass rebuild for javapackages-tools 201902 + +* Sun Oct 06 2019 Fabio Valentini - 2.8.3-1 +- Update to version 2.8.3. + +* Tue Aug 13 2019 Marian Koncek - 2.8.3-1 +- Update to upstream version 2.8.3 + +* Sat Jul 27 2019 Fedora Release Engineering - 2.5.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jul 22 2019 Marian Koncek - 2.8.2-1 +- Update to upstream version 2.8.2 + +* Fri May 24 2019 Mikolaj Izdebski - 2.5.5-6 +- Mass rebuild for javapackages-tools 201901 + +* Sun Feb 03 2019 Fedora Release Engineering - 2.5.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Aug 21 2018 Mat Booth - 2.5.5-4 +- Remove unnecessary javadoc invocation + +* Sat Jul 14 2018 Fedora Release Engineering - 2.5.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 2.5.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Sep 14 2017 Mikolaj Izdebski - 2.5.5-1 +- Initial packaging