commit 21d4a09079df1044ce4c2a7e9902e31fb3007bbc86fff855ca961fc4fc8fff34 Author: Adrian Schröter Date: Sat May 4 01:37:48 2024 +0200 Sync from SUSE:SLFO:Main univocity-parsers revision 29cd3cd9f3d10ecac6d6abf0cc37a991 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text 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..4037b29 --- /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/univocity-parsers-build.xml b/univocity-parsers-build.xml new file mode 100644 index 0000000..6b99b0b --- /dev/null +++ b/univocity-parsers-build.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/univocity-parsers.changes b/univocity-parsers.changes new file mode 100644 index 0000000..56ad985 --- /dev/null +++ b/univocity-parsers.changes @@ -0,0 +1,61 @@ +------------------------------------------------------------------- +Mon May 9 12:38:11 UTC 2022 - Fridrich Strba + +- Upgrade to upstream release 2.9.1 + * Bugs fixed + + Quote escape configured to double quote (quote value) + character if escape not detected + + Delimiter detection returns first candidate delimiter even if + it does not exist in the file + + context.getSelectedHeaders() in RowProcessor processStarted() + can return invalid results + + DefaultNullRead of @parsed does not work with enums + + Missing fields not initialized if nested beans present + + Possible race condition + + Implicit limitation on max column name length? + + CSV auto-detection assigning line ending as quote escape + + FixedWidthFields.keepPadding not working + + Multi-char delimiter incorrectly detected inside quoted string + + Fixed the repeatable conversions initialization in the + DefaultConversionProcessor + + Fix NPE in EnumConversion + + Fixed quoted parser when using non-printable char as delimiter + * Enhancements + + Delimiter detection returns first candidate delimiter even if + it does not exist in the file + + Custom CsvFormatDetector + + Detects "whitespace" as delimiter instead of "comma" + + make the maxRowSample for parameter public configurable for + CSV auto-detection + + settings.excludeFields() doesn't throw errors for + non-existing fields anymore. + + Expose InputAnalysisProcess implementations publicly + + add "com.googlecode.openbeans" as an optional OSGi dependency +- Removed patch: + * ambiguous-Record.patch + + Not sufficient with this version + * 0001-Resolve-import-clash-with-OpenJDK-17.patch + + fix name clash with the new java.lang.Record + +------------------------------------------------------------------- +Wed Mar 23 12:04:46 UTC 2022 - Fridrich Strba + +- Added patch: + * ambiguous-Record.patch + + fix name clash with the new java.lang.Record + +------------------------------------------------------------------- +Mon Mar 21 12:44:26 UTC 2022 - Fridrich Strba + +- Build with source and target levels 8 + +------------------------------------------------------------------- +Fri Mar 15 09:11:04 UTC 2019 - Jan Engelhardt + +- Ensure neutrality of descriptions. + +------------------------------------------------------------------- +Fri Mar 15 06:31:18 UTC 2019 - Fridrich Strba + +- Initial packaging of univocity-parsers 2.5.5 +- Generate and customize ant build.xml file diff --git a/univocity-parsers.spec b/univocity-parsers.spec new file mode 100644 index 0000000..5699a21 --- /dev/null +++ b/univocity-parsers.spec @@ -0,0 +1,75 @@ +# +# spec file for package univocity-parsers +# +# Copyright (c) 2022 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: univocity-parsers +Version: 2.9.1 +Release: 0 +Summary: Collection of parsers for Java +License: Apache-2.0 +Group: Development/Libraries/Java +URL: https://github.com/uniVocity/univocity-parsers +Source0: https://github.com/uniVocity/univocity-parsers/archive/v%{version}.tar.gz +Source1: %{name}-build.xml +Patch0: 0001-Resolve-import-clash-with-OpenJDK-17.patch +BuildRequires: ant +BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local +BuildArch: noarch + +%description +uniVocity-parsers is a suite of parsers for Java. It provides an +interface for handling different file formats, and a framework for +the development of new parsers. + +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation/HTML + +%description javadoc +API documentation for %{name}. + +%prep +%setup -q +cp %{SOURCE1} build.xml +%patch0 -p1 + +# Tests require univocity-output-tester, which is not packaged yet. +%{ant} jar javadoc + +%install +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE-2.0.html + +%files javadoc +%license LICENSE-2.0.html +%{_javadocdir}/%{name} + +%changelog diff --git a/v2.9.1.tar.gz b/v2.9.1.tar.gz new file mode 100644 index 0000000..f2d7a58 --- /dev/null +++ b/v2.9.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9f377d6fb2e98afd2e83a544ee0762885816908cb3b909679bcc9ef4175dd35 +size 486417