This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch branch_1x in repository https://gitbox.apache.org/repos/asf/tika.git
commit fd77c703e700f90757476de013e0e5255780adc5 Author: tallison <[email protected]> AuthorDate: Tue Nov 26 05:49:08 2019 -0500 TIKA-2925 -- general upgrades for 1.23 --- tika-bundle/pom.xml | 18 ++++++++++++++++++ tika-parent/pom.xml | 18 +++++++++--------- tika-parsers/pom.xml | 16 ++++++++-------- .../parser/geoinfo/GeographicInformationParser.java | 9 +++++---- 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml index 3c4fcc8..6d889dc 100644 --- a/tika-bundle/pom.xml +++ b/tika-bundle/pom.xml @@ -239,6 +239,9 @@ com.adobe.xmp.properties;resolution:=optional, com.github.luben.zstd;resolution:=optional, com.github.openjson;resolution:=optional, + com.github.jaiimageio.*;resolution:=optional, + com.google.appengine.api.*;resolution:=optional, + com.google.apphosting.api.*;resolution:=optional, com.google.common.util.concurrent.internal;resolution:=optional, com.google.errorprone.annotations;resolution:=optional, com.google.errorprone.annotations.concurrent;resolution:=optional, @@ -252,6 +255,8 @@ com.sun.msv.datatype;resolution:=optional, com.sun.msv.datatype.xsd;resolution:=optional, com.sun.tools.javadoc;resolution:=optional, + edu.mit.ll.mitie;resolution:=optional, + edu.stanford.nlp.*;resolution:=optional, edu.wisc.ssec.mcidas;resolution:=optional, edu.wisc.ssec.mcidas.adde;resolution:=optional, edu.usc.irds.agepredictor.spark.authorage;resolution:=optional, @@ -309,13 +314,26 @@ org.apache.jcp.xml.dsig.internal.dom;resolution:=optional, org.apache.pdfbox.debugger;resolution:=optional, org.apache.sis;resolution:=optional, + org.apache.sis.coverage;resolution:=optional, + org.apache.sis.coverage.grid;resolution:=optional, org.apache.sis.distance;resolution:=optional, org.apache.sis.feature;resolution:=optional, org.apache.sis.geometry;resolution:=optional, + org.apache.sis.internal.coverage;resolution:=optional, org.apache.sis.internal.feature;resolution:=optional, org.apache.sis.internal.referencing;resolution:=optional, + org.apache.sis.internal.referencing.j2d;resolution:=optional, + org.apache.sis.internal.referencing.provider;resolution:=optional, + org.apache.sis.io.wkt;resolution:=optional, org.apache.sis.parameter;resolution:=optional, org.apache.sis.referencing;resolution:=optional, + org.apache.sis.referencing.crs;resolution:=optional, + org.apache.sis.referencing.cs;resolution:=optional, + org.apache.sis.referencing.datum;resolution:=optional, + org.apache.sis.referencing.operation;resolution:=optional, + org.apache.sis.referencing.operation.builder;resolution:=optional, + org.apache.sis.referencing.operation.matrix;resolution:=optional, + org.apache.sis.referencing.operation.transform;resolution:=optional, org.apache.tools.ant;resolution:=optional, org.apache.tools.ant.taskdefs;resolution:=optional, org.apache.tools.ant.types;resolution:=optional, diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml index c85baef..65ce30f 100644 --- a/tika-parent/pom.xml +++ b/tika-parent/pom.xml @@ -329,8 +329,8 @@ <maven.bundle.version>4.1.0</maven.bundle.version> <maven.failsafe.version>2.22.1</maven.failsafe.version> <maven.javadoc.version>3.1.1</maven.javadoc.version> - <maven.scr.version>1.7.4</maven.scr.version> - <maven.surefire.version>2.22.1</maven.surefire.version> + <maven.scr.version>1.26.0</maven.scr.version> + <maven.surefire.version>3.0.0-M4</maven.surefire.version> <maven.shade.version>3.2.1</maven.shade.version> <rat.version>0.13</rat.version> <!-- NOTE: sync tukaani version with commons-compress in tika-parsers --> @@ -344,14 +344,14 @@ <cxf.version>3.3.4</cxf.version> <slf4j.version>1.7.28</slf4j.version> - <jackson.version>2.10.0</jackson.version> - <jackson.databind.version>2.10.0</jackson.databind.version> + <jackson.version>2.10.1</jackson.version> + <jackson.databind.version>2.10.1</jackson.databind.version> <!-- when this is next upgraded, see if we can get rid of javax.activation dependency in tika-server --> <jaxb.version>2.3.2</jaxb.version> <cli.version>1.4</cli.version> - <lucene.version>8.1.1</lucene.version> - <mockito.version>3.0.0</mockito.version> + <lucene.version>8.3.0</lucene.version> + <mockito.version>3.1.0</mockito.version> <opennlp.version>1.9.1</opennlp.version> </properties> @@ -454,14 +454,14 @@ <dependency> <groupId>org.apache.maven.scm</groupId> <artifactId>maven-scm-provider-gitexe</artifactId> - <version>1.9.5</version> + <version>1.11.2</version> </dependency> </dependencies> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0-M2</version> + <version>3.0.0-M3</version> <executions> <execution> <id>enforce</id> @@ -469,7 +469,7 @@ <rules> <dependencyConvergence /> <requireMavenVersion> - <version>3.3</version> + <version>3.5.0</version> </requireMavenVersion> </rules> </configuration> diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml index bf321b2..ebb830b 100644 --- a/tika-parsers/pom.xml +++ b/tika-parsers/pom.xml @@ -46,10 +46,10 @@ <pdfbox.version>2.0.17</pdfbox.version> <jempbox.version>1.8.16</jempbox.version> <netcdf-java.version>4.5.5</netcdf-java.version> - <sis.version>0.8</sis.version> + <sis.version>1.0</sis.version> <parso.version>2.0.11</parso.version> <!-- used by POI, PDFBox and Jackcess ...try to sync --> - <bouncycastle.version>1.62</bouncycastle.version> + <bouncycastle.version>1.64</bouncycastle.version> <commonsexec.version>1.3</commonsexec.version> <httpcomponents.version>4.5.10</httpcomponents.version> </properties> @@ -173,7 +173,7 @@ <dependency> <groupId>com.github.luben</groupId> <artifactId>zstd-jni</artifactId> - <version>1.4.0-1</version> + <version>1.4.4-3</version> <scope>provided</scope> </dependency> @@ -297,7 +297,7 @@ <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> - <version>7.2-beta</version> + <version>7.2</version> </dependency> <dependency> <groupId>com.googlecode.mp4parser</groupId> @@ -317,7 +317,7 @@ <dependency> <groupId>com.rometools</groupId> <artifactId>rome</artifactId> - <version>1.12.1</version> + <version>1.12.2</version> <exclusions> <exclusion> <groupId>org.jdom</groupId> @@ -537,7 +537,7 @@ <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>5.3.1</version> + <version>5.5.0</version> </dependency> <!-- grib's current jsoup is vulnerable to xss @@ -550,7 +550,7 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>3.9.0</version> + <version>3.11.0</version> </dependency> <dependency> <groupId>edu.ucar</groupId> @@ -834,7 +834,7 @@ <dependency> <groupId>org.apache.uima</groupId> <artifactId>uimaj-core</artifactId> - <version>3.0.2</version> + <version>3.1.1</version> <scope>provided</scope> <exclusions> <exclusion> diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/geoinfo/GeographicInformationParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/geoinfo/GeographicInformationParser.java index 27b8040..43aadae 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/geoinfo/GeographicInformationParser.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/geoinfo/GeographicInformationParser.java @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Locale; +import java.util.Map; import java.util.Set; import org.apache.sis.internal.util.CheckedArrayList; @@ -202,8 +203,8 @@ public class GeographicInformationParser extends AbstractParser{ } private void getMetaDataCharacterSet(Metadata metadata, DefaultMetadata defaultMetaData){ - CheckedHashSet<Charset> charSetList= (CheckedHashSet<Charset>) defaultMetaData.getCharacterSets(); - for(Charset c:charSetList){ + Map<Locale, Charset> charsetMap = defaultMetaData.getLocalesAndCharsets(); + for(Charset c : charsetMap.values()){ metadata.add("CharacterSet",c.name()); } } @@ -258,8 +259,8 @@ public class GeographicInformationParser extends AbstractParser{ if(f.getName()!=null) metadata.add("ResourceFormatSpecificationAlternativeTitle ",f.getName().toString()); } - CheckedHashSet<Locale> localeCheckedHashSet= (CheckedHashSet<Locale>) defaultDataIdentification.getLanguages(); - for(Locale l:localeCheckedHashSet){ + Map<Locale, Charset> localeCharsetMap = defaultDataIdentification.getLocalesAndCharsets(); + for(Locale l : localeCharsetMap.keySet()) { metadata.add("IdentificationInfoLanguage-->",l.getDisplayLanguage(Locale.ENGLISH)); } CodeListSet<TopicCategory> categoryList= (CodeListSet<TopicCategory>) defaultDataIdentification.getTopicCategories();
