You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2012/07/25 21:11:09 UTC

svn commit: r1365699 - in /shiro/trunk: pom.xml samples/web/pom.xml

Author: lhazlewood
Date: Wed Jul 25 19:11:09 2012
New Revision: 1365699

URL: http://svn.apache.org/viewvc?rev=1365699&view=rev
Log:
Minor plugin version upgrades before merging in from the 1.2.x branch.

Modified:
    shiro/trunk/pom.xml
    shiro/trunk/samples/web/pom.xml

Modified: shiro/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/pom.xml?rev=1365699&r1=1365698&r2=1365699&view=diff
==============================================================================
--- shiro/trunk/pom.xml (original)
+++ shiro/trunk/pom.xml Wed Jul 25 19:11:09 2012
@@ -209,12 +209,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.0</version>
+                    <version>3.1</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.maven.wagon</groupId>
                             <artifactId>wagon-ssh</artifactId>
-                            <version>1.0</version>
+                            <version>2.2</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -865,7 +865,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.7</version>
+                <version>2.8.1</version>
                 <configuration>
                     <source>${jdk.version}</source>
                     <encoding>${project.build.sourceEncoding}</encoding>
@@ -1012,7 +1012,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.7</version>
+                        <version>2.8.1</version>
                         <executions>
                             <execution>
                                 <id>attach-api-docs</id>

Modified: shiro/trunk/samples/web/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/web/pom.xml?rev=1365699&r1=1365698&r2=1365699&view=diff
==============================================================================
--- shiro/trunk/samples/web/pom.xml (original)
+++ shiro/trunk/samples/web/pom.xml Wed Jul 25 19:11:09 2012
@@ -68,6 +68,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>