Return-Path: 
 <commits-return-17828-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DEBE091AB
	for <apmail-cxf-commits-archive@www.apache.org>;
 Tue, 24 Jan 2012 21:54:54 +0000 (UTC)
Received: (qmail 7783 invoked by uid 500); 24 Jan 2012 21:54:54 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 7732 invoked by uid 500); 24 Jan 2012 21:54:54 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 7725 invoked by uid 99); 24 Jan 2012 21:54:54 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jan 2012 21:54:54 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jan 2012 21:54:53 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 0D53D2388A36
	for <commits@cxf.apache.org>; Tue, 24 Jan 2012 21:54:33 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1235518 - in /cxf/trunk: distribution/pom.xml
 services/sts/sts-core/pom.xml services/sts/sts-war/pom.xml
 services/sts/systests/advanced/pom.xml services/sts/systests/basic/pom.xml
 systests/ws-security-examples/pom.xml
Date: Tue, 24 Jan 2012 21:54:32 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120124215433.0D53D2388A36@eris.apache.org>

Author: dkulp
Date: Tue Jan 24 21:54:32 2012
New Revision: 1235518

URL: http://svn.apache.org/viewvc?rev=1235518&view=rev
Log:
Mark a bunch of things optional that we don't need all the time

Modified:
    cxf/trunk/distribution/pom.xml
    cxf/trunk/services/sts/sts-core/pom.xml
    cxf/trunk/services/sts/sts-war/pom.xml
    cxf/trunk/services/sts/systests/advanced/pom.xml
    cxf/trunk/services/sts/systests/basic/pom.xml
    cxf/trunk/systests/ws-security-examples/pom.xml

Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=1235518&r1=1235517&r2=1235518&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Tue Jan 24 21:54:32 2012
@@ -338,6 +338,16 @@
             <groupId>org.apache.cxf.services.wsn</groupId>
             <artifactId>cxf-services-wsn-core</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activemq-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jms_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

Modified: cxf/trunk/services/sts/sts-core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/pom.xml?rev=1235518&r1=1235517&r2=1235518&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/pom.xml (original)
+++ cxf/trunk/services/sts/sts-core/pom.xml Tue Jan 24 21:54:32 2012
@@ -51,19 +51,22 @@
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache-core</artifactId>
             <version>${cxf.ehcache.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
            <groupId>org.springframework.ldap</groupId>
            <artifactId>spring-ldap-core</artifactId>
            <version>${cxf.spring.ldap.version}</version>
-           <scope>compile</scope>
+           <scope>provided</scope>
+           <optional>true</optional>
         </dependency>
         <dependency>
            <groupId>com.hazelcast</groupId>
            <artifactId>hazelcast</artifactId>
            <version>${cxf.hazelcast.version}</version>
-           <scope>compile</scope>
+           <scope>provided</scope>
+           <optional>true</optional>
         </dependency> 
         <dependency>
             <groupId>junit</groupId>

Modified: cxf/trunk/services/sts/sts-war/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/pom.xml?rev=1235518&r1=1235517&r2=1235518&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-war/pom.xml (original)
+++ cxf/trunk/services/sts/sts-war/pom.xml Tue Jan 24 21:54:32 2012
@@ -56,6 +56,23 @@
             <artifactId>slf4j-jdk14</artifactId>
             <scope>runtime</scope>
         </dependency>
+
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache-core</artifactId>
+            <version>${cxf.ehcache.version}</version>
+        </dependency>
+        <dependency>
+           <groupId>org.springframework.ldap</groupId>
+           <artifactId>spring-ldap-core</artifactId>
+           <version>${cxf.spring.ldap.version}</version>
+        </dependency>
+        <dependency>
+           <groupId>com.hazelcast</groupId>
+           <artifactId>hazelcast</artifactId>
+           <version>${cxf.hazelcast.version}</version>
+        </dependency> 
+
     </dependencies>
 
     <profiles>

Modified: cxf/trunk/services/sts/systests/advanced/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/pom.xml?rev=1235518&r1=1235517&r2=1235518&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/pom.xml (original)
+++ cxf/trunk/services/sts/systests/advanced/pom.xml Tue Jan 24 21:54:32 2012
@@ -89,6 +89,21 @@
            <artifactId>slf4j-jdk14</artifactId>
            <scope>runtime</scope>
        </dependency>
+       <dependency>
+           <groupId>net.sf.ehcache</groupId>
+           <artifactId>ehcache-core</artifactId>
+           <version>${cxf.ehcache.version}</version>
+       </dependency>
+       <dependency>
+          <groupId>org.springframework.ldap</groupId>
+          <artifactId>spring-ldap-core</artifactId>
+          <version>${cxf.spring.ldap.version}</version>
+       </dependency>
+       <dependency>
+          <groupId>com.hazelcast</groupId>
+          <artifactId>hazelcast</artifactId>
+          <version>${cxf.hazelcast.version}</version>
+       </dependency> 
     </dependencies>
 
     <build>

Modified: cxf/trunk/services/sts/systests/basic/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/pom.xml?rev=1235518&r1=1235517&r2=1235518&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/pom.xml (original)
+++ cxf/trunk/services/sts/systests/basic/pom.xml Tue Jan 24 21:54:32 2012
@@ -83,6 +83,21 @@
            <artifactId>slf4j-jdk14</artifactId>
            <scope>runtime</scope>
        </dependency>
+       <dependency>
+           <groupId>net.sf.ehcache</groupId>
+           <artifactId>ehcache-core</artifactId>
+           <version>${cxf.ehcache.version}</version>
+       </dependency>
+       <dependency>
+          <groupId>org.springframework.ldap</groupId>
+          <artifactId>spring-ldap-core</artifactId>
+          <version>${cxf.spring.ldap.version}</version>
+       </dependency>
+       <dependency>
+          <groupId>com.hazelcast</groupId>
+          <artifactId>hazelcast</artifactId>
+          <version>${cxf.hazelcast.version}</version>
+       </dependency> 
     </dependencies>
 
     <build>

Modified: cxf/trunk/systests/ws-security-examples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security-examples/pom.xml?rev=1235518&r1=1235517&r2=1235518&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security-examples/pom.xml (original)
+++ cxf/trunk/systests/ws-security-examples/pom.xml Tue Jan 24 21:54:32 2012
@@ -160,6 +160,21 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+           <groupId>net.sf.ehcache</groupId>
+           <artifactId>ehcache-core</artifactId>
+           <version>${cxf.ehcache.version}</version>
+       </dependency>
+       <dependency>
+          <groupId>org.springframework.ldap</groupId>
+          <artifactId>spring-ldap-core</artifactId>
+          <version>${cxf.spring.ldap.version}</version>
+       </dependency>
+       <dependency>
+          <groupId>com.hazelcast</groupId>
+          <artifactId>hazelcast</artifactId>
+          <version>${cxf.hazelcast.version}</version>
+       </dependency> 
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
             <version>${project.version}</version>