Author: dkulp
Date: Wed Apr 11 14:01:25 2007
New Revision: 527670
URL: http://svn.apache.org/viewvc?view=rev&rev=527670
Log:
Update security dependencies to minimize them a bit.
Update javato to put it's generated code in the tests, not normal build.
Modified:
incubator/cxf/trunk/rt/ws/security/pom.xml
incubator/cxf/trunk/tools/javato/pom.xml
Modified: incubator/cxf/trunk/rt/ws/security/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/pom.xml?view=diff&rev=527670&r1=527669&r2=527670
==============================================================================
--- incubator/cxf/trunk/rt/ws/security/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/security/pom.xml Wed Apr 11 14:01:25 2007
@@ -34,16 +34,6 @@
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -60,13 +50,57 @@
<artifactId>cxf-common-utilities</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>wss4j</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>1.3.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ <version>136</version>
+ <scope>runtime</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-common</artifactId>
<version>${project.version}</version>
@@ -84,53 +118,16 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
- <groupId>wss4j</groupId>
- <artifactId>wss4j</artifactId>
- <version>1.5.1</version>
- </dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.0</version>
- </dependency>
- <!-- We should get these properly uploaded -->
- <dependency>
- <groupId>xfire</groupId>
- <artifactId>opensaml</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.xfire</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>133</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/cxf/trunk/tools/javato/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/pom.xml?view=diff&rev=527670&r1=527669&r2=527670
==============================================================================
--- incubator/cxf/trunk/tools/javato/pom.xml (original)
+++ incubator/cxf/trunk/tools/javato/pom.xml Wed Apr 11 14:01:25 2007
@@ -133,10 +133,10 @@
<version>${project.version}</version>
<executions>
<execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
+ <id>generate-test-sources</id>
+ <phase>generate-test-sources</phase>
<configuration>
-
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
+
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<wsdlOptions>
<wsdlOption>
<wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_async.wsdl</wsdl>
