decrease verbosity and logging messge of error message logged when a name ID can...

[java-idp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 9227c47..aec6ee4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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>
+    
     <groupId>edu.internet2.middleware</groupId>
     <artifactId>shibboleth-identityprovider</artifactId>
-    <version>2.1.3</version>
+    <version>2.2.0-SNAPSHOT</version>
+    
     <!-- We bundle as a jar here, the installer creates the WAR -->
     <packaging>jar</packaging>
 
@@ -30,10 +33,6 @@
             <id>release-repo</id>
             <url>${dist.release.url}</url>
         </repository>
-        <snapshotRepository>
-            <id>snapshot-repo</id>
-            <url>${dist.snapshot.url}</url>
-        </snapshotRepository>
     </distributionManagement>
 
     <dependencies>
@@ -41,7 +40,7 @@
         <dependency>
             <groupId>edu.internet2.middleware</groupId>
             <artifactId>shibboleth-common</artifactId>
-            <version>1.1.3</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -111,6 +110,12 @@
             <artifactId>ant-extensions</artifactId>
             <version>13Apr2008</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk14</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>edu.internet2.middleware</groupId>
@@ -150,6 +155,13 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.5</source>
@@ -199,7 +211,7 @@
                                 <manifestEntries>
                                     <Implementation-Title>${pom.artifactId}</Implementation-Title>
                                     <Implementation-Version>${pom.version}</Implementation-Version>
-                                    <Implementation-Vendor>www.opensaml.org</Implementation-Vendor>
+                                    <Implementation-Vendor>shibboleth.internet2.edu</Implementation-Vendor>
                                 </manifestEntries>
                             </manifestSection>
                         </manifestSections>
@@ -217,8 +229,8 @@
                 <configuration>
                     <links>
                         <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-                        <link>http://joda-time.sourceforge.net/apidocs/index.html</link>
-                        <link>http://static.springsource.org/spring/docs/2.0.x/api/index.html</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>
@@ -292,6 +304,7 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <!--
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -305,6 +318,7 @@
                             </execution>
                         </executions>
                     </plugin>
+                    -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-report-plugin</artifactId>
@@ -349,7 +363,7 @@
     </profiles>
     
     <!-- Project Metadata -->
-    <url>https://shibboleth.internet2.edu/</url>
+    <url>http://shibboleth.internet2.edu/</url>
     
     <inceptionYear>2006</inceptionYear>