You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by th...@apache.org on 2022/03/10 13:24:30 UTC

[jackrabbit-oak] branch trunk updated: OAK-9718 - Fixing rat check failures

This is an automated email from the ASF dual-hosted git repository.

thomasm pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 1cd12b7  OAK-9718 - Fixing rat check failures
     new 66b65fa  Merge pull request #515 from klcodanr/OAK-9718
1cd12b7 is described below

commit 1cd12b7eb931ba2ea47bcfb718f60b8c935d37dc
Author: Dan Klco <kl...@adobe.com>
AuthorDate: Thu Mar 10 08:10:18 2022 -0500

    OAK-9718 - Fixing rat check failures
---
 oak-run/pom.xml                                        |  1 +
 .../azure/tool/SegmentCopyAzureSasToTarTest.java       | 18 ++++++++++++++++++
 pom.xml                                                |  6 +++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/oak-run/pom.xml b/oak-run/pom.xml
index 71459b5..252a2ed 100644
--- a/oak-run/pom.xml
+++ b/oak-run/pom.xml
@@ -195,6 +195,7 @@
           <excludes>
             <exclude>**/merge.txt</exclude>
             <exclude>**/mergeIndexes.txt</exclude>
+            <exclude>**/*.json</exclude>
           </excludes>
         </configuration>
       </plugin>
diff --git a/oak-segment-azure/src/test/java/oak/apache/jackrabbit/oak/segment/azure/tool/SegmentCopyAzureSasToTarTest.java b/oak-segment-azure/src/test/java/oak/apache/jackrabbit/oak/segment/azure/tool/SegmentCopyAzureSasToTarTest.java
index c9ff53d..2ab337f 100644
--- a/oak-segment-azure/src/test/java/oak/apache/jackrabbit/oak/segment/azure/tool/SegmentCopyAzureSasToTarTest.java
+++ b/oak-segment-azure/src/test/java/oak/apache/jackrabbit/oak/segment/azure/tool/SegmentCopyAzureSasToTarTest.java
@@ -1,3 +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 oak.apache.jackrabbit.oak.segment.azure.tool;
 
 import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence;
diff --git a/pom.xml b/pom.xml
index dfe6f91..819a2ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,9 +103,9 @@
             <exclude>.idea/**</exclude>
             <exclude>.gitignore</exclude>
             <exclude>oak-doc/*.uxf</exclude>
-            <exclude>oak-doc/.*/**</exclude>
-            <exclude>oak-doc/*.iml</exclude>
-            <exclude>oak-doc/target/**</exclude>
+            <exclude>oak-doc*/.*/**</exclude>
+            <exclude>oak-doc*/*.iml</exclude>
+            <exclude>oak-doc*/target/**</exclude>
             <exclude>oak-segment-tar/target/**</exclude>
             <exclude>oak-segment-tar/*.iml</exclude>
           </excludes>