Upgrade dependencies

* Upgrade log4j
* Upgrade netty
* Upgrade cats
* Upgrade eff
* Upgrade upickle
* Upgrade h2

Author: loveleif

gradle/libs.versions.toml

@@ -1,23 +1,23 @@
 [versions]
 apache-commons-text = "1.14.0"
 bctls = "1.59"
-cats = "1.6.0"
+cats = "2.13.0"
 claimant = "0.0.2"
 cypher-frontend = "9.0.20190305"
 cypher-tck = "1.0.0-M14"
 discipline = "0.11.0"
-eff = "5.0.0"
+eff = "7.0.6"
 fastparse = "2.1.0"
-h2 = "1.4.196"
+h2 = "2.4.240"
 # Note: has shared transitive dependencies with spark
 hadoop = "3.3.4"
 junit-main = "4.12"
 junit-runner = "1.0.2"
-log4j-main = "2.11.0"
-log4j-scala = "11.0"
+log4j-main = "2.25.2"
+log4j-scala = "13.1.0"
 mockito = "1.10.19"
 neo4j-driver = "1.7.2"
-netty = "4.1.24.Final"
+netty = "4.2.7.Final"
 # @pin - let's prevent automatic updates for the moment
 scala-full = "2.12.20"
 # @pin - let's prevent automatic updates for the moment
@@ -26,7 +26,7 @@ scalacheck = "1.14.0"
 scalatest = "3.0.6"
 spark = "3.5.7"
 testcontainers = "2.0.2"
-upickle = "0.7.1"
+upickle = "4.4.1"
 
 [libraries]
 apache-commons-text = { module = "org.apache.commons:commons-text", version.ref = "apache-commons-text" }

morpheus-examples/src/main/resources/northwind/sql/northwind_data.sql

@@ -57,15 +57,15 @@ INSERT INTO Territories VALUES ('98004','Bellevue',2);
 INSERT INTO Territories VALUES ('98052','Redmond',2);
 INSERT INTO Territories VALUES ('98104','Seattle',2);
 
