You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/03/25 13:55:37 UTC

[commons-cli] branch master updated: Update Apache Commons Parent from 47 to 48. Add missing license header.

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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-cli.git


The following commit(s) were added to refs/heads/master by this push:
     new ca36c97  Update Apache Commons Parent from 47 to 48. Add missing license header.
ca36c97 is described below

commit ca36c971bf8e1f635249e44bf0c4857761f68288
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Mar 25 09:55:33 2019 -0400

    Update Apache Commons Parent from 47 to 48. Add missing license header.
---
 pom.xml                      | 11 +----------
 src/site/resources/.htaccess | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 39c2a5b..942de1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>47</version>
+    <version>48</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>commons-cli</groupId>
@@ -222,15 +222,6 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>src/site/resources/.htaccess</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-publish-plugin</artifactId>
           <configuration>
diff --git a/src/site/resources/.htaccess b/src/site/resources/.htaccess
index 069b878..7508619 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