You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ri...@apache.org on 2021/07/15 16:35:33 UTC
[phoenix-queryserver] branch master updated: PHOENIX-6512 Fix PQS
Apache RAT check problems addendum
This is an automated email from the ASF dual-hosted git repository.
richardantal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git
The following commit(s) were added to refs/heads/master by this push:
new b8202d2 PHOENIX-6512 Fix PQS Apache RAT check problems addendum
b8202d2 is described below
commit b8202d2718a3b5d0660755ed98e5f8a77992f5ec
Author: Richard Antal <ri...@cloudera.com>
AuthorDate: Thu Jul 15 15:46:20 2021 +0200
PHOENIX-6512 Fix PQS Apache RAT check problems addendum
Change-Id: I79ad02556ba6514c25404d5e918925da1c469e6a
---
.../src/scripts/replace_jars_with_symlinks.sh | 21 ++++++++++++++
pom.xml | 32 ++++++++++++----------
2 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/phoenix-queryserver-assembly/src/scripts/replace_jars_with_symlinks.sh b/phoenix-queryserver-assembly/src/scripts/replace_jars_with_symlinks.sh
index 2eb9b9f..24510f1 100755
--- a/phoenix-queryserver-assembly/src/scripts/replace_jars_with_symlinks.sh
+++ b/phoenix-queryserver-assembly/src/scripts/replace_jars_with_symlinks.sh
@@ -1,4 +1,25 @@
#!/usr/bin/env bash
+#
+############################################################################
+#
+# 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.
+#
+############################################################################
+
REPO_ROOT=$1
for linksource in $(find $REPO_ROOT -name \*.jar); do
linkfile=$(basename $linksource)
diff --git a/pom.xml b/pom.xml
index 20fb957..b577741 100644
--- a/pom.xml
+++ b/pom.xml
@@ -314,6 +314,24 @@
<extensions>true</extensions>
<inherited>true</inherited>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <!-- This will be inherited by children, which is unintended, but causes no problems -->
+ <excludes>
+ <!-- precommit? -->
+ <exclude>**/patchprocess/**</exclude>
+ <!-- Python Software Foundation License -->
+ <exclude>bin/argparse-1.4.0/argparse.py</exclude>
+ <!-- short docs text files don't need header -->
+ <exclude>python-phoenixdb/NEWS.rst</exclude>
+ <exclude>python-phoenixdb/README.rst</exclude>
+ <exclude>python-phoenixdb/dev-support/rat-excludes.txt</exclude>
+ <exclude>python-phoenixdb/RELEASING.rst</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
@@ -354,20 +372,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <!-- This will be inherited by children, which is unintended, but causes no problems -->
- <excludes>
- <!-- precommit? -->
- <exclude>**/patchprocess/**</exclude>
- <!-- Python Software Foundation License -->
- <exclude>bin/argparse-1.4.0/argparse.py</exclude>
- <!-- short docs text files don't need header -->
- <exclude>python-phoenixdb/NEWS.rst</exclude>
- <exclude>python-phoenixdb/README.rst</exclude>
- <exclude>python-phoenixdb/dev-support/rat-excludes.txt</exclude>
- <exclude>python-phoenixdb/RELEASING.rst</exclude>
- </excludes>
- </configuration>
</plugin>
<plugin>
<!-- Allows us to get the apache-ds bundle artifacts -->