-INSERT INTO Employees VALUES(2,'Fuller','Andrew','Vice President, Sales','Dr.',TO_DATE('1952-02-19','YYYY-MM-DD'),TO_DATE('1992-08-14','YYYY-MM-DD'),'908 W. Capital Way','Tacoma','WA','98401','USA','(206) 555-9482','3457',NULL,NULL,NULL,'http://accweb/emmployees/fuller.bmp');
-INSERT INTO Employees VALUES(1,'Davolio','Nancy','Sales Representative','Ms.',TO_DATE('1948-12-08','YYYY-MM-DD'),TO_DATE('1992-05-01','YYYY-MM-DD'),'507 - 20th Ave. E.Apt. 2A','Seattle','WA','98122','USA','(206) 555-9857','5467',NULL,NULL,2,'http://accweb/emmployees/davolio.bmp');
-INSERT INTO Employees VALUES(3,'Leverling','Janet','Sales Representative','Ms.',TO_DATE('1963-08-30','YYYY-MM-DD'),TO_DATE('1992-04-01','YYYY-MM-DD'),'722 Moss Bay Blvd.','Kirkland','WA','98033','USA','(206) 555-3412','3355',NULL,NULL,2,'http://accweb/emmployees/leverling.bmp');
-INSERT INTO Employees VALUES(4,'Peacock','Margaret','Sales Representative','Mrs.',TO_DATE('1937-09-19','YYYY-MM-DD'),TO_DATE('1993-05-03','YYYY-MM-DD'),'4110 Old Redmond Rd.','Redmond','WA','98052','USA','(206) 555-8122','5176',NULL,NULL,2,'http://accweb/emmployees/peacock.bmp');
-INSERT INTO Employees VALUES(5,'Buchanan','Steven','Sales Manager','Mr.',TO_DATE('1955-03-04','YYYY-MM-DD'),TO_DATE('1993-10-17','YYYY-MM-DD'),'14 Garrett Hill','London',NULL,'SW1 8JR','UK','(71) 555-4848','3453',NULL,NULL,2,'http://accweb/emmployees/buchanan.bmp');
-INSERT INTO Employees VALUES(6,'Suyama','Michael','Sales Representative','Mr.',TO_DATE('1963-07-02','YYYY-MM-DD'),TO_DATE('1993-10-17','YYYY-MM-DD'),'Coventry House Miner Rd.','London',NULL,'EC2 7JR','UK','(71) 555-7773','428',NULL,NULL,5,'http://accweb/emmployees/davolio.bmp');
-INSERT INTO Employees VALUES(7,'King','Robert','Sales Representative','Mr.',TO_DATE('1960-05-29','YYYY-MM-DD'),TO_DATE('1994-01-02','YYYY-MM-DD'),'Edgeham Hollow Winchester Way','London',NULL,'RG1 9SP','UK','(71) 555-5598','465',NULL,NULL,5,'http://accweb/emmployees/davolio.bmp');
-INSERT INTO Employees VALUES(8,'Callahan','Laura','Inside Sales Coordinator','Ms.',TO_DATE('1958-01-09','YYYY-MM-DD'),TO_DATE('1994-03-05','YYYY-MM-DD'),'4726 - 11th Ave. N.E.','Seattle','WA','98105','USA','(206) 555-1189','2344',NULL,NULL,2,'http://accweb/emmployees/davolio.bmp');
-INSERT INTO Employees VALUES(9,'Dodsworth','Anne','Sales Representative','Ms.',TO_DATE('1966-01-27','YYYY-MM-DD'),TO_DATE('1994-11-15','YYYY-MM-DD'),'7 Houndstooth Rd.','London',NULL,'WG2 7LT','UK','(71) 555-4444','452',NULL,NULL,5,'http://accweb/emmployees/davolio.bmp');
+INSERT INTO Employees VALUES(2,'Fuller','Andrew','Vice President, Sales','Dr.',DATE '1952-02-19',DATE '1992-08-14','908 W. Capital Way','Tacoma','WA','98401','USA','(206) 555-9482','3457',NULL,NULL,NULL,'http://accweb/emmployees/fuller.bmp');
+INSERT INTO Employees VALUES(1,'Davolio','Nancy','Sales Representative','Ms.',DATE '1948-12-08',DATE '1992-05-01','507 - 20th Ave. E.Apt. 2A','Seattle','WA','98122','USA','(206) 555-9857','5467',NULL,NULL,2,'http://accweb/emmployees/davolio.bmp');
+INSERT INTO Employees VALUES(3,'Leverling','Janet','Sales Representative','Ms.',DATE '1963-08-30',DATE '1992-04-01','722 Moss Bay Blvd.','Kirkland','WA','98033','USA','(206) 555-3412','3355',NULL,NULL,2,'http://accweb/emmployees/leverling.bmp');
+INSERT INTO Employees VALUES(4,'Peacock','Margaret','Sales Representative','Mrs.',DATE '1937-09-19',DATE '1993-05-03','4110 Old Redmond Rd.','Redmond','WA','98052','USA','(206) 555-8122','5176',NULL,NULL,2,'http://accweb/emmployees/peacock.bmp');
+INSERT INTO Employees VALUES(5,'Buchanan','Steven','Sales Manager','Mr.',DATE '1955-03-04',DATE '1993-10-17','14 Garrett Hill','London',NULL,'SW1 8JR','UK','(71) 555-4848','3453',NULL,NULL,2,'http://accweb/emmployees/buchanan.bmp');
+INSERT INTO Employees VALUES(6,'Suyama','Michael','Sales Representative','Mr.',DATE '1963-07-02',DATE '1993-10-17','Coventry House Miner Rd.','London',NULL,'EC2 7JR','UK','(71) 555-7773','428',NULL,NULL,5,'http://accweb/emmployees/davolio.bmp');
+INSERT INTO Employees VALUES(7,'King','Robert','Sales Representative','Mr.',DATE '1960-05-29',DATE '1994-01-02','Edgeham Hollow Winchester Way','London',NULL,'RG1 9SP','UK','(71) 555-5598','465',NULL,NULL,5,'http://accweb/emmployees/davolio.bmp');
+INSERT INTO Employees VALUES(8,'Callahan','Laura','Inside Sales Coordinator','Ms.',DATE '1958-01-09',DATE '1994-03-05','4726 - 11th Ave. N.E.','Seattle','WA','98105','USA','(206) 555-1189','2344',NULL,NULL,2,'http://accweb/emmployees/davolio.bmp');
+INSERT INTO Employees VALUES(9,'Dodsworth','Anne','Sales Representative','Ms.',DATE '1966-01-27',DATE '1994-11-15','7 Houndstooth Rd.','London',NULL,'WG2 7LT','UK','(71) 555-4444','452',NULL,NULL,5,'http://accweb/emmployees/davolio.bmp');
 
 INSERT INTO EmployeeTerritories VALUES (1,'06897');
 INSERT INTO EmployeeTerritories VALUES (1,'19713');

