This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tika.git
commit e3d42aa77c7f49378be4b031c28aeeee98fc50e1 Author: tballison <[email protected]> AuthorDate: Fri May 21 14:41:37 2021 -0400 TIKA-3415 -- abandon shaded xmpcore and metadata-extractor, go back to the actual projects --- tika-bundles/tika-bundle-standard/pom.xml | 2 +- .../tika-parser-image-module/pom.xml | 4 ++-- tika-xmp/pom.xml | 10 ++-------- .../main/java/org/apache/tika/xmp/XMPMetadata.java | 22 +++++++++++----------- .../apache/tika/xmp/convert/AbstractConverter.java | 14 +++++++------- .../apache/tika/xmp/convert/GenericConverter.java | 10 +++++----- .../tika/xmp/convert/ITikaToXMPConverter.java | 4 ++-- .../tika/xmp/convert/MSOfficeBinaryConverter.java | 8 ++++---- .../tika/xmp/convert/MSOfficeXMLConverter.java | 8 ++++---- .../tika/xmp/convert/OpenDocumentConverter.java | 8 ++++---- .../org/apache/tika/xmp/convert/RTFConverter.java | 8 ++++---- .../org/apache/tika/xmp/convert/TikaToXMP.java | 6 +++--- .../java/org/apache/tika/xmp/TikaToXMPTest.java | 12 ++++++------ .../java/org/apache/tika/xmp/XMPMetadataTest.java | 10 +++++----- 14 files changed, 60 insertions(+), 66 deletions(-) diff --git a/tika-bundles/tika-bundle-standard/pom.xml b/tika-bundles/tika-bundle-standard/pom.xml index 17e5df7..8c78dfe 100644 --- a/tika-bundles/tika-bundle-standard/pom.xml +++ b/tika-bundles/tika-bundle-standard/pom.xml @@ -219,7 +219,7 @@ vorbis-java-tika| isoparser| metadata-extractor| - xmpcore-shaded| + xmpcore| json-simple| boilerpipe| rome| diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/pom.xml index ce654d1..5bc6310 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/pom.xml @@ -30,9 +30,9 @@ <dependencies> <dependency> - <groupId>org.tallison</groupId> + <groupId>com.drewnoakes</groupId> <artifactId>metadata-extractor</artifactId> - <version>${metadata.extractor.version}</version> + <version>2.16.0</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/tika-xmp/pom.xml b/tika-xmp/pom.xml index c0b4be5..75526bf 100644 --- a/tika-xmp/pom.xml +++ b/tika-xmp/pom.xml @@ -95,15 +95,9 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.tallison.xmp</groupId> - <artifactId>xmpcore-shaded</artifactId> + <groupId>com.adobe.xmp</groupId> + <artifactId>xmpcore</artifactId> <version>${xmpcore.version}</version> - <exclusions> - <exclusion> - <groupId>com.adobe.xmp</groupId> - <artifactId>xmpcore</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>junit</groupId> diff --git a/tika-xmp/src/main/java/org/apache/tika/xmp/XMPMetadata.java b/tika-xmp/src/main/java/org/apache/tika/xmp/XMPMetadata.java index 200d514..124a4b0 100644 --- a/tika-xmp/src/main/java/org/apache/tika/xmp/XMPMetadata.java +++ b/tika-xmp/src/main/java/org/apache/tika/xmp/XMPMetadata.java @@ -34,17 +34,17 @@ import org.apache.tika.metadata.PropertyTypeException; import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.xmp.convert.TikaToXMP; -import com.adobe.xmp.XMPDateTime; -import com.adobe.xmp.XMPException; -import com.adobe.xmp.XMPIterator; -import com.adobe.xmp.XMPMeta; -import com.adobe.xmp.XMPMetaFactory; -import com.adobe.xmp.XMPSchemaRegistry; -import com.adobe.xmp.XMPUtils; -import com.adobe.xmp.options.IteratorOptions; -import com.adobe.xmp.options.PropertyOptions; -import com.adobe.xmp.options.SerializeOptions; -import com.adobe.xmp.properties.XMPProperty; +import com.adobe.internal.xmp.XMPDateTime; +import com.adobe.internal.xmp.XMPException; +import com.adobe.internal.xmp.XMPIterator; +import com.adobe.internal.xmp.XMPMeta; +import com.adobe.internal.xmp.XMPMetaFactory; +import com.adobe.internal.xmp.XMPSchemaRegistry; +import com.adobe.internal.xmp.XMPUtils; +import com.adobe.internal.xmp.options.IteratorOptions; +import com.adobe.internal.xmp.options.PropertyOptions; +import com.adobe.internal.xmp.options.SerializeOptions; +import com.adobe.internal.xmp.properties.XMPProperty; /** * Provides a conversion of the Metadata map from Tika to the XMP data model by also providing the diff --git a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/AbstractConverter.java b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/AbstractConverter.java index 90602dc..bd1ffa9 100644 --- a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/AbstractConverter.java +++ b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/AbstractConverter.java @@ -22,13 +22,13 @@ import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.Property; -import com.adobe.xmp.XMPConst; -import com.adobe.xmp.XMPException; -import com.adobe.xmp.XMPMeta; -import com.adobe.xmp.XMPMetaFactory; -import com.adobe.xmp.XMPSchemaRegistry; -import com.adobe.xmp.XMPUtils; -import com.adobe.xmp.options.PropertyOptions; +import com.adobe.internal.xmp.XMPConst; +import com.adobe.internal.xmp.XMPException; +import com.adobe.internal.xmp.XMPMeta; +import com.adobe.internal.xmp.XMPMetaFactory; +import com.adobe.internal.xmp.XMPSchemaRegistry; +import com.adobe.internal.xmp.XMPUtils; +import com.adobe.internal.xmp.options.PropertyOptions; /** * Base class for Tika Metadata to XMP converter which provides some needed common functionality. diff --git a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/GenericConverter.java b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/GenericConverter.java index b541922..3059e0e 100644 --- a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/GenericConverter.java +++ b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/GenericConverter.java @@ -28,11 +28,11 @@ import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.metadata.XMPRights; import org.apache.tika.metadata.Property.PropertyType; -import com.adobe.xmp.XMPException; -import com.adobe.xmp.XMPMeta; -import com.adobe.xmp.XMPMetaFactory; -import com.adobe.xmp.XMPSchemaRegistry; -import com.adobe.xmp.options.PropertyOptions; +import com.adobe.internal.xmp.XMPException; +import com.adobe.internal.xmp.XMPMeta; +import com.adobe.internal.xmp.XMPMetaFactory; +import com.adobe.internal.xmp.XMPSchemaRegistry; +import com.adobe.internal.xmp.options.PropertyOptions; /** * Trys to convert as much of the properties in the <code>Metadata</code> map to XMP namespaces. diff --git a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/ITikaToXMPConverter.java b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/ITikaToXMPConverter.java index 8edd403..0dc9eed 100644 --- a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/ITikaToXMPConverter.java +++ b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/ITikaToXMPConverter.java @@ -18,8 +18,8 @@ package org.apache.tika.xmp.convert; import org.apache.tika.metadata.Metadata; -import com.adobe.xmp.XMPException; -import com.adobe.xmp.XMPMeta; +import com.adobe.internal.xmp.XMPException; +import com.adobe.internal.xmp.XMPMeta; /** * Interface for the specific <code>Metadata</code> to XMP converters diff --git a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/MSOfficeBinaryConverter.java b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/MSOfficeBinaryConverter.java index 70f7bcc..0338ded 100644 --- a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/MSOfficeBinaryConverter.java +++ b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/MSOfficeBinaryConverter.java @@ -29,10 +29,10 @@ import org.apache.tika.metadata.OfficeOpenXMLCore; import org.apache.tika.metadata.OfficeOpenXMLExtended; import org.apache.tika.metadata.TikaCoreProperties; -import com.adobe.xmp.XMPConst; -import com.adobe.xmp.XMPException; -import com.adobe.xmp.XMPMeta; -import com.adobe.xmp.options.PropertyOptions; +import com.adobe.internal.xmp.XMPConst; +import com.adobe.internal.xmp.XMPException; +import com.adobe.internal.xmp.XMPMeta; +import com.adobe.internal.xmp.options.PropertyOptions; /** * Tika to XMP mapping for the binary MS formats Word (.doc), Excel (.xls) and PowerPoint (.ppt). diff --git a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/MSOfficeXMLConverter.java b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/MSOfficeXMLConverter.java index 315411a..6d133c3 100644 --- a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/MSOfficeXMLConverter.java +++ b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/MSOfficeXMLConverter.java @@ -29,10 +29,10 @@ import org.apache.tika.metadata.OfficeOpenXMLCore; import org.apache.tika.metadata.OfficeOpenXMLExtended; import org.apache.tika.metadata.TikaCoreProperties; -import com.adobe.xmp.XMPConst; -import com.adobe.xmp.XMPException; -import com.adobe.xmp.XMPMeta; -import com.adobe.xmp.options.PropertyOptions; +import com.adobe.internal.xmp.XMPConst; +import com.adobe.internal.xmp.XMPException; +import com.adobe.internal.xmp.XMPMeta; +import com.adobe.internal.xmp.options.PropertyOptions; /** * Tika to XMP mapping for the Office Open XML formats Word (.docx), Excel (.xlsx) and PowerPoint diff --git a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/OpenDocumentConverter.java b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/OpenDocumentConverter.java index b2bff7a..e6a1633 100644 --- a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/OpenDocumentConverter.java +++ b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/OpenDocumentConverter.java @@ -28,10 +28,10 @@ import org.apache.tika.metadata.OfficeOpenXMLExtended; import org.apache.tika.metadata.PagedText; import org.apache.tika.metadata.TikaCoreProperties; -import com.adobe.xmp.XMPConst; -import com.adobe.xmp.XMPException; -import com.adobe.xmp.XMPMeta; -import com.adobe.xmp.options.PropertyOptions; +import com.adobe.internal.xmp.XMPConst; +import com.adobe.internal.xmp.XMPException; +import com.adobe.internal.xmp.XMPMeta; +import com.adobe.internal.xmp.options.PropertyOptions; /** * Tika to XMP mapping for the Open Document formats: Text (.odt), Spreatsheet (.ods), Graphics diff --git a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/RTFConverter.java b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/RTFConverter.java index d709a0b..f05e10f 100644 --- a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/RTFConverter.java +++ b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/RTFConverter.java @@ -27,10 +27,10 @@ import org.apache.tika.metadata.OfficeOpenXMLCore; import org.apache.tika.metadata.OfficeOpenXMLExtended; import org.apache.tika.metadata.TikaCoreProperties; -import com.adobe.xmp.XMPConst; -import com.adobe.xmp.XMPException; -import com.adobe.xmp.XMPMeta; -import com.adobe.xmp.options.PropertyOptions; +import com.adobe.internal.xmp.XMPConst; +import com.adobe.internal.xmp.XMPException; +import com.adobe.internal.xmp.XMPMeta; +import com.adobe.internal.xmp.options.PropertyOptions; /** * Tika to XMP mapping for the RTF format. diff --git a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/TikaToXMP.java b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/TikaToXMP.java index 9c30c81..0475a34 100644 --- a/tika-xmp/src/main/java/org/apache/tika/xmp/convert/TikaToXMP.java +++ b/tika-xmp/src/main/java/org/apache/tika/xmp/convert/TikaToXMP.java @@ -30,9 +30,9 @@ import org.apache.tika.parser.microsoft.ooxml.OOXMLParser; import org.apache.tika.parser.microsoft.rtf.RTFParser; import org.apache.tika.parser.odf.OpenDocumentParser; -import com.adobe.xmp.XMPException; -import com.adobe.xmp.XMPMeta; -import com.adobe.xmp.XMPMetaFactory; +import com.adobe.internal.xmp.XMPException; +import com.adobe.internal.xmp.XMPMeta; +import com.adobe.internal.xmp.XMPMetaFactory; public class TikaToXMP { /** diff --git a/tika-xmp/src/test/java/org/apache/tika/xmp/TikaToXMPTest.java b/tika-xmp/src/test/java/org/apache/tika/xmp/TikaToXMPTest.java index 860a669..5fdb07c 100644 --- a/tika-xmp/src/test/java/org/apache/tika/xmp/TikaToXMPTest.java +++ b/tika-xmp/src/test/java/org/apache/tika/xmp/TikaToXMPTest.java @@ -32,12 +32,12 @@ import org.apache.tika.xmp.convert.TikaToXMP; import org.junit.Before; import org.junit.Test; -import com.adobe.xmp.XMPConst; -import com.adobe.xmp.XMPException; -import com.adobe.xmp.XMPIterator; -import com.adobe.xmp.XMPMeta; -import com.adobe.xmp.XMPMetaFactory; -import com.adobe.xmp.properties.XMPProperty; +import com.adobe.internal.xmp.XMPConst; +import com.adobe.internal.xmp.XMPException; +import com.adobe.internal.xmp.XMPIterator; +import com.adobe.internal.xmp.XMPMeta; +import com.adobe.internal.xmp.XMPMetaFactory; +import com.adobe.internal.xmp.properties.XMPProperty; /** * Tests the Tika <code>Metadata</code> to XMP conversion functionatlity diff --git a/tika-xmp/src/test/java/org/apache/tika/xmp/XMPMetadataTest.java b/tika-xmp/src/test/java/org/apache/tika/xmp/XMPMetadataTest.java index 5240010..d377276 100644 --- a/tika-xmp/src/test/java/org/apache/tika/xmp/XMPMetadataTest.java +++ b/tika-xmp/src/test/java/org/apache/tika/xmp/XMPMetadataTest.java @@ -29,11 +29,11 @@ import org.apache.tika.metadata.XMPRights; import org.junit.Before; import org.junit.Test; -import com.adobe.xmp.XMPConst; -import com.adobe.xmp.XMPException; -import com.adobe.xmp.XMPMeta; -import com.adobe.xmp.XMPUtils; -import com.adobe.xmp.properties.XMPProperty; +import com.adobe.internal.xmp.XMPConst; +import com.adobe.internal.xmp.XMPException; +import com.adobe.internal.xmp.XMPMeta; +import com.adobe.internal.xmp.XMPUtils; +import com.adobe.internal.xmp.properties.XMPProperty; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse;
