From 9f727030b22cc474fb7271ff68317e51c207c1a7 Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Sun, 16 Jun 2024 13:31:31 +0200 Subject: [PATCH] Set version to 0.15.0 --- RELEASE-NOTES.md | 9 +++++++++ pom.xml | 2 +- wdtk-datamodel/pom.xml | 2 +- wdtk-distribution/pom.xml | 2 +- wdtk-dumpfiles/pom.xml | 2 +- .../wikidata/wdtk/dumpfiles/EntityTimerProcessor.java | 8 ++++++++ .../wikidata/wdtk/dumpfiles/JsonDumpFileProcessor.java | 4 +++- wdtk-examples/pom.xml | 2 +- .../wikidata/wdtk/examples/FetchOnlineDataExample.java | 2 +- wdtk-rdf/pom.xml | 2 +- wdtk-storage/pom.xml | 2 +- wdtk-testing/pom.xml | 2 +- wdtk-util/pom.xml | 2 +- wdtk-wikibaseapi/pom.xml | 2 +- 14 files changed, 31 insertions(+), 12 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index ab43f1c1d..bd7b072cf 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,6 +1,15 @@ Wikidata Toolkit Release Notes ============================== +Version 0.15.0 +-------------- + +Bug fix: +* Download of online dumps was fixed (#872) + +Incompatible change: +* Minimum Java version changed from 8 to 11 (#839) + Version 0.14.7 -------------- diff --git a/pom.xml b/pom.xml index f786b64ef..834d4d42b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.wikidata.wdtk wdtk-parent - 0.14.8-SNAPSHOT + 0.15.0 pom Wikidata Toolkit diff --git a/wdtk-datamodel/pom.xml b/wdtk-datamodel/pom.xml index 11f8d90fc..9699b40c4 100644 --- a/wdtk-datamodel/pom.xml +++ b/wdtk-datamodel/pom.xml @@ -6,7 +6,7 @@ org.wikidata.wdtk wdtk-parent - 0.14.8-SNAPSHOT + 0.15.0 wdtk-datamodel diff --git a/wdtk-distribution/pom.xml b/wdtk-distribution/pom.xml index a4562d1d8..35ee146ac 100644 --- a/wdtk-distribution/pom.xml +++ b/wdtk-distribution/pom.xml @@ -6,7 +6,7 @@ org.wikidata.wdtk wdtk-parent - 0.14.8-SNAPSHOT + 0.15.0 wdtk-distribution diff --git a/wdtk-dumpfiles/pom.xml b/wdtk-dumpfiles/pom.xml index bab711aee..553af1f3e 100644 --- a/wdtk-dumpfiles/pom.xml +++ b/wdtk-dumpfiles/pom.xml @@ -5,7 +5,7 @@ org.wikidata.wdtk wdtk-parent - 0.14.8-SNAPSHOT + 0.15.0 wdtk-dumpfiles diff --git a/wdtk-dumpfiles/src/main/java/org/wikidata/wdtk/dumpfiles/EntityTimerProcessor.java b/wdtk-dumpfiles/src/main/java/org/wikidata/wdtk/dumpfiles/EntityTimerProcessor.java index 02286acf4..369480e78 100644 --- a/wdtk-dumpfiles/src/main/java/org/wikidata/wdtk/dumpfiles/EntityTimerProcessor.java +++ b/wdtk-dumpfiles/src/main/java/org/wikidata/wdtk/dumpfiles/EntityTimerProcessor.java @@ -25,6 +25,7 @@ import org.wikidata.wdtk.datamodel.interfaces.EntityDocumentDumpProcessor; import org.wikidata.wdtk.datamodel.interfaces.EntityDocumentProcessor; import org.wikidata.wdtk.datamodel.interfaces.ItemDocument; +import org.wikidata.wdtk.datamodel.interfaces.LexemeDocument; import org.wikidata.wdtk.datamodel.interfaces.PropertyDocument; import org.wikidata.wdtk.util.Timer; @@ -95,6 +96,13 @@ public void processItemDocument(ItemDocument itemDocument) { public void processPropertyDocument(PropertyDocument propertyDocument) { countEntity(); } + /* + @Override + public void processLexemeDocument(LexemeDocument lexemeDocument) { + System.out.println("Lexeme: "+lexemeDocument.getEntityId().getId()); + countEntity(); + } + */ @Override public void open() { diff --git a/wdtk-dumpfiles/src/main/java/org/wikidata/wdtk/dumpfiles/JsonDumpFileProcessor.java b/wdtk-dumpfiles/src/main/java/org/wikidata/wdtk/dumpfiles/JsonDumpFileProcessor.java index f3b0c1c2f..3386aa22a 100644 --- a/wdtk-dumpfiles/src/main/java/org/wikidata/wdtk/dumpfiles/JsonDumpFileProcessor.java +++ b/wdtk-dumpfiles/src/main/java/org/wikidata/wdtk/dumpfiles/JsonDumpFileProcessor.java @@ -76,6 +76,8 @@ public void processDumpFileContents(InputStream inputStream, logger.info("Processing JSON dump file " + dumpFile.toString()); try { + processDumpFileContentsRecovery(inputStream); + /* try { MappingIterator documentIterator = documentReader.readValues(inputStream); documentIterator.getParser().disable(Feature.AUTO_CLOSE_SOURCE); @@ -88,7 +90,7 @@ public void processDumpFileContents(InputStream inputStream, } catch (JsonProcessingException e) { logJsonProcessingException(e); processDumpFileContentsRecovery(inputStream); - } + }*/ } catch (IOException e) { throw new RuntimeException("Cannot read JSON input: " + e.getMessage(), e); diff --git a/wdtk-examples/pom.xml b/wdtk-examples/pom.xml index 58fd1cfc4..1479017bb 100644 --- a/wdtk-examples/pom.xml +++ b/wdtk-examples/pom.xml @@ -5,7 +5,7 @@ org.wikidata.wdtk wdtk-parent - 0.14.8-SNAPSHOT + 0.15.0 wdtk-examples diff --git a/wdtk-examples/src/main/java/org/wikidata/wdtk/examples/FetchOnlineDataExample.java b/wdtk-examples/src/main/java/org/wikidata/wdtk/examples/FetchOnlineDataExample.java index 3f1855aa9..7911f7698 100644 --- a/wdtk-examples/src/main/java/org/wikidata/wdtk/examples/FetchOnlineDataExample.java +++ b/wdtk-examples/src/main/java/org/wikidata/wdtk/examples/FetchOnlineDataExample.java @@ -44,7 +44,7 @@ public static void main(String[] args) throws MediaWikiApiErrorException, IOExce Datamodel.SITE_WIKIDATA); System.out.println("*** Fetching data for one entity:"); - EntityDocument q42 = wbdf.getEntityDocument("Q42"); + EntityDocument q42 = wbdf.getEntityDocument("L1259271"); System.out.println(q42); if (q42 instanceof ItemDocument) { diff --git a/wdtk-rdf/pom.xml b/wdtk-rdf/pom.xml index 77ced2ee7..6d5218547 100644 --- a/wdtk-rdf/pom.xml +++ b/wdtk-rdf/pom.xml @@ -5,7 +5,7 @@ org.wikidata.wdtk wdtk-parent - 0.14.8-SNAPSHOT + 0.15.0 wdtk-rdf diff --git a/wdtk-storage/pom.xml b/wdtk-storage/pom.xml index 769341179..019264a1c 100644 --- a/wdtk-storage/pom.xml +++ b/wdtk-storage/pom.xml @@ -5,7 +5,7 @@ org.wikidata.wdtk wdtk-parent - 0.14.8-SNAPSHOT + 0.15.0 wdtk-storage diff --git a/wdtk-testing/pom.xml b/wdtk-testing/pom.xml index 8d95171d2..30559b4cf 100644 --- a/wdtk-testing/pom.xml +++ b/wdtk-testing/pom.xml @@ -5,7 +5,7 @@ org.wikidata.wdtk wdtk-parent - 0.14.8-SNAPSHOT + 0.15.0 wdtk-testing diff --git a/wdtk-util/pom.xml b/wdtk-util/pom.xml index 0cf36fe1f..7c235bd81 100644 --- a/wdtk-util/pom.xml +++ b/wdtk-util/pom.xml @@ -5,7 +5,7 @@ org.wikidata.wdtk wdtk-parent - 0.14.8-SNAPSHOT + 0.15.0 wdtk-util diff --git a/wdtk-wikibaseapi/pom.xml b/wdtk-wikibaseapi/pom.xml index c1c1a83e4..cecbbcb05 100644 --- a/wdtk-wikibaseapi/pom.xml +++ b/wdtk-wikibaseapi/pom.xml @@ -6,7 +6,7 @@ org.wikidata.wdtk wdtk-parent - 0.14.8-SNAPSHOT + 0.15.0 wdtk-wikibaseapi