Merge pull request sakaiproject#639 from ern/SAK-29498

SAK-29498 upgrade elasticsearch to 1.6.0
slmsshk · Jun 12, 2015 · 60d509e · 60d509e
2 parents e227086 + e460595
commit 60d509e
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 27 deletions.
diff --git a/deploy/shared/pom.xml b/deploy/shared/pom.xml
@@ -67,22 +67,10 @@
             of hibernate-3.2.7.ga) despite the fact that the kernel does not explicitly 
             define these jars as dependencies. -->
 
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>1.5.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-attrs</artifactId>
-            <version>1.5.3</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-            <version>2.1_3</version>
+            <artifactId>cglib-nodep</artifactId>
+            <version>3.1</version>
             <scope>compile</scope>
         </dependency>
 
@@ -188,7 +176,7 @@
         <dependency>
         	<groupId>com.spatial4j</groupId>
         	<artifactId>spatial4j</artifactId>
-        	<version>0.4.1</version>
+            <version>${sakai.spatial4j.version}</version>
         	<scope>compile</scope>
         </dependency>
         <dependency>
@@ -197,6 +185,42 @@
         	<version>${sakai.elasticsearch.version}</version>
         	<scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>${sakai.asm.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>${sakai.asm.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>${sakai.jna.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr-runtime</artifactId>
+            <version>${sakai.antlr-runtime.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <version>${sakai.groovy.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>apache-log4j-extras</artifactId>
+            <version>${sakai.log4j.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <!-- jackson libs need to be in shared with spring -->
         <dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>

diff --git a/edu-services/gradebook-service/impl/pom.xml b/edu-services/gradebook-service/impl/pom.xml
@@ -118,7 +118,6 @@
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
-            <version>2.1_3</version>
         </dependency>
         <dependency>
             <groupId>odmg</groupId>

diff --git a/edu-services/sections-service/sections-impl/standalone/pom.xml b/edu-services/sections-service/sections-impl/standalone/pom.xml
@@ -84,9 +84,7 @@
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
-            <version>2.1_3</version>
             <scope>provided</scope>
-            <!-- FIXME: is this required here ? -->
         </dependency>
         <dependency>
             <groupId>odmg</groupId>

diff --git a/gradebook/app/business/pom.xml b/gradebook/app/business/pom.xml
@@ -138,7 +138,6 @@
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
     </dependency>
     <dependency>
       <groupId>odmg</groupId>

diff --git a/gradebook/app/ui/pom.xml b/gradebook/app/ui/pom.xml
@@ -175,7 +175,6 @@
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
     </dependency>
     <dependency>
       <groupId>odmg</groupId>

diff --git a/hierarchy/impl/pom.xml b/hierarchy/impl/pom.xml
@@ -136,7 +136,6 @@
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
-            <version>2.1_3</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/master/pom.xml b/master/pom.xml
@@ -88,7 +88,7 @@
     <sakai.ehcache.groupId>net.sf.ehcache</sakai.ehcache.groupId>
     <sakai.ehcache.artifactId>ehcache-core</sakai.ehcache.artifactId>
     <sakai.ehcache.version>2.6.6</sakai.ehcache.version>
-    <sakai.elasticsearch.version>1.1.2</sakai.elasticsearch.version>
+    <sakai.elasticsearch.version>1.6.0</sakai.elasticsearch.version>
     <sakai.hibernate.groupId>org.hibernate</sakai.hibernate.groupId>
     <sakai.hibernate.artifactId>hibernate-core</sakai.hibernate.artifactId>
     <sakai.hibernate.version>3.6.10.Final</sakai.hibernate.version>
@@ -97,11 +97,16 @@
     <sakai.jts.version>1.13</sakai.jts.version>
     <sakai.lombok.version>1.12.4</sakai.lombok.version>
     <sakai.jackson.version>2.3.4</sakai.jackson.version>
-    <sakai.lucene.version>4.7.2</sakai.lucene.version>
+    <sakai.lucene.version>4.10.4</sakai.lucene.version>
     <sakai.pluto.version>1.1.7</sakai.pluto.version>
     <sakai.quartz.version>1.8.6</sakai.quartz.version>
     <sakai.servletapi.version>2.4</sakai.servletapi.version>
     <sakai.sigar.version>1.6.4</sakai.sigar.version>
+    <sakai.spatial4j.version>0.4.1</sakai.spatial4j.version>
+    <sakai.groovy.version>2.4.0</sakai.groovy.version>
+    <sakai.jna.version>4.1.0</sakai.jna.version>
+    <sakai.antlr-runtime.version>3.5</sakai.antlr-runtime.version>
+    <sakai.asm.version>4.1</sakai.asm.version>
     <sakai.spring.groupId>org.springframework</sakai.spring.groupId>
     <sakai.spring.artifactId>spring-core</sakai.spring.artifactId>
     <sakai.spring.version>3.2.13.RELEASE</sakai.spring.version>
@@ -112,6 +117,7 @@
     <sakai.velocity.version>1.6.4</sakai.velocity.version>
     <sakai.xerces.impl.version>2.6.2</sakai.xerces.impl.version>
     <sakai.xerces.api.version>2.6.2</sakai.xerces.api.version>
+    <sakai.log4j.version>1.2.17</sakai.log4j.version>
     <sakai.slf4j.version>1.7.5</sakai.slf4j.version>
     <rsfutil.version>0.8.1-SNAPSHOT</rsfutil.version>
     <sakairsf.components.version>11-SNAPSHOT</sakairsf.components.version>
@@ -359,7 +365,7 @@
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <version>1.2.16</version>
+        <version>${sakai.log4j.version}</version>
         <scope>provided</scope>
         <exclusions>
           <exclusion>
@@ -483,7 +489,7 @@
       <dependency>
         <groupId>cglib</groupId>
         <artifactId>cglib-nodep</artifactId>
-        <version>2.2</version>
+        <version>3.1</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -886,6 +892,41 @@
       	<artifactId>jts</artifactId>
       	<version>${sakai.jts.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.spatial4j</groupId>
+        <artifactId>spatial4j</artifactId>
+        <version>${sakai.spatial4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm</artifactId>
+        <version>${sakai.asm.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm-commons</artifactId>
+        <version>${sakai.asm.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.java.dev.jna</groupId>
+        <artifactId>jna</artifactId>
+        <version>${sakai.jna.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.antlr</groupId>
+        <artifactId>antlr-runtime</artifactId>
+        <version>${sakai.antlr-runtime.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-all</artifactId>
+        <version>${sakai.groovy.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>apache-log4j-extras</artifactId>
+        <version>${sakai.log4j.version}</version>
+      </dependency>
       <!-- Sakai apis -->
       <dependency>
         <groupId>org.sakaiproject.accountvalidator</groupId>

diff --git a/reset-pass/account-validator-impl/pom.xml b/reset-pass/account-validator-impl/pom.xml
@@ -130,7 +130,6 @@
 		<dependency>
 			<groupId>cglib</groupId>
 			<artifactId>cglib-nodep</artifactId>
-			<version>2.1_3</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>

diff --git a/sitestats/sitestats-impl/pom.xml b/sitestats/sitestats-impl/pom.xml
@@ -193,7 +193,8 @@
         </dependency>
         <dependency>
             <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
+            <artifactId>cglib-full</artifactId>
+            <version>2.0.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>