You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2016/06/29 16:54:26 UTC

[6/6] shiro git commit: Make the apache-rat-plugin ONLY run against the root project.

Make the apache-rat-plugin ONLY run against the root project.

The apache-rat-plugin will cover all files in the project when
run from the root.

Previously the samples.pom disabled the site plugin execution to
work around this issue.


Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/235209e4
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/235209e4
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/235209e4

Branch: refs/heads/master
Commit: 235209e42545a95e93a999e6272c69d72260ecc7
Parents: eae601b
Author: Brian Demers <bd...@stormpath.com>
Authored: Fri Jun 24 16:26:06 2016 -0700
Committer: Brian Demers <bd...@stormpath.com>
Committed: Tue Jun 28 14:58:38 2016 -0700

----------------------------------------------------------------------
 pom.xml         |  2 ++
 samples/pom.xml | 16 ----------------
 2 files changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/shiro/blob/235209e4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9c003eb..dd8762b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1037,6 +1037,8 @@
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>
                 <version>0.11</version>
+                <!-- only run at the root -->
+                <inherited>false</inherited>
                 <configuration>
                 		<!-- note that this configuration needs to be maintain both in pluginManagement and reporting sections -->
                     <excludes>

http://git-wip-us.apache.org/repos/asf/shiro/blob/235209e4/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 22245e3..7ce6803 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -43,22 +43,6 @@
         <module>quickstart-guice</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>true</inherited>
-                <configuration>
-                    <!-- Turn off this plugin - it often fails with the example projects:
-                   http://shiro-developer.582600.n2.nabble.com/Failed-releases-and-Apache-Rat-tp7577605.html -->
-                    <skip>true</skip>
-                    <skipDeploy>true</skipDeploy>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <reporting>
         <plugins>
             <plugin>