From 064b9d8a2f54b0d50c15e1088e3c03b737023cf0 Mon Sep 17 00:00:00 2001
From: Gary Gregory <gardgregory@gmail.com>
Date: Tue, 26 Mar 2019 20:22:19 -0400
Subject: [PATCH] Update Apache Commons Parent from 47 to 48.

---
 pom.xml                      | 19 +++++++------------
 src/site/resources/.htaccess | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index c58834631..d3b7ae4f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>47</version>
+    <version>48</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>commons-lang3</artifactId>
@@ -597,9 +597,9 @@
     <commons.encoding>utf-8</commons.encoding>
 
     <checkstyle.plugin.version>3.0.0</checkstyle.plugin.version>
-    <checkstyle.version>8.17</checkstyle.version>
+    <checkstyle.version>8.18</checkstyle.version>
 
-    <spotbugs.plugin.version>3.1.10</spotbugs.plugin.version>
+    <spotbugs.plugin.version>3.1.11</spotbugs.plugin.version>
     <japicmp.skip>false</japicmp.skip>
 
     <!-- JMH Benchmark related properties, version, target compiler and name of the benchmarking uber jar. -->
@@ -610,11 +610,11 @@
 
     <!-- generate report even if there are binary incompatible changes -->
     <commons.japicmp.breakBuildOnBinaryIncompatibleModifications>false</commons.japicmp.breakBuildOnBinaryIncompatibleModifications>
-    <!-- 0.12.0 dies with a NullPointerException -->
-    <commons.japicmp.version>0.11.1</commons.japicmp.version>
+    <commons.japicmp.version>0.13.1</commons.japicmp.version>
+    <japicmp.skip>false</japicmp.skip>
 
     <!-- Commons Release Plugin -->
-    <commons.bc.version>3.8</commons.bc.version>
+    <commons.bc.version>3.8.1</commons.bc.version>
     <commons.rc.version>RC1</commons.rc.version>
     <commons.release.isDistModule>true</commons.release.isDistModule>
     <commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/lang</commons.distSvnStagingUrl>
@@ -763,7 +763,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.10.0</version>
+        <version>3.11.0</version>
         <configuration>
           <targetJdk>${maven.compiler.target}</targetJdk>
         </configuration>
@@ -813,11 +813,6 @@
           </tagListOptions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>javancss-maven-plugin</artifactId>
-        <version>2.1</version>
-      </plugin>
     </plugins>
   </reporting>
 
diff --git a/src/site/resources/.htaccess b/src/site/resources/.htaccess
index 069b87832..750861987 100644
--- a/src/site/resources/.htaccess
+++ b/src/site/resources/.htaccess
@@ -1 +1,16 @@
+# 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.
+
 AddCharset utf-8 .txt .html