Author: prabath
Date: Wed Apr 2 13:18:13 2008
New Revision: 15498
Log:
1. Fixing openid4java version - 0.9.3.1
2. WSAS version 2.2 --> 2.2.1
3. Excluding xm-apis from openxri
Modified:
trunk/solutions/identity/modules/identity-provider/pom.xml
trunk/solutions/identity/modules/token-verifier-core/pom.xml
trunk/solutions/identity/pom.xml
Modified: trunk/solutions/identity/modules/identity-provider/pom.xml
==============================================================================
--- trunk/solutions/identity/modules/identity-provider/pom.xml (original)
+++ trunk/solutions/identity/modules/identity-provider/pom.xml Wed Apr 2
13:18:13 2008
@@ -1,167 +1,167 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <parent>
- <artifactId>identity-solution-parent</artifactId>
- <groupId>org.wso2.solutions.identity</groupId>
- <version>SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>wso2is-identity-provider</artifactId>
- <name>Identity Solution : Identity Provider</name>
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.wso2.commons.usermanager</groupId>
- <artifactId>user-verification</artifactId>
- <version>${usermanager.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.solutions.identity</groupId>
- <artifactId>wso2is-base</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.utils</groupId>
- <artifactId>wso2utils</artifactId>
- <version>${wsas.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>xmlsec</artifactId>
- <groupId>xml-security</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.wso2.wsas</groupId>
- <artifactId>wso2wsas-core</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <artifactId>xmlsec</artifactId>
- <groupId>xml-security</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.wso2.wsas</groupId>
- <artifactId>wso2wsas-admin</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>xmlsec</artifactId>
- <groupId>xml-security</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- <version>0.9.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.mex</groupId>
- <artifactId>wso2mex</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.xfer</groupId>
- <artifactId>wso2xfer</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.openid4java</groupId>
- <artifactId>openid4java-nodeps</artifactId>
- <version>0.9.5-SNAPSHOT</version>
- </dependency>
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <parent>
+ <artifactId>identity-solution-parent</artifactId>
+ <groupId>org.wso2.solutions.identity</groupId>
+ <version>SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wso2is-identity-provider</artifactId>
+ <name>Identity Solution : Identity Provider</name>
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.wso2.commons.usermanager</groupId>
+ <artifactId>user-verification</artifactId>
+ <version>${usermanager.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.solutions.identity</groupId>
+ <artifactId>wso2is-base</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.utils</groupId>
+ <artifactId>wso2utils</artifactId>
+ <version>2.2</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xmlsec</artifactId>
+ <groupId>xml-security</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.wsas</groupId>
+ <artifactId>wso2wsas-core</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xmlsec</artifactId>
+ <groupId>xml-security</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.wsas</groupId>
+ <artifactId>wso2wsas-admin</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>xmlsec</artifactId>
+ <groupId>xml-security</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>0.9.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.mex</groupId>
+ <artifactId>wso2mex</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.xfer</groupId>
+ <artifactId>wso2xfer</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java-nodeps</artifactId>
+ <version>0.9.3.1</version>
+ </dependency>
<!-- Begin opensaml-2.0 jars -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${jodatime.version}</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity</artifactId>
<exclusions>
- <exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <exclusion>
- <groupId>werken-xpath</groupId>
- <artifactId>werken-xpath</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>werken-xpath</groupId>
+ <artifactId>werken-xpath</artifactId>
+ </exclusion>
</exclusions>
<version>${velocity.version}</version>
- </dependency>
-
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>opensaml2</artifactId>
- <version>${opensaml2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>openws</artifactId>
- <version>${openws.version}</version>
- </dependency>
-
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>xmltooling</artifactId>
- <version>${xmltooling.version}</version>
- </dependency>
-
- <!-- End opensaml-2.0 jars -->
-
- </dependencies>
-</project>
+ </dependency>
+
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml2</artifactId>
+ <version>${opensaml2.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>openws</artifactId>
+ <version>${openws.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>xmltooling</artifactId>
+ <version>${xmltooling.version}</version>
+ </dependency>
+
+ <!-- End opensaml-2.0 jars -->
+
+ </dependencies>
+</project>
Modified: trunk/solutions/identity/modules/token-verifier-core/pom.xml
==============================================================================
--- trunk/solutions/identity/modules/token-verifier-core/pom.xml
(original)
+++ trunk/solutions/identity/modules/token-verifier-core/pom.xml Wed Apr
2 13:18:13 2008
@@ -56,83 +56,83 @@
<dependency>
<groupId>org.openid4java</groupId>
<artifactId>openid4java-nodeps</artifactId>
- <version>0.9.5-SNAPSHOT</version>
- </dependency>
-
+ <version>0.9.3.1</version>
+ </dependency>
+
<!-- Begin opensaml-2.0 jars -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${jodatime.version}</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity</artifactId>
<exclusions>
- <exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <exclusion>
- <groupId>werken-xpath</groupId>
- <artifactId>werken-xpath</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>werken-xpath</groupId>
+ <artifactId>werken-xpath</artifactId>
+ </exclusion>
</exclusions>
<version>${velocity.version}</version>
- </dependency>
-
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>opensaml2</artifactId>
- <version>${opensaml2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>openws</artifactId>
- <version>${openws.version}</version>
- </dependency>
-
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>xmltooling</artifactId>
- <version>${xmltooling.version}</version>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml2</artifactId>
+ <version>${opensaml2.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>openws</artifactId>
+ <version>${openws.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>xmltooling</artifactId>
+ <version>${xmltooling.version}</version>
+ </dependency>
- <!-- End opensaml-2.0 jars -->
+ <!-- End opensaml-2.0 jars -->
</dependencies>
Modified: trunk/solutions/identity/pom.xml
==============================================================================
--- trunk/solutions/identity/pom.xml (original)
+++ trunk/solutions/identity/pom.xml Wed Apr 2 13:18:13 2008
@@ -124,6 +124,7 @@
<url>http://dist.wso2.org/maven2</url>
</repository>
+ <!--
<repository>
<releases>
<enabled>true</enabled>
@@ -137,8 +138,9 @@
</snapshots>
<id>alchim.snapshots</id>
<name>Achim Repository Snapshots</name>
- <url>http://alchim.sourceforge.net/download/snapshots</url>
- </repository>
+ <url>http://alchim.sourceforge.net/download/releases</url>
+ </repository>
+ -->
<repository>
<releases>
@@ -154,7 +156,7 @@
<id>jboss</id>
<name>JBoss Repo</name>
<url>http://repository.jboss.org/maven2</url>
- </repository>
+ </repository>
</repositories>
@@ -513,7 +515,7 @@
<groupId>opensaml</groupId>
<artifactId>opensaml</artifactId>
<version>${opensaml.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
@@ -674,6 +676,12 @@
<groupId>org.openxri</groupId>
<artifactId>openxri-syntax</artifactId>
<version>1.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -689,6 +697,10 @@
<groupId>xml-security</groupId>
<artifactId>xmlsec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -793,7 +805,7 @@
<wss4j.version>SNAPSHOT</wss4j.version>
<axiom.version>SNAPSHOT</axiom.version>
- <wsas.version>2.2</wsas.version>
+ <wsas.version>2.2.1</wsas.version>
<axis2.version>1.3</axis2.version>
<addressing.version>1.3</addressing.version>
<addressing.mar.version>1.3</addressing.mar.version>
@@ -835,12 +847,12 @@
<dir.build>target/tmp</dir.build>
<dir.build.wsas>${dir.build}/wso2wsas-${wsas.version}</dir.build.wsas>
- <openid.version>0.9.5-SNAPSHOT</openid.version>
+ <openid.version>0.9.3.1</openid.version>
<slf4j.version>1.4.3</slf4j.version>
<jodatime.version>1.5.1</jodatime.version>
- <velocity.version>1.5</velocity.version>
- <opensaml2.version>2.0-alpha1</opensaml2.version>
- <openws.version>1.0</openws.version>
+ <velocity.version>1.5</velocity.version>
+ <opensaml2.version>2.0-alpha1</opensaml2.version>
+ <openws.version>1.0</openws.version>
<xmltooling.version>1.0</xmltooling.version>
</properties>
</project>
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
