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

1  2 
pom.xml

diff --cc pom.xml
+++ b/pom.xml
@@@ -1,11 -1,18 +1,18 @@@
  <?xml version="1.0" encoding="UTF-8"?>
- <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">
      <modelVersion>4.0.0</modelVersion>
+     <parent>
+         <groupId>net.shibboleth</groupId>
+         <artifactId>parent</artifactId>
+         <version>2</version>
+     </parent>
      <groupId>edu.internet2.middleware</groupId>
      <artifactId>shibboleth-identityprovider</artifactId>
-     <version>2.3.3-slo10</version>
 -    <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>
@@@ -44,7 -49,7 +49,7 @@@
          <dependency>
              <groupId>edu.internet2.middleware</groupId>
              <artifactId>shibboleth-common</artifactId>
-             <version>1.3.3-slo2</version>
 -            <version>1.3.4</version>
++            <version>1.3.4-slo2</version>
          </dependency>
  
          <!-- Provided dependencies -->