From b5e9bdbebd159ffe1d0c7fccc0c098336ea9eba7 Mon Sep 17 00:00:00 2001
From: Martin Ledvinka <martin.ledvinka@fel.cvut.cz>
Date: Mon, 26 Aug 2024 17:51:14 +0200
Subject: [PATCH] [Upd] Update dependencies, require Java 17.

---
 pom.xml                                       | 19 +++++++-------
 .../deserialization/InstanceBuilder.java      | 26 +++++++++----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7208615..8daf4f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,15 +15,16 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <java.version>17</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
 
-        <cz.cvut.kbss.jopa.version>1.2.2</cz.cvut.kbss.jopa.version>
+        <cz.cvut.kbss.jopa.version>2.0.4</cz.cvut.kbss.jopa.version>
 
-        <org.junit.jupiter.version>5.9.2</org.junit.jupiter.version>
-        <org.mockito.version>4.11.0</org.mockito.version>
-        <ch.qos.logback.version>1.4.14</ch.qos.logback.version>
-        <org.eclipse.rdf4j.version>4.3.10</org.eclipse.rdf4j.version>
+        <org.junit.jupiter.version>5.11.0</org.junit.jupiter.version>
+        <org.mockito.version>5.12.0</org.mockito.version>
+        <ch.qos.logback.version>1.5.7</ch.qos.logback.version>
+        <org.eclipse.rdf4j.version>5.0.2</org.eclipse.rdf4j.version>
     </properties>
 
     <dependencies>
@@ -79,13 +80,13 @@
         <dependency>
             <groupId>com.apicatalog</groupId>
             <artifactId>titanium-json-ld</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.parsson</groupId>
             <artifactId>jakarta.json</artifactId>
-            <version>1.1.5</version>
+            <version>1.1.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/cz/cvut/kbss/jsonld/deserialization/InstanceBuilder.java b/src/main/java/cz/cvut/kbss/jsonld/deserialization/InstanceBuilder.java
index 5e10047..c087319 100644
--- a/src/main/java/cz/cvut/kbss/jsonld/deserialization/InstanceBuilder.java
+++ b/src/main/java/cz/cvut/kbss/jsonld/deserialization/InstanceBuilder.java
@@ -23,7 +23,6 @@
 import cz.cvut.kbss.jsonld.exception.JsonLdDeserializationException;
 
 import java.util.List;
-import java.util.Optional;
 
 /**
  * Builds instances from parsed JSON-LD.
@@ -58,8 +57,8 @@ public interface InstanceBuilder {
      * <p>
      * The new instance also becomes the currently open object.
      * <p>
-     * This method is intended for creating top level objects or adding objects to collections. Use {@link
-     * #openObject(String, String, List)} for opening objects as values of attributes.
+     * This method is intended for creating top level objects or adding objects to collections. Use
+     * {@link #openObject(String, String, List)} for opening objects as values of attributes.
      *
      * @param <T> The type of the object to open
      * @param id  Identifier of the object being open
@@ -82,8 +81,8 @@ public interface InstanceBuilder {
      * <p>
      * The new collection also becomes the currently open object.
      * <p>
-     * This method should also verify cardinality, i.e. a collection cannot be set as value of a field mapped by {@code
-     * property}, if the field is singular.
+     * This method should also verify cardinality, i.e. a collection cannot be set as value of a field mapped by
+     * {@code property}, if the field is singular.
      * <p>
      * This method assumes that the property is mapped, i.e. that {@link #isPropertyMapped(String)} returned true.
      *
@@ -99,8 +98,8 @@ public interface InstanceBuilder {
      * <p>
      * The new collection also becomes the currently open object.
      * <p>
-     * This method is intended for creating top level collections or nesting collections. Use {@link
-     * #openCollection(String)} for opening collections as values of attributes.
+     * This method is intended for creating top level collections or nesting collections. Use
+     * {@link #openCollection(String)} for opening collections as values of attributes.
      *
      * @param collectionType Type of the JSON collection to instantiate in Java
      * @see #openCollection(String)
@@ -188,8 +187,8 @@ public interface InstanceBuilder {
      * Checks whether the current collection context represents a {@link cz.cvut.kbss.jopa.model.annotations.Properties}
      * attribute.
      *
-     * @return {@code true} if the current context is a collection representing a {@link
-     * cz.cvut.kbss.jopa.model.annotations.Properties} field
+     * @return {@code true} if the current context is a collection representing a
+     * {@link cz.cvut.kbss.jopa.model.annotations.Properties} field
      */
     boolean isCurrentCollectionProperties();
 
@@ -239,11 +238,12 @@ public interface InstanceBuilder {
 
     /**
      * Gets the target type of the specified property.
-     *
-     * That is, it retrieves the type of the field to which the specified property is mapped. If the target field is a collection,
-     * the element type is returned (equivalent to {@link #getCurrentCollectionElementType()}).
-     *
+     * <p>
+     * That is, it retrieves the type of the field to which the specified property is mapped. If the target field is a
+     * collection, the element type is returned (equivalent to {@link #getCurrentCollectionElementType()}).
+     * <p>
      * This method assumes that the property is mapped, i.e. that {@link #isPropertyMapped(String)} returned true.
+     *
      * @param property Property whose target type to resolve
      * @return Target type wrapped in an optional
      */