shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdem...@apache.org
Subject [2/2] shiro git commit: Make the apache-rat-plugin ONLY run against the root project.
Date Mon, 27 Jun 2016 20:48:03 GMT
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/1f4fdb3f
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/1f4fdb3f
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/1f4fdb3f

Branch: refs/heads/1.2.x
Commit: 1f4fdb3fa6d7db4ceb9bd6f7467234d8ce38a288
Parents: 84de214
Author: Brian Demers <bdemers@stormpath.com>
Authored: Fri Jun 24 16:26:06 2016 -0700
Committer: Brian Demers <bdemers@stormpath.com>
Committed: Mon Jun 27 12:52:47 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/1f4fdb3f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 20b8c89..0064b95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -913,6 +913,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/1f4fdb3f/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 941621e..a4874d4 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -41,22 +41,6 @@
         <module>spring-hibernate</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>


Mime
View raw message