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 --combined 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>
@@@ -17,9 -24,7 +24,7 @@@
      </description>
  
      <properties>
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-         <xerces.groupId>org.apache.xerces</xerces.groupId>
-         <xerces.version>2.10.0</xerces.version>
+         <svn.relative.location>java-shib-idp2</svn.relative.location>
      </properties>
  
      <repositories>
          <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 -->
  
          <!-- Runtime dependencies -->
          <dependency>
-             <groupId>${xerces.groupId}</groupId>
-             <artifactId>xml-apis</artifactId>
-             <version>${xerces.version}</version>
-             <scope>runtime</scope>
-         </dependency>
-         <dependency>
-             <groupId>${xerces.groupId}</groupId>
-             <artifactId>xercesImpl</artifactId>
-             <version>${xerces.version}</version>
-             <scope>runtime</scope>
-         </dependency>
-         <dependency>
-             <groupId>xml-resolver</groupId>
-             <artifactId>xml-resolver</artifactId>
-             <version>1.2</version>
-             <scope>runtime</scope>
-         </dependency>
-         <dependency>
-             <groupId>xalan</groupId>
-             <artifactId>xalan</artifactId>
-             <version>2.7.1</version>
-             <scope>runtime</scope>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.ant</groupId>
-             <artifactId>ant-nodeps</artifactId>
-             <version>1.7.1</version>
-             <scope>runtime</scope>
+             <groupId>org.bouncycastle</groupId>
+             <artifactId>bcprov-jdk15</artifactId>
+             <version>1.45</version>
          </dependency>
          <dependency>
              <groupId>ant-contrib</groupId>
              <scope>test</scope>
          </dependency>
          <dependency>
-             <groupId>xmlunit</groupId>
-             <artifactId>xmlunit</artifactId>
-             <version>1.0</version>
-             <scope>test</scope>
-         </dependency>
-         <dependency>
              <groupId>org.springframework</groupId>
              <artifactId>spring-test</artifactId>
              <version>2.5.6.SEC02</version>
                  </exclusion>
              </exclusions>
          </dependency>
-     </dependencies>
  
+         <!-- Managed Dependencies -->
+         <dependency>
+             <groupId>javax.servlet</groupId>
+             <artifactId>servlet-api</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>javax.servlet.jsp</groupId>
+             <artifactId>jsp-api</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>${xerces.groupId}</groupId>
+             <artifactId>xml-apis</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>${xerces.groupId}</groupId>
+             <artifactId>xercesImpl</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>${xerces.groupId}</groupId>
+             <artifactId>serializer</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>xml-resolver</groupId>
+             <artifactId>xml-resolver</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>${xalan.groupId}</groupId>
+             <artifactId>xalan</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>xmlunit</groupId>
+             <artifactId>xmlunit</artifactId>
+         </dependency>
+     </dependencies>
      <distributionManagement>
          <repository>
              <id>release</id>
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-compiler-plugin</artifactId>
-                 <version>2.3.2</version>
-                 <configuration>
-                     <source>1.5</source>
-                     <target>1.5</target>
-                     <debug>true</debug>
-                 </configuration>
-             </plugin>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-assembly-plugin</artifactId>
-                 <version>2.2.1</version>
-                 <configuration>
-                     <descriptors>
-                         <descriptor>src/main/assembly/bin.xml</descriptor>
-                     </descriptors>
-                     <tarLongFileMode>gnu</tarLongFileMode>
-                 </configuration>
-                 <executions>
-                     <execution>
-                         <id>make-assembly</id>
-                         <phase>package</phase>
-                         <goals>
-                             <goal>attached</goal>
-                         </goals>
-                     </execution>
-                 </executions>
-             </plugin>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-surefire-plugin</artifactId>
-                 <version>2.8</version>
-                 <configuration>
-                     <argLine>-Xmx256m</argLine>
-                 </configuration>
-             </plugin>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-jar-plugin</artifactId>
                  <version>2.3.1</version>
                  <configuration>
                      </archive>
                  </configuration>
              </plugin>
          </plugins>
      </build>
  
