DRYD-630: Fix groovy version conflict.

diff --git a/services/common/build.xml b/services/common/build.xml
index e73f9793331224463efff62644036db6cdfb28e2..c5fce124a3314c11ed93b528a770b12e7e45c23e 100644 (file)
--- a/services/common/build.xml
+++ b/services/common/build.xml
@@ -229,6 +229,7 @@
             <fileset dir="${jee.server.cspace}/lib" includes="aopalliance-*.jar"/>
             <fileset dir="${jee.server.cspace}/lib" includes="commons-lang3-*.jar"/>
             <fileset dir="${jee.server.cspace}/lib" includes="ehcache-*.jar"/>
+            <fileset dir="${jee.server.cspace}/lib" includes="groovy-*.jar"/>
             <fileset dir="${jee.server.cspace}/lib" includes="jackson-*.jar"/>
             <fileset dir="${jee.server.cspace}/lib" includes="org.springframework.*.jar"/>
             <fileset dir="${jee.server.cspace}/lib" includes="spring-*.jar"/>

diff --git a/services/common/lib/nuxeo/nuxeo-core-api-9.10-HF30.jar b/services/common/lib/nuxeo/nuxeo-core-api-9.10-HF30.jar
deleted file mode 100644 (file)
index b605790..0000000
Binary files a/services/common/lib/nuxeo/nuxeo-core-api-9.10-HF30.jar and /dev/null differ

diff --git a/services/common/lib/spring/groovy-all-2.4.16.jar b/services/common/lib/spring/groovy-all-2.4.12.jar
similarity index 59%
rename from services/common/lib/spring/groovy-all-2.4.16.jar
rename to services/common/lib/spring/groovy-all-2.4.12.jar
index 16fa82af2e492c82ee4e7e5f6846b07d9e613442..b255074d7661e3a704e363401f50b1a2eb20575d 100644 (file)
Binary files a/services/common/lib/spring/groovy-all-2.4.16.jar and b/services/common/lib/spring/groovy-all-2.4.12.jar differ

diff --git a/services/report/pom.xml b/services/report/pom.xml
index 5946b854f3de3c31fe30577bd80e0ff42005fed7..d81e56744327753164ce3b2da2a38b5c7693752b 100644 (file)
--- a/services/report/pom.xml
+++ b/services/report/pom.xml
@@ -31,7 +31,7 @@
                                </exclusion>
                        </exclusions>
                </dependency>
-               <!-- Jasper Reports fonts are still at 4.0.0, but are compatible with later 
+               <!-- Jasper Reports fonts are still at 4.0.0, but are compatible with later
                        software releases - ADR 2012-06-05 -->
                <!-- http://jasperforge.org/plugins/espforum/view.php?group_id=102&forumid=103&topicid=97145 -->
                <dependency>
@@ -40,7 +40,7 @@
                        <version>4.0.0</version>
                </dependency>
                <!-- For some reason, have to declare this dependency explicitly, ot it does not find it.
-                       It is a dependency of jasperreports 5.0.1 
+                       It is a dependency of jasperreports 5.0.1
                        -->
                <dependency>
                        <groupId>com.lowagie</groupId>
@@ -52,7 +52,7 @@
                <dependency>
                        <groupId>org.codehaus.groovy</groupId>
                        <artifactId>groovy-all</artifactId>
-                       <version>2.4.0</version>
+                       <version>2.4.12</version>
                </dependency>
        </dependencies>
 
@@ -65,4 +65,3 @@
        </modules>
 
 </project>
-