Sync from SUSE:SLFO:Main univocity-parsers revision 29cd3cd9f3d10ecac6d6abf0cc37a991

This commit is contained in:
Adrian Schröter 2024-05-04 01:37:48 +02:00
commit 21d4a09079
6 changed files with 459 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -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

View File

@ -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

140
univocity-parsers-build.xml Normal file
View File

@ -0,0 +1,140 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="univocity-parsers" default="package" basedir=".">
<!-- ====================================================================== -->
<!-- Build environment properties -->
<!-- ====================================================================== -->
<property file="build.properties"/>
<property name="project.version" value="2.9.1"/>
<property name="project.artifactId" value="univocity-parsers"/>
<property name="project.groupId" value="com.univocity"/>
<property name="project.name" value="${project.artifactId}"/>
<property name="project.description" value="uniVocity's open source parsers for processing different text formats using a consistent API"/>
<property name="project.url" value="http://github.com/uniVocity/${project.artifactId}"/>
<property name="project.organization.name" value="uniVocity Software Pty Ltd"/>
<property name="project.organization.url" value="www.univocity.com"/>
<property name="project.license.url" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
<property name="spec.version" value="2.9"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
<property name="build.dir" value="target"/>
<property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir" value="src/main/java"/>
<property name="build.resourceDir" value="src/main/resources"/>
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
<!-- ====================================================================== -->
<!-- Defining classpaths -->
<!-- ====================================================================== -->
<path id="build.classpath"/>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
<delete dir="${build.dir}"/>
</target>
<!-- ====================================================================== -->
<!-- Compilation target -->
<!-- ====================================================================== -->
<target name="compile" description="Compile the code">
<mkdir dir="${build.outputDir}"/>
<javac destdir="${build.outputDir}"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}">
<src>
<pathelement location="${build.srcDir}"/>
</src>
<classpath refid="build.classpath"/>
</javac>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${build.srcDir}"
packagenames="*"
destdir="${reporting.outputDirectory}/apidocs"
access="protected"
source="${compiler.source}"
verbose="false"
version="true"
use="true"
author="true"
splitindex="false"
nodeprecated="false"
nodeprecatedlist="false"
notree="false"
noindex="false"
nohelp="false"
nonavbar="false"
serialwarn="false"
charset="ISO-8859-1"
linksource="false"
breakiterator="false">
<classpath refid="build.classpath"/>
</javadoc>
</target>
<!-- ====================================================================== -->
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
basedir="${build.outputDir}"
excludes="**/package.html">
<manifest>
<attribute name="Bundle-Description" value="${project.description}"/>
<attribute name="Bundle-DocURL" value="${project.organization.url}"/>
<attribute name="Bundle-License" value="${project.license.url}"/>
<attribute name="Bundle-ManifestVersion" value="2"/>
<attribute name="Bundle-Name" value="${project.name}"/>
<attribute name="Bundle-SymbolicName" value="${project.groupId}.parsers"/>
<attribute name="Bundle-Vendor" value="${project.organization.name}"/>
<attribute name="Bundle-Version" value="${project.version}"/>
<attribute name="Export-Package" value="com.univocity.parsers.annotations.helpers;version=&quot;${project.version}&quot;;uses:=&quot;com.univocity.parsers.annotations,com.univocity.parsers.common,com.univocity.parsers.common.beans,com.univocity.parsers.conversions&quot;,com.univocity.parsers.annotations;version=&quot;${project.version}&quot;;uses:=&quot;com.univocity.parsers.conversions,com.univocity.parsers.fixed&quot;,com.univocity.parsers.common.beans;version=&quot;${project.version}&quot;,com.univocity.parsers.common.fields;version=&quot;${project.version}&quot;;uses:=&quot;com.univocity.parsers.annotations.helpers,com.univocity.parsers.common,com.univocity.parsers.conversions&quot;,com.univocity.parsers.common.input.concurrent;version=&quot;${project.version}&quot;;uses:=&quot;com.univocity.parsers.common.input&quot;,com.univocity.parsers.common.input;version=&quot;${project.version}&quot;;uses:=&quot;com.univocity.parsers.common&quot;,com.univocity.parsers.common.iterators;version=&quot;${project.version}&quot;;uses:=&quot;com.univocity.parsers.common,com.univocity.parsers.common.record&quot;,com.univocity.parsers.common.processor.core;version=&quot;${project.version}&quot;;uses:=&quot;com.univocity.parsers.annotations,com.univocity.parsers.annotations.helpers,com.univocity.parsers.common,com.univocity.parsers.common.fields,com.univocity.parsers.common.processor,com.univocity.parsers.conversions&quot;,com.univocity.parsers.common.processor;version=&quot;${project.version}&quot;;uses:=&quot;com.univocity.parsers.common,com.univocity.parsers.common.fields,com.univocity.parsers.common.processor.core&quot;,com.univocity.parsers.common.record;version=&quot;${project.version}&quot;;uses:=&quot;com.univocity.parsers.common,com.univocity.parsers.common.fields,com.univocity.parsers.conversions&quot;,com.univocity.parsers.common.routine;version=&quot;${project.version}&quot;;uses:=&quot;com.univocity.parsers.common,com.univocity.parsers.common.fields&quot;,com.univocity.parsers.common;version=&quot;${project.version}&quot;;uses:=&quot;com.univocity.parsers.common.fields,com.univocity.parsers.common.input,com.univocity.parsers.common.processor,com.univocity.parsers.common.processor.core,com.univocity.parsers.common.record,com.univocity.parsers.conversions&quot;,com.univocity.parsers.conversions;version=&quot;${project.version}&quot;,com.univocity.parsers.csv;version=&quot;${project.version}&quot;;uses:=&quot;com.univocity.parsers.common,com.univocity.parsers.common.fields,com.univocity.parsers.common.input,com.univocity.parsers.common.routine&quot;,com.univocity.parsers.fixed;version=&quot;${project.version}&quot;;uses:=&quot;com.univocity.parsers.common,com.univocity.parsers.common.input,com.univocity.parsers.common.routine&quot;,com.univocity.parsers.tsv;version=&quot;${project.version}&quot;;uses:=&quot;com.univocity.parsers.common,com.univocity.parsers.common.routine&quot;"/>
<attribute name="Implementation-Title" value="${project.name}"/>
<attribute name="Implementation-URL" value="${project.url}"/>
<attribute name="Implementation-Vendor" value="${project.organization.name}"/>
<attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
<attribute name="Implementation-Version" value="${project.version}"/>
<attribute name="Import-Package" value="com.googlecode.openbeans;resolution:=optional,com.univocity.parsers.annotations.helpers,com.univocity.parsers.annotations,com.univocity.parsers.common.beans,com.univocity.parsers.common.fields,com.univocity.parsers.common.input.concurrent,com.univocity.parsers.common.input,com.univocity.parsers.common.iterators,com.univocity.parsers.common.processor.core,com.univocity.parsers.common.processor,com.univocity.parsers.common.record,com.univocity.parsers.common.routine,com.univocity.parsers.common,com.univocity.parsers.conversions,com.univocity.parsers.fixed"/>
<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
<attribute name="JavaPackages-Version" value="${project.version}"/>
<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
<attribute name="Specification-Title" value="${project.name}"/>
<attribute name="Specification-Vendor" value="${project.organization.name}"/>
<attribute name="Specification-Version" value="${spec.version}"/>
</manifest>
</jar>
</target>
<!-- ====================================================================== -->
<!-- A dummy target for the package named after the type it creates -->
<!-- ====================================================================== -->
<target name="jar" depends="package" description="Builds the jar for the application"/>
</project>

61
univocity-parsers.changes Normal file
View File

@ -0,0 +1,61 @@
-------------------------------------------------------------------
Mon May 9 12:38:11 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>
- Added patch:
* ambiguous-Record.patch
+ fix name clash with the new java.lang.Record
-------------------------------------------------------------------
Mon Mar 21 12:44:26 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with source and target levels 8
-------------------------------------------------------------------
Fri Mar 15 09:11:04 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Ensure neutrality of descriptions.
-------------------------------------------------------------------
Fri Mar 15 06:31:18 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Initial packaging of univocity-parsers 2.5.5
- Generate and customize ant build.xml file

75
univocity-parsers.spec Normal file
View File

@ -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

BIN
v2.9.1.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.