-     <reporting>
-         <plugins>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-javadoc-plugin</artifactId>
-                 <version>2.8</version>
-                 <configuration>
-                     <links>
-                         <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-                         <link>http://joda-time.sourceforge.net/apidocs/</link>
-                         <link>http://static.springsource.org/spring/docs/2.0.x/api/</link>
-                     </links>
-                     <quiet>true</quiet>
-                     <author>false</author>
-                     <version>true</version>
-                     <doctitle>${project.name} ${project.version} Java API.</doctitle>
-                     <windowtitle>${project.name} ${project.version} Java API.</windowtitle>
-                     <overview>src/main/java/overview.html</overview>
-                 </configuration>
-             </plugin>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-jxr-plugin</artifactId>
-                 <version>2.2</version>
-                 <configuration>
-                     <outputDirectory>${project.reporting.outputDirectory}/xref</outputDirectory>
-                     <doctitle>${project.name} ${project.version} Code Cross-Reference</doctitle>
-                     <windowtitle>${project.name} ${project.version} Java API.</windowtitle>
-                     <javadocDir>${project.reporting.outputDirectory}/apidocs</javadocDir>
-                 </configuration>
-             </plugin>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-surefire-report-plugin</artifactId>
-                 <version>2.8.1</version>
-                 <configuration>
-                     <outputDirectory>${project.reporting.outputDirectory}/unitTest</outputDirectory>
-                     <xrefLocation>${project.reporting.outputDirectory}/xref</xrefLocation>
-                 </configuration>
-             </plugin>
-         </plugins>
-     </reporting>
      <profiles>
          <profile>
              <id>release</id>
                  <plugins>
                      <plugin>
                          <groupId>org.apache.maven.plugins</groupId>
-                         <artifactId>maven-javadoc-plugin</artifactId>
-                         <version>2.8</version>
-                         <executions>
-                             <execution>
-                                 <id>release-javadoc</id>
-                                 <phase>package</phase>
-                                 <goals>
-                                     <goal>javadoc</goal>
-                                 </goals>
-                             </execution>
-                         </executions>
-                     </plugin>
-                     <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-                         <artifactId>maven-jxr-plugin</artifactId>
-                         <version>2.2</version>
-                         <executions>
-                             <execution>
-                                 <id>release-jxr</id>
-                                 <phase>package</phase>
-                                 <goals>
-                                     <goal>jxr</goal>
-                                 </goals>
-                             </execution>
-                         </executions>
-                     </plugin>
-                     <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-                         <artifactId>maven-surefire-report-plugin</artifactId>
-                         <version>2.9</version>
-                         <executions>
-                             <execution>
-                                 <id>release-unitTest</id>
-                                 <phase>package</phase>
-                                 <goals>
-                                     <goal>report-only</goal>
-                                 </goals>
-                             </execution>
-                         </executions>
-                     </plugin>
-                     <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
                          <artifactId>maven-assembly-plugin</artifactId>
                          <version>2.2.1</version>
-                         <executions>
-                             <execution>
-                                 <id>make-assembly</id>
-                                 <phase>package</phase>
-                                 <goals>
-                                     <goal>attached</goal>
-                                 </goals>
-                             </execution>
-                         </executions>
-                     </plugin>
-                     <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-                         <artifactId>maven-gpg-plugin</artifactId>
-                         <version>1.3</version>
-                         <executions>
-                             <execution>
-                                 <id>sign-artifacts</id>
-                                 <phase>verify</phase>
-                                 <goals>
-                                     <goal>sign</goal>
-                                 </goals>
-                             </execution>
-                         </executions>
+                         <configuration>
+                             <descriptors>
+                                 <descriptor>src/main/assembly/bin.xml</descriptor>
+                             </descriptors>
+                         </configuration>
                      </plugin>
                  </plugins>
              </build>