[tika] branch main updated: Fix build on Windows... sorry :(

[tallison]

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


The following commit(s) were added to refs/heads/main by this push:
     new 54c91f4  Fix build on Windows... sorry :(
     new 0d6199b  Merge remote-tracking branch 'origin/main' into main
54c91f4 is described below

commit 54c91f4e629494dea460391bdf285f5e18f32a59
Author: tballison <talli...@apache.org>
AuthorDate: Thu Apr 15 12:19:01 2021 -0400

    Fix build on Windows... sorry :(
---
 .../apache/tika/pipes/fetchiterator/jdbc/TestJDBCFetchIterator.java | 6 +++---
 .../apache/tika/metadata/serialization/JsonMetadataListTest.java    | 3 ++-
 .../org/apache/tika/metadata/serialization/JsonMetadataTest.java    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/tika-pipes/tika-fetch-iterators/tika-fetch-iterator-jdbc/src/test/java/org/apache/tika/pipes/fetchiterator/jdbc/TestJDBCFetchIterator.java
 
b/tika-pipes/tika-fetch-iterators/tika-fetch-iterator-jdbc/src/test/java/org/apache/tika/pipes/fetchiterator/jdbc/TestJDBCFetchIterator.java
index e7773fe..6e549de 100644
--- 
a/tika-pipes/tika-fetch-iterators/tika-fetch-iterator-jdbc/src/test/java/org/apache/tika/pipes/fetchiterator/jdbc/TestJDBCFetchIterator.java
+++ 
b/tika-pipes/tika-fetch-iterators/tika-fetch-iterator-jdbc/src/test/java/org/apache/tika/pipes/fetchiterator/jdbc/TestJDBCFetchIterator.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -83,7 +82,8 @@ public class TestJDBCFetchIterator {
     }
 
     @AfterClass
-    public static void tearDown() throws IOException {
+    public static void tearDown() throws Exception {
+        CONNECTION.close();
         FileUtils.deleteDirectory(DB_DIR.toFile());
     }
 
@@ -110,7 +110,7 @@ public class TestJDBCFetchIterator {
         }
         assertEquals(NUM_ROWS, offered);
         for (int i = 0; i < numConsumers; i++) {
-            queue.offer(FetchIterator.COMPLETED_SEMAPHORE);
+            queue.put(FetchIterator.COMPLETED_SEMAPHORE);
         }
         int processed = 0;
         int completed = 0;
diff --git 
a/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java
 
b/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java
index 543bbcd..2f10640 100644
--- 
a/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java
+++ 
b/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java
@@ -118,7 +118,8 @@ public class JsonMetadataListTest {
         writer = new StringWriter();
         JsonMetadataList.setPrettyPrinting(true);
         JsonMetadataList.toJson(metadataList, writer);
-        assertTrue(writer.toString().startsWith("[ {\n" +
+        assertTrue(writer.toString().replaceAll("\r\n", "\n")
+                .startsWith("[ {\n" +
                 "  \"zk1\" : [ \"v1\", \"v2\", \"v3\", \"v4\", \"v4\" ],\n" +
                 "  \"zk2\" : \"v1\",\n" +
                 "  \"X-TIKA:content\" : \"this is the content\"\n" +
diff --git 
a/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java
 
b/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java
index 3abeaa6..a5d3f5b 100644
--- 
a/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java
+++ 
b/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataTest.java
@@ -63,7 +63,7 @@ public class JsonMetadataTest {
         writer = new StringWriter();
         JsonMetadata.setPrettyPrinting(true);
         JsonMetadata.toJson(metadata, writer);
-        assertTrue(writer.toString().contains(
+        assertTrue(writer.toString().replaceAll("\r\n", "\n").contains(
                 "\"json_escapes\" : \"the: \\\"quick\\\" brown, fox\",\n" +
                         "  \"k1\" : [ \"v1\", \"v2\" ],\n" +
                         "  \"k3\" : [ \"v3\", \"v3\" ],\n" +