This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/master by this push:
new 1a0d1d3 fix license issues identified by rat during prep for 1.18
release
1a0d1d3 is described below
commit 1a0d1d3056f0f45a3cb912939784f20767741e7e
Author: tballison <talli...@mitre.org>
AuthorDate: Mon Apr 9 21:09:25 2018 -0400
fix license issues identified by rat during prep for 1.18 release
---
.../apache/tika/parser/html/HtmlEncodingDetector.java | 1 +
.../html/StandardCharsets_unsupported_by_IANA.txt | 14 ++++++++++++++
.../parser/microsoft/ooxml/xps/XPSParserTest.java | 19 ++++++++++++++++---
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git
a/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlEncodingDetector.java
b/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlEncodingDetector.java
index e383f80..84141b9 100644
---
a/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlEncodingDetector.java
+++
b/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlEncodingDetector.java
@@ -64,6 +64,7 @@ public class HtmlEncodingDetector implements EncodingDetector
{
String line = reader.readLine();
while (line != null) {
if (line.startsWith("#")) {
+ line = reader.readLine();
continue;
}
line = line.trim();
diff --git
a/tika-parsers/src/main/resources/org/apache/tika/parser/html/StandardCharsets_unsupported_by_IANA.txt
b/tika-parsers/src/main/resources/org/apache/tika/parser/html/StandardCharsets_unsupported_by_IANA.txt
index 05f76ce..956c6e0 100644
---
a/tika-parsers/src/main/resources/org/apache/tika/parser/html/StandardCharsets_unsupported_by_IANA.txt
+++
b/tika-parsers/src/main/resources/org/apache/tika/parser/html/StandardCharsets_unsupported_by_IANA.txt
@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
646
737
775
diff --git
a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSParserTest.java
b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSParserTest.java
index 4fb4488..f9ed085 100644
---
a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSParserTest.java
+++
b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/xps/XPSParserTest.java
@@ -1,6 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.tika.parser.microsoft.ooxml.xps;
-import org.apache.tika.Tika;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
@@ -8,8 +23,6 @@ import org.apache.tika.parser.RecursiveParserWrapper;
import org.junit.Test;
import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import static org.junit.Assert.assertEquals;
--
To stop receiving notification emails like this one, please contact
talli...@apache.org.
