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/03/10 17:53:27 UTC
shiro git commit: Updating pom with git info
Repository: shiro
Updated Branches:
refs/heads/master b74c1a7aa -> 116d2f03a
Updating pom with git info
also bumping a few plugin versions which were causing problems
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/116d2f03
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/116d2f03
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/116d2f03
Branch: refs/heads/master
Commit: 116d2f03ad0603bf3f5788b90850a74e05e11063
Parents: b74c1a7
Author: bdemers <bd...@apache.org>
Authored: Wed Mar 9 23:04:33 2016 -0500
Committer: bdemers <bd...@apache.org>
Committed: Wed Mar 9 23:54:04 2016 -0500
----------------------------------------------------------------------
pom.xml | 17 +++++++++--------
samples/spring-client/pom.xml | 8 +++++---
shiro.doap.rdf | 8 ++++----
3 files changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro/blob/116d2f03/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d4ede48..e04354f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,9 +41,10 @@
<inceptionYear>2004</inceptionYear>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/shiro/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shiro/trunk</developerConnection>
- <url>http://svn.apache.org/repos/asf/shiro/trunk</url>
+ <connection>scm:git:https://git.apache.org/shiro.git</connection>
+ <developerConnection>scm:git:git://git.apache.org/shiro.git</developerConnection>
+ <url>https://github.com/apache/shiro/tree/${project.scm.tag}</url>
+ <tag>master</tag>
</scm>
<issueManagement>
<system>Jira</system>
@@ -222,7 +223,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
+ <version>3.5</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -234,7 +235,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
+ <version>0.11</version>
<configuration>
<!-- note that this configuration needs to be maintain both in pluginManagement and reporting sections -->
<excludes>
@@ -418,12 +419,12 @@
</executions>
</plugin>
<plugin>
- <!-- Add SVN Revision To A JAR Manifest
+ <!-- Add Git sha1 To A JAR Manifest
- http://maven.apache.org/plugin-developers/cookbook/add-svn-revision-to-manifest.html
-->
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>1.4</version>
<executions>
<execution>
<phase>validate</phase>
@@ -1040,7 +1041,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
+ <version>0.11</version>
<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/116d2f03/samples/spring-client/pom.xml
----------------------------------------------------------------------
diff --git a/samples/spring-client/pom.xml b/samples/spring-client/pom.xml
index 463bbe3..2d1532e 100644
--- a/samples/spring-client/pom.xml
+++ b/samples/spring-client/pom.xml
@@ -90,7 +90,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>webstart-maven-plugin</artifactId>
- <version>1.0-beta-3</version>
+ <version>1.0-beta-7</version>
<executions>
<execution>
<phase>package</phase>
@@ -111,13 +111,15 @@
</jnlp>
<sign>
- <keystore>jsecurity-sample.jks</keystore>
+ <keystore>${project.basedir}/src/main/jnlp/resources/jsecurity-sample.jks</keystore>
<storepass>jsecurity</storepass>
<alias>jsecurity</alias>
<verify>false</verify>
</sign>
<!-- BUILDING PROCESS -->
- <pack200>true</pack200>
+ <pack200>
+ <enabled>true</enabled>
+ </pack200>
<verbose>false</verbose>
</configuration>
http://git-wip-us.apache.org/repos/asf/shiro/blob/116d2f03/shiro.doap.rdf
----------------------------------------------------------------------
diff --git a/shiro.doap.rdf b/shiro.doap.rdf
index 77df9c8..de44474 100644
--- a/shiro.doap.rdf
+++ b/shiro.doap.rdf
@@ -84,10 +84,10 @@
</Version>
</release>
<repository>
- <SVNRepository>
- <location rdf:resource="http://svn.apache.org/repos/asf/shiro"/>
- <browse rdf:resource="http://svn.apache.org/repos/asf/shiro"/>
- </SVNRepository>
+ <GitRepository>
+ <location rdf:resource="https://git.apache.org/shiro.git"/>
+ <browse rdf:resource="https://git.apache.org/shiro.git"/>
+ </GitRepository>
</repository>
<maintainer>
<foaf:Person>