You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2009/07/28 09:31:01 UTC
svn commit: r798426 - in /geronimo/server/trunk:
framework/configs/j2ee-security/src/main/history/dependencies.xml
plugins/cxf/cxf/src/main/history/dependencies.xml pom.xml
Author: xuhaihong
Date: Tue Jul 28 07:31:00 2009
New Revision: 798426
URL: http://svn.apache.org/viewvc?rev=798426&view=rev
Log:
Add the xalan to the exclude list of cxf-rt-ws-security, jaxb-api to the exclude list of geronimo-jaspi
Modified:
geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml?rev=798426&r1=798425&r2=798426&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml Tue Jul 28 07:31:00 2009
@@ -26,4 +26,9 @@
<artifactId>rmi-naming</artifactId>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaspi_1.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=798426&r1=798425&r2=798426&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml Tue Jul 28 07:31:00 2009
@@ -111,9 +111,4 @@
<artifactId>wss4j</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=798426&r1=798425&r2=798426&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Jul 28 07:31:00 2009
@@ -342,6 +342,12 @@
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi</artifactId>
<version>1.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1907,6 +1913,10 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
</exclusions>
</dependency>