morpheus-examples/src/main/resources/northwind/sql/northwind_schema.sql

@@ -28,7 +28,7 @@ CREATE TABLE Employees
         ReportsTo
     ) REFERENCES Employees (
         EmployeeID
-    ),
+    )
 
 );
 

morpheus-examples/src/main/scala/org/opencypher/morpheus/util/NorthwindDB.scala

@@ -38,7 +38,7 @@ object NorthwindDB {
   def init(sqlDataSourceConfig: SqlDataSourceConfig.Jdbc): Unit = {
 
     withConnection(sqlDataSourceConfig) { connection =>
-      connection.execute("DROP SCHEMA IF EXISTS NORTHWIND")
+      connection.execute("DROP SCHEMA IF EXISTS NORTHWIND CASCADE")
       connection.execute("CREATE SCHEMA NORTHWIND")
       connection.setSchema("NORTHWIND")
 

morpheus-spark-cypher/src/main/scala/org/opencypher/morpheus/api/MorpheusSession.scala

@@ -26,7 +26,6 @@
  */
 package org.opencypher.morpheus.api
 
-import java.io.File
 import java.util.UUID
 
 import org.apache.spark.SparkConf
@@ -42,6 +41,7 @@ import org.opencypher.okapi.impl.exception.UnsupportedOperationException
 import org.opencypher.okapi.relational.api.graph.RelationalCypherSession
 import org.opencypher.okapi.relational.api.planning.RelationalCypherResult
 
+import java.nio.file.Files
 import scala.reflect.runtime.universe._
 
 /**
@@ -94,18 +94,19 @@ object MorpheusSession extends Serializable {
     */
   def create(implicit sparkSession: SparkSession): MorpheusSession = new MorpheusSession(sparkSession)
 
-  val localSparkConf: SparkConf = {
+  def localSparkConf: SparkConf = {
     val conf = new SparkConf(true)
     conf.set("spark.sql.codegen.wholeStage", "true")
     conf.set("spark.sql.shuffle.partitions", "12")
-    conf.set("spark.default.parallelism", "8")
+    conf.set("spark.default.parallelism", Runtime.getRuntime.availableProcessors().toString)
     // Required for left outer join without join expressions in OPTIONAL MATCH (leads to cartesian product)
     conf.set("spark.sql.crossJoin.enabled", "true")
     // We should probably remove this setting. Hide errors like: You're using untyped Scala UDF, which does not have the input type information. Spark may blindly pass null to the Scala closure with primitive-type argument, and the closure will see the default value of the Java type for the null argument, e.g. `udf((x: Int) => x, IntegerType)`, the result is 0 for null input.
     conf.set("spark.sql.legacy.allowUntypedScalaUDF", "true")
 
     // Store Hive tables in local temp folder
-    conf.set("spark.sql.warehouse.dir", s"${System.getProperty("java.io.tmpdir")}${File.separator}spark-warehouse-${System.nanoTime()}")
+    conf.set("spark.sql.warehouse.dir", Files.createTempDirectory("spark-warehouse").toString)
+    conf.set("spark.hadoop.hive.metastore.warehouse.dir", Files.createTempDirectory("hive-warehouse").toString)
     // Configure Hive to run with in-memory Derby (skips writing metastore_db)
     conf.set("javax.jdo.option.ConnectionURL", "jdbc:derby:memory:metastore_db;create=true")
     conf.set("javax.jdo.option.ConnectionDriverName", "org.apache.derby.jdbc.EmbeddedDriver")

morpheus-testing/src/main/scala/org/opencypher/morpheus/testing/fixture/H2Fixture.scala

@@ -39,7 +39,7 @@ trait H2Fixture extends SparkSessionFixture {
   }
 
   def dropH2Database(cfg: SqlDataSourceConfig.Jdbc, name: String): Unit = {
-    withConnection(cfg) { conn => conn.execute(s"DROP SCHEMA IF EXISTS $name")}
+    withConnection(cfg) { conn => conn.execute(s"DROP SCHEMA IF EXISTS $name CASCADE")}
   }
 
   def freshH2Database(cfg: SqlDataSourceConfig.Jdbc, name: String): Unit = {

okapi-api/src/main/scala/org/opencypher/okapi/api/schema/PropertyGraphSchema.scala

@@ -48,7 +48,11 @@ object PropertyGraphSchema {
   )
 
   def fromJson(jsonString: String): PropertyGraphSchema =
-    upickle.default.read[PropertyGraphSchema](jsonString)
+    try upickle.default.read[PropertyGraphSchema](jsonString)
+    catch {
+      case throwable: Throwable if Option(throwable.getCause).exists(_.getClass.getPackageName.startsWith("org.opencypher")) =>
+        throw throwable.getCause
+    }
 }
 
 /**

okapi-api/src/main/scala/org/opencypher/okapi/impl/schema/PropertyGraphSchemaImpl.scala

@@ -88,7 +88,7 @@ object PropertyGraphSchemaImpl {
         case other => throw SchemaException(s"Expected Version to be a String or a Number but got $other")
       }
       val version = Version(versionString)
-      if(!version.compatibleWith(PropertyGraphSchema.CURRENT_VERSION)) throw SchemaException("Incompatible Schema versions")
+      if(!version.compatibleWith(PropertyGraphSchema.CURRENT_VERSION)) throw SchemaException(s"Incompatible Schema version: $version")
 
       val labelPropertyMap = read[LabelPropertyMap](json.obj(LABEL_PROPERTY_MAP))
       val relTypePropertyMap = read[RelTypePropertyMap](json.obj(REL_TYPE_PROPERTY_MAP))

okapi-api/src/test/scala/org/opencypher/okapi/api/schema/PropertyGraphSchemaTest.scala

@@ -803,8 +803,11 @@ class PropertyGraphSchemaTest extends ApiBaseTest {
         s"${PropertyGraphSchema.CURRENT_VERSION.major + 1}.0",
         s"${PropertyGraphSchema.CURRENT_VERSION.major - 1}.5"
       ).foreach { v =>
-        an[SchemaException] shouldBe thrownBy {
-          PropertyGraphSchema.fromJson(schemaJson(Version(v)))
+        val json = schemaJson(Version(v))
+        withClue(s"json: $json") {
+          an[SchemaException] shouldBe thrownBy {
+            PropertyGraphSchema.fromJson(json)
+          }
         }
       }
     }