Merge branch 'master' into frontchannel-slo v2.3.4-slo10
authorTamas Frank <sitya@niif.hu>
Thu, 27 Oct 2011 18:10:12 +0000 (20:10 +0200)
committerTamas Frank <sitya@niif.hu>
Thu, 27 Oct 2011 18:10:12 +0000 (20:10 +0200)
Conflicts:
pom.xml

pom.xml

diff --git a/pom.xml b/pom.xml
index e217e1c..77a3cac 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>edu.internet2.middleware</groupId>
     <artifactId>shibboleth-identityprovider</artifactId>
-    <version>2.3.4</version>
+    <version>2.3.4-slo10</version>
 
     <!-- We bundle as a jar here, the installer creates the WAR -->
     <packaging>jar</packaging>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>edu.internet2.middleware</groupId>
             <artifactId>shibboleth-common</artifactId>
-            <version>1.3.4</version>
+            <version>1.3.4-slo2</version>
         </dependency>
 
         <!-- Provided dependencies -->