shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lhazlew...@apache.org
Subject svn commit: r1365678 - in /shiro/branches/1.2.x: pom.xml samples/pom.xml
Date Wed, 25 Jul 2012 18:04:01 GMT
Author: lhazlewood
Date: Wed Jul 25 18:04:01 2012
New Revision: 1365678

URL: http://svn.apache.org/viewvc?rev=1365678&view=rev
Log:
Excluding the samples projects from site generation (continued failures and the Maven site
is not needed for the examples)

Modified:
    shiro/branches/1.2.x/pom.xml
    shiro/branches/1.2.x/samples/pom.xml

Modified: shiro/branches/1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/pom.xml?rev=1365678&r1=1365677&r2=1365678&view=diff
==============================================================================
--- shiro/branches/1.2.x/pom.xml (original)
+++ shiro/branches/1.2.x/pom.xml Wed Jul 25 18:04:01 2012
@@ -64,6 +64,9 @@
 
     <properties>
 
+        <!-- Replaced by the build number plugin at build time: -->
+        <buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
+
         <!-- non-dependency-based properties: -->
         <shiro.osgi.importRange>[1.2, 2)</shiro.osgi.importRange>
 
@@ -514,7 +517,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-
             <!-- Intra project test dependencies: -->
             <dependency>
                 <groupId>org.apache.shiro</groupId>
@@ -526,7 +528,7 @@
 
             <!-- 3rd party dependencies -->
             <dependency>
-                <!-- used for the 'hashpass' command line tool: -->
+                <!-- used for the 'hasher' command line tool: -->
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
                 <version>${commons.cli.version}</version>
@@ -890,7 +892,6 @@
                 <artifactId>maven-pmd-plugin</artifactId>
                 <version>2.5</version>
                 <configuration>
-                    <linkXref>true</linkXref>
                     <sourceEncoding>utf-8</sourceEncoding>
                     <targetJdk>1.5</targetJdk>
                 </configuration>

Modified: shiro/branches/1.2.x/samples/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/samples/pom.xml?rev=1365678&r1=1365677&r2=1365678&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/pom.xml (original)
+++ shiro/branches/1.2.x/samples/pom.xml Wed Jul 25 18:04:01 2012
@@ -17,7 +17,8 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.apache.shiro</groupId>
@@ -41,6 +42,21 @@
         <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>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <reporting>
         <plugins>
             <plugin>



Mime
View raw message