CSPACE-6375: Changes to get ant import task working again.

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index fcaeb487b477e01c8212f14560f09e9015f6cafd..e7c377700e040484cfae59b7d42416940c0282aa 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -332,36 +332,6 @@
             <version>${spring.version}</version>
             <scope>provided</scope>
         </dependency>
-        <!--dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-acl</artifactId>
-            <version>${spring.security.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>aopalliance</groupId>
-            <artifactId>aopalliance</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>1.6.2</version>
-            <optional>true</optional>
-        </dependency-->
 
         <!-- javax -->
         <dependency>

diff --git a/services/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml
index 423f228766bd162b3cc4efedec8524e9d90af573..67faf26afde2400e02413dbb8f2a50fe661f9f47 100644 (file)
--- a/services/authorization-mgt/client/pom.xml
+++ b/services/authorization-mgt/client/pom.xml
@@ -83,7 +83,6 @@
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
         </dependency>
 
         <dependency>
@@ -143,7 +142,6 @@
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
-            <version>1.6.2</version>
             <optional>true</optional>
         </dependency>
         <dependency>

diff --git a/services/authorization-mgt/import/pom.xml b/services/authorization-mgt/import/pom.xml
index fdaaf8a08e2a861bd759fee8bd7d04b2faedea4a..e5d7e7966e24f685dfbb68bc63192311d8ae99ac 100644 (file)
--- a/services/authorization-mgt/import/pom.xml
+++ b/services/authorization-mgt/import/pom.xml
@@ -1,174 +1,242 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.collectionspace.services</groupId>
-        <artifactId>org.collectionspace.services.authorization-mgt</artifactId>
-        <version>4.2-SNAPSHOT</version>
-    </parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <parent>
+               <groupId>org.collectionspace.services</groupId>
+               <artifactId>org.collectionspace.services.authorization-mgt</artifactId>
+               <version>4.2-SNAPSHOT</version>
+       </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.collectionspace.services.authorization-mgt.import</artifactId>
-    <name>services.authorization-mgt.import</name>
-    <properties>
-        <generate_only>false</generate_only>
-        <spring.version>3.0.0.RELEASE</spring.version>
-        <spring.security.version>3.0.2.RELEASE</spring.security.version>
-    </properties>
-    
-    <dependencies>
-        <!-- keep slf4j dependencies on the top -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
-        <!-- CollectionSpace dependencies -->
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.authentication.service</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.authorization.service</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.authorization.jaxb</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-                   <groupId>org.collectionspace.services</groupId>
-               <artifactId>org.collectionspace.services.config</artifactId>
+       <modelVersion>4.0.0</modelVersion>
+       <artifactId>org.collectionspace.services.authorization-mgt.import</artifactId>
+       <name>services.authorization-mgt.import</name>
+       <properties>
+               <generate_only>false</generate_only>
+               <spring.version>3.0.0.RELEASE</spring.version>
+               <spring.security.version>3.0.2.RELEASE</spring.security.version>
+       </properties>
+
+       <dependencies>
+               <!-- keep slf4j dependencies on the top -->
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>slf4j-api</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>slf4j-log4j12</artifactId>
+               </dependency>
+               <!-- CollectionSpace dependencies -->
+               <dependency>
+                       <groupId>org.collectionspace.services</groupId>
+                       <artifactId>org.collectionspace.services.authentication.service</artifactId>
                        <version>${project.version}</version>
-        </dependency>        
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.common</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.account.client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.authorization-mgt.service</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.authorization-mgt.client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 3rd Pary dependencies -->
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-core</artifactId>
-            <version>${spring.security.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
-            <version>${spring.security.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-acl</artifactId>
-            <version>${spring.security.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-            <version>${spring.security.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-            <version>${spring.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>aopalliance</groupId>
-            <artifactId>aopalliance</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <!--dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
-            <scope>provided</scope>
-        </dependency-->
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>1.6.2</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-                               <dependency>
-                                               <groupId>postgresql</groupId>
-                                               <artifactId>postgresql</artifactId>
-                               </dependency>
-        <dependency>
-            <groupId>ch.elca.el4j.modules</groupId>
-            <artifactId>module-xml_merge-common</artifactId>
-            <version>3.1</version>
-        </dependency>          
-    </dependencies>
-    <!-- use profile as this task is not needed for every build and test -->
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.collectionspace.services</groupId>
+                       <artifactId>org.collectionspace.services.authorization.service</artifactId>
+                       <version>${project.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.collectionspace.services</groupId>
+                       <artifactId>org.collectionspace.services.authorization.jaxb</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.collectionspace.services</groupId>
+                       <artifactId>org.collectionspace.services.config</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.collectionspace.services</groupId>
+                       <artifactId>org.collectionspace.services.account.client</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.collectionspace.services</groupId>
+                       <artifactId>org.collectionspace.services.authorization-mgt.client</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <!-- 3rd Pary dependencies -->
+               <dependency>
+                       <groupId>org.testng</groupId>
+                       <artifactId>testng</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>commons-cli</groupId>
+                       <artifactId>commons-cli</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.security</groupId>
+                       <artifactId>spring-security-core</artifactId>
+                       <version>${spring.security.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.security</groupId>
+                       <artifactId>spring-security-config</artifactId>
+                       <version>${spring.security.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.security</groupId>
+                       <artifactId>spring-security-acl</artifactId>
+                       <version>${spring.security.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.security</groupId>
+                       <artifactId>spring-security-web</artifactId>
+                       <version>${spring.security.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context-support</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-aop</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>aopalliance</groupId>
+                       <artifactId>aopalliance</artifactId>
+                       <version>1.0</version>
+                       <scope>provided</scope>
+               </dependency>
+               <!--dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> 
+                       <version>${spring.version}</version> <scope>provided</scope> </dependency -->
+               <dependency>
+                       <groupId>net.sf.ehcache</groupId>
+                       <artifactId>ehcache</artifactId>
+                       <version>1.6.2</version>
+               </dependency>
+               <dependency>
+                       <groupId>mysql</groupId>
+                       <artifactId>mysql-connector-java</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>postgresql</groupId>
+                       <artifactId>postgresql</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>ch.elca.el4j.modules</groupId>
+                       <artifactId>module-xml_merge-common</artifactId>
+                       <version>3.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.collectionspace.services</groupId>
+                       <artifactId>
+                       org.collectionspace.services.authorization-mgt.service
+               </artifactId>
+                       <version>${project.version}</version>
+                       <exclusions>
+                               <exclusion>
+                                       <artifactId>nuxeo-core-query</artifactId>
+                                       <groupId>org.nuxeo.ecm.core</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-opencmis-bindings</artifactId>
+                                       <groupId>org.nuxeo.ecm.core</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-runtime</artifactId>
+                                       <groupId>org.nuxeo.runtime</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-core-api</artifactId>
+                                       <groupId>org.nuxeo.ecm.core</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-platform-types-core</artifactId>
+                                       <groupId>org.nuxeo.ecm.platform</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>
+                                               nuxeo-platform-filemanager-api
+                                       </artifactId>
+                                       <groupId>org.nuxeo.ecm.platform</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-core-schema</artifactId>
+                                       <groupId>org.nuxeo.ecm.core</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-platform-mimetype-api</artifactId>
+                                       <groupId>org.nuxeo.ecm.platform</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-core-io</artifactId>
+                                       <groupId>org.nuxeo.ecm.core</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-platform-types-api</artifactId>
+                                       <groupId>org.nuxeo.ecm.platform</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-runtime-launcher</artifactId>
+                                       <groupId>org.nuxeo.lib.runtime</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-core-storage-sql-ra</artifactId>
+                                       <groupId>org.nuxeo.ecm.core</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-platform-imaging-core</artifactId>
+                                       <groupId>org.nuxeo.ecm.platform</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-runtime-osgi</artifactId>
+                                       <groupId>org.nuxeo.runtime</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-platform-imaging-api</artifactId>
+                                       <groupId>org.nuxeo.ecm.platform</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-core-convert</artifactId>
+                                       <groupId>org.nuxeo.ecm.core</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>
+                                               nuxeo-platform-mimetype-core
+                                       </artifactId>
+                                       <groupId>org.nuxeo.ecm.platform</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>nuxeo-core-storage-sql</artifactId>
+                                       <groupId>org.nuxeo.ecm.core</groupId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+       </dependencies>
+
+       <!-- use profile as this task is not needed for every build and test -->
 
-    <build>
-        <finalName>cspace-services-authorization-mgt-import</finalName>
-                               <filters>
-                                       <filter>../../../build.properties</filter>
-                               </filters>
-                               <resources>
-                                       <resource>
-                                               <directory>src/main/resources</directory>
-                                               <filtering>true</filtering>
-                                       </resource>
-                               </resources>
-        <plugins>
+       <build>
+               <finalName>cspace-services-authorization-mgt-import</finalName>
+               <filters>
+                       <filter>../../../build.properties</filter>
+               </filters>
+               <resources>
+                       <resource>
+                               <directory>src/main/resources</directory>
+                               <filtering>true</filtering>
+                       </resource>
+               </resources>
+               <plugins>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-resources-plugin</artifactId>
@@ -182,56 +250,45 @@
                                        </execution>
                                </executions>
                        </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>org.collectionspace.ImportAuthz</mainClass>
-                    <arguments>
-                        <argument>-g</argument>
-                        <argument>${generate_only}</argument>
-                        <argument>-u</argument>
-                        <argument>SPRING_ADMIN</argument>
-                        <argument>-p</argument>
-                        <argument>does_not_matter</argument>
-                        <argument>-b</argument>
-                                                                                               <!-- This should be (Needs testing):
-                                                                                               <argument>${jboss.server.cspace}</argument>
-                                                                                               -->
-                        <argument>${env.CSPACE_JEESERVER_HOME}</argument>
-                        <argument>-edir</argument>
-                        <argument>${basedir}/target</argument>
-                    </arguments>
-                    <systemProperties>
-                    </systemProperties>
-                </configuration>
-                               
-                <dependencies>
-                                                                       <!--
-                    <dependency>
-                        <groupId>mysql</groupId>
-                        <artifactId>mysql-connector-java</artifactId>
-                                               <version>${mysql.driver.version}</version>
-                    </dependency>
-                                                                               -->
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>exec-maven-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <goals>
+                                                       <goal>java</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                               <configuration>
+                                       <mainClass>org.collectionspace.ImportAuthz</mainClass>
+                                       <arguments>
+                                               <argument>-g</argument>
+                                               <argument>${generate_only}</argument>
+                                               <argument>-u</argument>
+                                               <argument>SPRING_ADMIN</argument>
+                                               <argument>-p</argument>
+                                               <argument>does_not_matter</argument>
+                                               <argument>-b</argument>
+                                               <!-- This should be (Needs testing): <argument>${jboss.server.cspace}</argument> -->
+                                               <argument>${env.CSPACE_JEESERVER_HOME}</argument>
+                                               <argument>-edir</argument>
+                                               <argument>${basedir}/target</argument>
+                                       </arguments>
+                                       <systemProperties>
+                                       </systemProperties>
+                               </configuration>
+                               <dependencies>
+                                       <!-- <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> 
+                                               <version>${mysql.driver.version}</version> </dependency> -->
                                        <dependency>
                                                <groupId>postgresql</groupId>
                                                <artifactId>postgresql</artifactId>
                                                <version>${postgres.driver.version}</version>
                                        </dependency>
-                </dependencies>
-                               
-            </plugin>
-        </plugins>
-
-    </build>
-
+                               </dependencies>
+                       </plugin>
+               </plugins>
+       </build>
 </project>
 

diff --git a/services/authorization-mgt/import/src/main/resources/log4j.properties b/services/authorization-mgt/import/src/main/resources/log4j.properties
index 73353f981bda93955adc22974b81538a6205731d..1078dec6f625b98f34906dcb3b518ec31f7b0e01 100644 (file)
--- a/services/authorization-mgt/import/src/main/resources/log4j.properties
+++ b/services/authorization-mgt/import/src/main/resources/log4j.properties
@@ -34,12 +34,12 @@ log4j.logger.javax.persistence.PersistenceException=ERROR
 #
 # REM - 3/3/2015 temp for debugging
 #
-log4j.logger.org.springframework=TRACE
+log4j.logger.org.springframework=ERROR
 log4j.logger.net.sf.ehcache=TRACE
 
 #
 # Logging for the command line tool that generates the Service artifacts
 #
-#log4j.logger.org.collectionspace=INFO, commandline
-#log4j.additivity.org.collectionspace=false
+log4j.logger.org.collectionspace=INFO, commandline
+log4j.additivity.org.collectionspace=false
 

diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml
index b6040ff068ed6ef74b27b052b0ab12c34c2ae13e..5d041675c3061a4dc13d71c515987cfb6d564ffe 100644 (file)
--- a/services/authorization-mgt/service/pom.xml
+++ b/services/authorization-mgt/service/pom.xml
@@ -157,7 +157,6 @@
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
-            <version>1.6.2</version>
             <optional>true</optional>
         </dependency>
 

diff --git a/services/authorization/pom.xml b/services/authorization/pom.xml
index 9e3cf312db3c5a5253d2c09738c1192882d7fd62..f2e760ca7d543e15ee283707054aab75ff43db33 100644 (file)
--- a/services/authorization/pom.xml
+++ b/services/authorization/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
         <version>4.2-SNAPSHOT</version>
     </parent>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.authorization</artifactId>
     <name>services.authorization</name>
     <packaging>pom</packaging>

diff --git a/services/authorization/service/pom.xml b/services/authorization/service/pom.xml
index 38ad0d210596313e53d0e9be918894e6599c7a84..a7ca7ebc67b28205c84da313ae4609e6219bc714 100644 (file)
--- a/services/authorization/service/pom.xml
+++ b/services/authorization/service/pom.xml
@@ -136,7 +136,6 @@
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
-            <version>1.6.2</version>
             <optional>true</optional>
         </dependency>
         <dependency>

diff --git a/services/pom.xml b/services/pom.xml
index 0dd3513db31aeb2145fdd81530e5ee6a7dfad945..db891395e207c0ca8c49c6f447878391a03cb532 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -276,6 +276,11 @@
     
     <dependencyManagement>
         <dependencies>
+                       <dependency>
+                               <groupId>net.sf.ehcache</groupId>
+                               <artifactId>ehcache</artifactId>
+                               <version>2.7.7</version> <!-- More recent version is 2.9.1 -->
+                       </dependency>
                         <dependency>
                                <artifactId>servlet-api</artifactId>
                                <groupId>javax.servlet</groupId>