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 2744672319d67b1127d8ba02c5018e1c24de94cb Author: tallison <[email protected]> AuthorDate: Thu Nov 19 17:53:13 2020 -0500 Fix license issues identified via rat check --- CHANGES.txt | 2 ++ .../apache/tika/detect/FileCommandDetectorTest.java | 16 ++++++++++++++++ tika-fuzzing/pom.xml | 18 ++++++++++++++++++ .../tika/parser/indesign/xmp/XMPMetadataExtractor.java | 16 ++++++++++++++++ .../org/apache/tika/server/TikaServerStatusTest.java | 16 ++++++++++++++++ 5 files changed, 68 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 42d6af5..945de28 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -19,6 +19,8 @@ Release 1.25 - 11/19/2020 * Add the beginnings of a format-aware fuzzing module (TIKA-3083). + * Add wrapper for Linux 'file' command for mime detection (TIKA-3215). + Release 1.24.1 - 4/17/2020 * Add detection and a parser for flat ODF files (TIKA-3159). diff --git a/tika-core/src/test/java/org/apache/tika/detect/FileCommandDetectorTest.java b/tika-core/src/test/java/org/apache/tika/detect/FileCommandDetectorTest.java index b5d49ec..21a24ab 100644 --- a/tika-core/src/test/java/org/apache/tika/detect/FileCommandDetectorTest.java +++ b/tika-core/src/test/java/org/apache/tika/detect/FileCommandDetectorTest.java @@ -1,3 +1,19 @@ +/* + * 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.detect; import org.apache.tika.config.TikaConfig; diff --git a/tika-fuzzing/pom.xml b/tika-fuzzing/pom.xml index 6d1b037..c9f6357 100644 --- a/tika-fuzzing/pom.xml +++ b/tika-fuzzing/pom.xml @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/indesign/xmp/XMPMetadataExtractor.java b/tika-parsers/src/main/java/org/apache/tika/parser/indesign/xmp/XMPMetadataExtractor.java index 1cb11ee..482a620 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/indesign/xmp/XMPMetadataExtractor.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/indesign/xmp/XMPMetadataExtractor.java @@ -1,3 +1,19 @@ +/* + * 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.indesign.xmp; import org.apache.tika.exception.TikaException; diff --git a/tika-server/src/test/java/org/apache/tika/server/TikaServerStatusTest.java b/tika-server/src/test/java/org/apache/tika/server/TikaServerStatusTest.java index f6a9af8..eb3f2d0 100644 --- a/tika-server/src/test/java/org/apache/tika/server/TikaServerStatusTest.java +++ b/tika-server/src/test/java/org/apache/tika/server/TikaServerStatusTest.java @@ -1,3 +1,19 @@ +/* + * 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.server; import com.google.gson.JsonObject;
