[jboss-cvs] Picketlink SVN: r1552 - in product/branches/Branch_6_plus: picketlink-core and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: pskopek at redhat.com
Date: 2012-04-18 07:23:29 -0400 (Wed, 18 Apr 2012)
New Revision: 1552

Modified:
   product/branches/Branch_6_plus/parent/pom.xml
   product/branches/Branch_6_plus/picketlink-core/
   product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java
   product/branches/Branch_6_plus/picketlink-webapps/picketlink-sts/
Log:
[JBPAPP-8762] fix, changing apache santuario xmlsec dependency version to 1.5.1 to align with what we have in EAP6.
xmlsec version was changed in EAP6 by jbossws project.  

Modified: product/branches/Branch_6_plus/parent/pom.xml
===================================================================
--- product/branches/Branch_6_plus/parent/pom.xml	2012-04-16 08:04:11 UTC (rev 1551)
+++ product/branches/Branch_6_plus/parent/pom.xml	2012-04-18 11:23:29 UTC (rev 1552)
@@ -119,7 +119,7 @@
       <dependency>
          <groupId>org.apache.santuario</groupId>
          <artifactId>xmlsec</artifactId>
-         <version>1.4.3</version>
+         <version>1.5.1</version>
          <optional>true</optional>
       </dependency>
       <dependency>


Property changes on: product/branches/Branch_6_plus/picketlink-core
___________________________________________________________________
Modified: svn:ignore
   - .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata

   + .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata
.externalToolBuilders


Modified: product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java
===================================================================
--- product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java	2012-04-16 08:04:11 UTC (rev 1551)
+++ product/branches/Branch_6_plus/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java	2012-04-18 11:23:29 UTC (rev 1552)
@@ -100,7 +100,7 @@
       catch (Exception err)
       {
          // JDK5
-         xsf = XMLSignatureFactory.getInstance("DOM", new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
+         xsf = XMLSignatureFactory.getInstance("DOM", new org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI());
       }
       return xsf;
    }


Property changes on: product/branches/Branch_6_plus/picketlink-webapps/picketlink-sts
___________________________________________________________________
Modified: svn:ignore
   - .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata

   + .settings
target
target-eclipse
eclipse-target
.project
.classpath
.settings
.metadata
.externalToolBuilders