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 2010/05/21 20:31:49 UTC

svn commit: r947119 - /incubator/shiro/tags/shiro-root-1.0.0-incubating/pom.xml

Author: lhazlewood
Date: Fri May 21 18:31:49 2010
New Revision: 947119

URL: http://svn.apache.org/viewvc?rev=947119&view=rev
Log:
Merged root POM developer info from trunk into the shiro-root-1.0.0-incubating tag for re-release

Modified:
    incubator/shiro/tags/shiro-root-1.0.0-incubating/pom.xml   (contents, props changed)

Modified: incubator/shiro/tags/shiro-root-1.0.0-incubating/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/tags/shiro-root-1.0.0-incubating/pom.xml?rev=947119&r1=947118&r2=947119&view=diff
==============================================================================
--- incubator/shiro/tags/shiro-root-1.0.0-incubating/pom.xml (original)
+++ incubator/shiro/tags/shiro-root-1.0.0-incubating/pom.xml Fri May 21 18:31:49 2010
@@ -94,12 +94,21 @@
 
     <developers>
         <developer>
-            <id>kaosko</id>
-            <name>Kalle Korhonen</name>
-            <email>kaosko@apache.org</email>
-            <url>http://tynamo.org</url>
+            <id>aditzel</id>
+            <name>Allan Ditzel</name>
+            <email>aditzel@apache.org</email>
+            <url>http://www.allanditzel.com</url>
             <organization>Apache Software Foundation</organization>
-            <timezone>-8</timezone>
+            <timezone>-5</timezone>
+        </developer>
+        <developer>
+            <id>jhaile</id>
+            <name>Jeremy Haile</name>
+            <email>jhaile@apache.org</email>
+            <url>http://www.jeremyhaile.com</url>
+            <organization>Mobilization Labs</organization>
+            <organizationUrl>http://www.mobilizationlabs.com</organizationUrl>            
+            <timezone>-5</timezone>
         </developer>
         <developer>
             <id>lhazlewood</id>
@@ -110,6 +119,28 @@
             <organizationUrl>http://www.katasoft.com</organizationUrl>
             <timezone>-8</timezone>
         </developer>
+        <developer>
+            <id>kaosko</id>
+            <name>Kalle Korhonen</name>
+            <email>kaosko@apache.org</email>
+            <url>http://tynamo.org</url>
+            <organization>Apache Software Foundation</organization>
+            <timezone>-8</timezone>
+        </developer>
+        <developer>
+            <id>pledbrook</id>
+            <name>Peter Ledbrook</name>
+            <email>p.ledbrook@cacoethes.co.uk</email>
+            <url>http://www.cacoethes.co.uk/blog/</url>
+            <organization>SpringSource</organization>
+            <organizationUrl>http://www.springsource.com/</organizationUrl>
+            <timezone>0</timezone>
+        </developer>
+        <developer>
+            <id>tveil</id>
+            <name>Tim Veil</name>
+            <email>tveil@apache.org</email>
+        </developer>
     </developers>
 
     <modules>

Propchange: incubator/shiro/tags/shiro-root-1.0.0-incubating/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 21 18:31:49 2010
@@ -0,0 +1,2 @@
+/incubator/shiro/branches/session_manager_API_change/pom.xml:945409-945995
+/incubator/shiro/trunk/pom.xml:946769-947101