SAK-47954 Global upgrade apache ignite to 2.14.0 (sakaiproject#10939)

https://sakaiproject.atlassian.net/browse/SAK-47954
V100X · Oct 17, 2022 · 6de8258 · 6de8258
1 parent 782f0bd
commit 6de8258
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 36 deletions.
diff --git a/deploy/pom.xml b/deploy/pom.xml
@@ -858,12 +858,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-hibernate-core</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>ignite-hibernate_5.3</artifactId>
+            <artifactId>ignite-hibernate-ext</artifactId>
             <scope>compile</scope>
         </dependency>
 

diff --git a/kernel/api/pom.xml b/kernel/api/pom.xml
@@ -136,8 +136,8 @@
             <artifactId>hibernate-entitymanager</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>ignite-hibernate_5.3</artifactId>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-hibernate-ext</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml
@@ -266,11 +266,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-hibernate-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>ignite-hibernate_5.3</artifactId>
+            <artifactId>ignite-hibernate-ext</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.ignite</groupId>

diff --git a/master/pom.xml b/master/pom.xml
@@ -44,9 +44,9 @@
     <sakai.httpmime.version>4.5.13</sakai.httpmime.version>
     <sakai.httpclient5.version>5.1.3</sakai.httpclient5.version>
     <sakai.httpcore5.version>5.1.4</sakai.httpcore5.version>
-    <sakai.ignite.version>2.12.0</sakai.ignite.version>
+    <sakai.ignite.version>2.14.0</sakai.ignite.version>
     <sakai.ignite.spring.ext.version>1.0.0</sakai.ignite.spring.ext.version>
-    <sakai.gridgain.version>8.8.7</sakai.gridgain.version>
+    <sakai.ignite.hibernate.version>5.3.0</sakai.ignite.hibernate.version>
     <sakai.jackson.version>2.13.4</sakai.jackson.version>
     <sakai.jsoup.version>1.14.2</sakai.jsoup.version>
     <sakai.woodstox.version>6.3.1</sakai.woodstox.version>
@@ -56,7 +56,7 @@
     <sakai.jaxb.version>2.3.6</sakai.jaxb.version>
     <sakai.jstl.version>1.2</sakai.jstl.version>
     <sakai.lombok.version>1.18.24</sakai.lombok.version>
-    <sakai.lucene.version>8.10.1</sakai.lucene.version>
+    <sakai.lucene.version>8.11.2</sakai.lucene.version>
     <sakai.netty.version>4.1.77.Final</sakai.netty.version>
     <sakai.org.json.version>20210307</sakai.org.json.version>
     <sakai.pluto.version>1.1.7</sakai.pluto.version>
@@ -84,7 +84,7 @@
     <sakai.okiosid.version>2.0</sakai.okiosid.version>
     <joda.time.version>2.11.1</joda.time.version>
     <sakai.weld.shaded.version>3.1.8.Final</sakai.weld.shaded.version>
-    <jayway.jsonpath.version>2.6.0</jayway.jsonpath.version>
+    <jayway.jsonpath.version>2.7.0</jayway.jsonpath.version>
     <sakai.jakarta.jstl-api.version>1.2.5</sakai.jakarta.jstl-api.version>
     <sakai.genericdao.version>0.12.0</sakai.genericdao.version>
     <reflectutils.version>0.9.20</reflectutils.version>
@@ -307,17 +307,6 @@
         <checksumPolicy>ignore</checksumPolicy>
       </snapshots>
     </repository>
-    <repository>
-      <id>gridgain</id>
-      <name>Gridgain Systems</name>
-      <url>https://gridgainsystems.com/nexus/content/repositories/external</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
     <repository>
       <id>shib-release</id>
       <url>https://build.shibboleth.net/nexus/content/groups/public</url>
@@ -482,14 +471,8 @@
       </dependency>
       <dependency>
         <groupId>org.apache.ignite</groupId>
-        <artifactId>ignite-hibernate-core</artifactId>
-        <version>${sakai.ignite.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.gridgain</groupId>
-        <artifactId>ignite-hibernate_5.3</artifactId>
-        <version>${sakai.gridgain.version}</version>
+        <artifactId>ignite-hibernate-ext</artifactId>
+        <version>${sakai.ignite.hibernate.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>