cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1235520 - in /cxf/branches/2.5.x-fixes: ./ 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:59:35 GMT
Author: dkulp
Date: Tue Jan 24 21:59:35 2012
New Revision: 1235520

URL: http://svn.apache.org/viewvc?rev=1235520&view=rev
Log:
Merged revisions 1235518 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1235518 | dkulp | 2012-01-24 16:54:32 -0500 (Tue, 24 Jan 2012) | 1 line
  
  Mark a bunch of things optional that we don't need all the time
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/distribution/pom.xml
    cxf/branches/2.5.x-fixes/services/sts/sts-core/pom.xml
    cxf/branches/2.5.x-fixes/services/sts/sts-war/pom.xml
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/pom.xml
    cxf/branches/2.5.x-fixes/services/sts/systests/basic/pom.xml
    cxf/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.5.x-fixes/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/pom.xml?rev=1235520&r1=1235519&r2=1235520&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/distribution/pom.xml Tue Jan 24 21:59:35 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/branches/2.5.x-fixes/services/sts/sts-core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/sts-core/pom.xml?rev=1235520&r1=1235519&r2=1235520&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/sts-core/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/services/sts/sts-core/pom.xml Tue Jan 24 21:59:35 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/branches/2.5.x-fixes/services/sts/sts-war/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/sts-war/pom.xml?rev=1235520&r1=1235519&r2=1235520&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/sts-war/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/services/sts/sts-war/pom.xml Tue Jan 24 21:59:35 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/branches/2.5.x-fixes/services/sts/systests/advanced/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/pom.xml?rev=1235520&r1=1235519&r2=1235520&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/pom.xml Tue Jan 24 21:59:35 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/branches/2.5.x-fixes/services/sts/systests/basic/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/pom.xml?rev=1235520&r1=1235519&r2=1235520&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/pom.xml Tue Jan 24 21:59:35 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/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml?rev=1235520&r1=1235519&r2=1235520&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security-examples/pom.xml Tue Jan 24 21:59:35 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>



Mime
View raw message