From 64d236fa58ca7e5c517c27d05dfe45854b9ce7f6 Mon Sep 17 00:00:00 2001 From: Florian Habermann Date: Wed, 15 Jan 2025 10:08:06 +0100 Subject: [PATCH 1/3] 2.1.1 docs (#362) --- docs/antora.yml | 4 ++-- docs/modules/intro/pages/changelog.adoc | 9 +++++++++ storage/embedded-tools/storage-converter/README.md | 2 +- storage/embedded-tools/storage-migrator/README.md | 6 +++--- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index d5bd7f80..94b86a2d 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -8,6 +8,6 @@ nav: asciidoc: attributes: product-name: 'EclipseStore' - display-version: '2.1.0' + display-version: '2.1.1' api-version: '2' - maven-version: '2.1.0' + maven-version: '2.1.1' diff --git a/docs/modules/intro/pages/changelog.adoc b/docs/modules/intro/pages/changelog.adoc index cae3fef9..d9f005d9 100644 --- a/docs/modules/intro/pages/changelog.adoc +++ b/docs/modules/intro/pages/changelog.adoc @@ -1,6 +1,15 @@ = Changelog +== 2.1.1 + +=== Bugfixes + +* Logger settings adjustments https://github.com/eclipse-serializer/serializer/pull/164[[164]] +* Dependency update to resolve vulnerability https://github.com/eclipse-store/store/pull/360[[360]] https://github.com/eclipse-store/store/pull/361[[361]] +* Register LockAspect as Spring Bean https://github.com/eclipse-store/store/pull/355[[355]] https://github.com/eclipse-store/store/issues/356[[356]] + + == 2.1.0 === Features diff --git a/storage/embedded-tools/storage-converter/README.md b/storage/embedded-tools/storage-converter/README.md index f1a2f3f6..0423c169 100644 --- a/storage/embedded-tools/storage-converter/README.md +++ b/storage/embedded-tools/storage-converter/README.md @@ -22,7 +22,7 @@ mvn -Pconverter-standalone clean package To configure the input and output storage an [external configuration](https://docs.eclipsestore.io/manual/storage/configuration/index.html#external-configuration) file for each storage is required. ```console -java -jar storage-embedded-tools-storage-converter-2.1.0.jar sourceCongig.xml targetConfig.xml +java -jar storage-embedded-tools-storage-converter-2.1.1.jar sourceCongig.xml targetConfig.xml ``` ### StorageConverter.java diff --git a/storage/embedded-tools/storage-migrator/README.md b/storage/embedded-tools/storage-migrator/README.md index 2b4da372..541d964c 100644 --- a/storage/embedded-tools/storage-migrator/README.md +++ b/storage/embedded-tools/storage-migrator/README.md @@ -16,17 +16,17 @@ The type dictionary migration is only done when `typeDictionaryRelativePath` is ### Migration of both, source code and type dictionary: ```` -mvn org.openrewrite.maven:rewrite-maven-plugin:run -Drewrite.activeRecipes=org.eclipse.store.storage.embedded.tools.storage.migrator.ConvertProject -Drewrite.recipeArtifactCoordinates=org.eclipse.store:storage-embedded-tools-storage-migrator:2.1.0 -DeclipseStoreVersion=2.1.0 -Drewrite.plainTextMasks=**/*.ptd -DtypeDictionaryRelativeFilePath=src/main/resources/PersistenceTypeDictionary.ptd +mvn org.openrewrite.maven:rewrite-maven-plugin:run -Drewrite.activeRecipes=org.eclipse.store.storage.embedded.tools.storage.migrator.ConvertProject -Drewrite.recipeArtifactCoordinates=org.eclipse.store:storage-embedded-tools-storage-migrator:2.1.1 -DeclipseStoreVersion=2.1.1 -Drewrite.plainTextMasks=**/*.ptd -DtypeDictionaryRelativeFilePath=src/main/resources/PersistenceTypeDictionary.ptd ```` ### Migration of source code only: ```` -mvn org.openrewrite.maven:rewrite-maven-plugin:run -Drewrite.activeRecipes=org.eclipse.store.storage.embedded.tools.storage.migrator.ConvertProject -Drewrite.recipeArtifactCoordinates=org.eclipse.store:storage-embedded-tools-storage-migrator:2.1.0 -DeclipseStoreVersion=2.1.0 +mvn org.openrewrite.maven:rewrite-maven-plugin:run -Drewrite.activeRecipes=org.eclipse.store.storage.embedded.tools.storage.migrator.ConvertProject -Drewrite.recipeArtifactCoordinates=org.eclipse.store:storage-embedded-tools-storage-migrator:2.1.1 -DeclipseStoreVersion=2.1.1 ```` ### Migration of type dictionary only: ```` -mvn org.openrewrite.maven:rewrite-maven-plugin:run -Drewrite.activeRecipes=org.eclipse.store.storage.embedded.tools.storage.migrator.ConvertProject -Drewrite.recipeArtifactCoordinates=org.eclipse.store:storage-embedded-tools-storage-migrator:2.1.0 -Drewrite.plainTextMasks=**/*.ptd -DtypeDictionaryRelativeFilePath=src/main/resources/PersistenceTypeDictionary.ptd +mvn org.openrewrite.maven:rewrite-maven-plugin:run -Drewrite.activeRecipes=org.eclipse.store.storage.embedded.tools.storage.migrator.ConvertProject -Drewrite.recipeArtifactCoordinates=org.eclipse.store:storage-embedded-tools-storage-migrator:2.1.1 -Drewrite.plainTextMasks=**/*.ptd -DtypeDictionaryRelativeFilePath=src/main/resources/PersistenceTypeDictionary.ptd ```` From 6b02e021bad101e44e363086993cc98ea4cd9e6c Mon Sep 17 00:00:00 2001 From: Zdenek Jonas Date: Thu, 6 Feb 2025 09:58:47 +0100 Subject: [PATCH 2/3] Zj/oci update 030225 (#369) * update dep on OCI / without tests * fix whitespaces * update docu --- .../objectstorage/src/main/java/module-info.java | 1 + .../types/OracleCloudObjectStorageConnector.java | 2 +- afs/oraclecloud/pom.xml | 2 +- .../blob-stores/oracle-cloud-object-storage.adoc | 7 ++++++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/afs/oraclecloud/objectstorage/src/main/java/module-info.java b/afs/oraclecloud/objectstorage/src/main/java/module-info.java index b0aa787f..ac3a82fa 100644 --- a/afs/oraclecloud/objectstorage/src/main/java/module-info.java +++ b/afs/oraclecloud/objectstorage/src/main/java/module-info.java @@ -24,4 +24,5 @@ requires transitive oci.java.sdk.common; requires transitive oci.java.sdk.objectstorage.extensions; requires transitive oci.java.sdk.objectstorage.generated; + requires oci.java.sdk.common.httpclient; } diff --git a/afs/oraclecloud/objectstorage/src/main/java/org/eclipse/store/afs/oraclecloud/objectstorage/types/OracleCloudObjectStorageConnector.java b/afs/oraclecloud/objectstorage/src/main/java/org/eclipse/store/afs/oraclecloud/objectstorage/types/OracleCloudObjectStorageConnector.java index 50a2f7d3..a7af0862 100644 --- a/afs/oraclecloud/objectstorage/src/main/java/org/eclipse/store/afs/oraclecloud/objectstorage/types/OracleCloudObjectStorageConnector.java +++ b/afs/oraclecloud/objectstorage/src/main/java/org/eclipse/store/afs/oraclecloud/objectstorage/types/OracleCloudObjectStorageConnector.java @@ -27,7 +27,7 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -import com.oracle.bmc.io.DuplicatableInputStream; +import com.oracle.bmc.http.client.io.DuplicatableInputStream; import com.oracle.bmc.model.Range; import com.oracle.bmc.objectstorage.ObjectStorageClient; import com.oracle.bmc.objectstorage.model.ObjectSummary; diff --git a/afs/oraclecloud/pom.xml b/afs/oraclecloud/pom.xml index 6eb39584..40afb240 100644 --- a/afs/oraclecloud/pom.xml +++ b/afs/oraclecloud/pom.xml @@ -29,7 +29,7 @@ com.oracle.oci.sdk oci-java-sdk-bom - 2.73.0 + 3.44.4 pom import diff --git a/docs/modules/storage/pages/storage-targets/blob-stores/oracle-cloud-object-storage.adoc b/docs/modules/storage/pages/storage-targets/blob-stores/oracle-cloud-object-storage.adoc index 58578101..7cdfb4f5 100644 --- a/docs/modules/storage/pages/storage-targets/blob-stores/oracle-cloud-object-storage.adoc +++ b/docs/modules/storage/pages/storage-targets/blob-stores/oracle-cloud-object-storage.adoc @@ -10,7 +10,12 @@ com.oracle.oci.sdk oci-java-sdk-objectstorage - 2.21.0 + 3.44.4 + + + com.oracle.oci.sdk + oci-java-sdk-common-httpclient-jersey + 3.44.4 ---- From 5fba59668e0babbaaec627c3f3a4d906396f58a5 Mon Sep 17 00:00:00 2001 From: Zdenek Jonas Date: Thu, 6 Feb 2025 10:09:28 +0100 Subject: [PATCH 3/3] Zj/afs update 040225 (#370) * update afs * update aws docu * blobs docu update * update sql dep. docs --- afs/aws/pom.xml | 2 +- afs/azure/pom.xml | 2 +- afs/googlecloud/pom.xml | 2 +- afs/kafka/pom.xml | 2 +- afs/redis/pom.xml | 2 +- .../storage/pages/storage-targets/blob-stores/aws-dynamodb.adoc | 2 +- .../storage/pages/storage-targets/blob-stores/aws-s3.adoc | 2 +- .../pages/storage-targets/blob-stores/azure-storage.adoc | 2 +- .../storage-targets/blob-stores/google-cloud-firestore.adoc | 2 +- .../storage/pages/storage-targets/blob-stores/kafka.adoc | 2 +- .../storage/pages/storage-targets/blob-stores/redis.adoc | 2 +- .../storage/pages/storage-targets/sql-databases/mariadb.adoc | 2 +- .../storage/pages/storage-targets/sql-databases/oracle.adoc | 2 +- .../storage/pages/storage-targets/sql-databases/postgresql.adoc | 2 +- .../storage/pages/storage-targets/sql-databases/sqlite.adoc | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/afs/aws/pom.xml b/afs/aws/pom.xml index 99f5f492..41d00690 100644 --- a/afs/aws/pom.xml +++ b/afs/aws/pom.xml @@ -31,7 +31,7 @@ software.amazon.awssdk bom - 2.27.24 + 2.30.11 pom import diff --git a/afs/azure/pom.xml b/afs/azure/pom.xml index da1a8629..b17535e7 100644 --- a/afs/azure/pom.xml +++ b/afs/azure/pom.xml @@ -29,7 +29,7 @@ com.azure azure-sdk-bom - 1.2.27 + 1.2.31 pom import diff --git a/afs/googlecloud/pom.xml b/afs/googlecloud/pom.xml index edb158fe..1b199c57 100644 --- a/afs/googlecloud/pom.xml +++ b/afs/googlecloud/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 26.45.0 + 26.53.0 pom import diff --git a/afs/kafka/pom.xml b/afs/kafka/pom.xml index 65cfe318..108aab50 100644 --- a/afs/kafka/pom.xml +++ b/afs/kafka/pom.xml @@ -31,7 +31,7 @@ org.apache.kafka kafka-clients - 3.8.0 + 3.9.0 provided diff --git a/afs/redis/pom.xml b/afs/redis/pom.xml index b06e7cc5..68fdd7fc 100644 --- a/afs/redis/pom.xml +++ b/afs/redis/pom.xml @@ -33,7 +33,7 @@ io.lettuce lettuce-core - 6.5.2.RELEASE + 6.5.3.RELEASE provided diff --git a/docs/modules/storage/pages/storage-targets/blob-stores/aws-dynamodb.adoc b/docs/modules/storage/pages/storage-targets/blob-stores/aws-dynamodb.adoc index f77eba68..9f253401 100644 --- a/docs/modules/storage/pages/storage-targets/blob-stores/aws-dynamodb.adoc +++ b/docs/modules/storage/pages/storage-targets/blob-stores/aws-dynamodb.adoc @@ -10,7 +10,7 @@ software.amazon.awssdk dynamodb - 2.17.272 + 2.30.11 ---- diff --git a/docs/modules/storage/pages/storage-targets/blob-stores/aws-s3.adoc b/docs/modules/storage/pages/storage-targets/blob-stores/aws-s3.adoc index 2fb13d36..00714e5a 100644 --- a/docs/modules/storage/pages/storage-targets/blob-stores/aws-s3.adoc +++ b/docs/modules/storage/pages/storage-targets/blob-stores/aws-s3.adoc @@ -10,7 +10,7 @@ software.amazon.awssdk s3 - 2.26.14 + 2.30.11 ---- diff --git a/docs/modules/storage/pages/storage-targets/blob-stores/azure-storage.adoc b/docs/modules/storage/pages/storage-targets/blob-stores/azure-storage.adoc index 8def4a63..4c18273f 100644 --- a/docs/modules/storage/pages/storage-targets/blob-stores/azure-storage.adoc +++ b/docs/modules/storage/pages/storage-targets/blob-stores/azure-storage.adoc @@ -10,7 +10,7 @@ com.azure azure-storage-blob - 12.10.0 + 12.29.0 ---- diff --git a/docs/modules/storage/pages/storage-targets/blob-stores/google-cloud-firestore.adoc b/docs/modules/storage/pages/storage-targets/blob-stores/google-cloud-firestore.adoc index ddf622e8..043fbc4a 100644 --- a/docs/modules/storage/pages/storage-targets/blob-stores/google-cloud-firestore.adoc +++ b/docs/modules/storage/pages/storage-targets/blob-stores/google-cloud-firestore.adoc @@ -10,7 +10,7 @@ com.google.cloud google-cloud-firestore - 3.0.17 + 3.30.6 ---- diff --git a/docs/modules/storage/pages/storage-targets/blob-stores/kafka.adoc b/docs/modules/storage/pages/storage-targets/blob-stores/kafka.adoc index 916772f7..384b1b53 100644 --- a/docs/modules/storage/pages/storage-targets/blob-stores/kafka.adoc +++ b/docs/modules/storage/pages/storage-targets/blob-stores/kafka.adoc @@ -10,7 +10,7 @@ org.apache.kafka kafka-clients - 3.1.2 + 3.9.0 ---- diff --git a/docs/modules/storage/pages/storage-targets/blob-stores/redis.adoc b/docs/modules/storage/pages/storage-targets/blob-stores/redis.adoc index 2c6a5c8c..9c6d4ca7 100644 --- a/docs/modules/storage/pages/storage-targets/blob-stores/redis.adoc +++ b/docs/modules/storage/pages/storage-targets/blob-stores/redis.adoc @@ -10,7 +10,7 @@ io.lettuce lettuce-core - 6.2.6.RELEASE + 6.5.3.RELEASE ---- diff --git a/docs/modules/storage/pages/storage-targets/sql-databases/mariadb.adoc b/docs/modules/storage/pages/storage-targets/sql-databases/mariadb.adoc index 809521e6..40bd18e7 100644 --- a/docs/modules/storage/pages/storage-targets/sql-databases/mariadb.adoc +++ b/docs/modules/storage/pages/storage-targets/sql-databases/mariadb.adoc @@ -10,7 +10,7 @@ org.mariadb.jdbc mariadb-java-client - 2.7.1 + 3.5.1 ---- diff --git a/docs/modules/storage/pages/storage-targets/sql-databases/oracle.adoc b/docs/modules/storage/pages/storage-targets/sql-databases/oracle.adoc index b51cb701..a98e9ce1 100644 --- a/docs/modules/storage/pages/storage-targets/sql-databases/oracle.adoc +++ b/docs/modules/storage/pages/storage-targets/sql-databases/oracle.adoc @@ -10,7 +10,7 @@ com.oracle.database.jdbc ojdbc8 - 19.7.0.0 + 23.3.0.23.09 ---- diff --git a/docs/modules/storage/pages/storage-targets/sql-databases/postgresql.adoc b/docs/modules/storage/pages/storage-targets/sql-databases/postgresql.adoc index 1907b037..3db4ef25 100644 --- a/docs/modules/storage/pages/storage-targets/sql-databases/postgresql.adoc +++ b/docs/modules/storage/pages/storage-targets/sql-databases/postgresql.adoc @@ -10,7 +10,7 @@ org.postgresql postgresql - 42.2.14 + 42.7.5 ---- diff --git a/docs/modules/storage/pages/storage-targets/sql-databases/sqlite.adoc b/docs/modules/storage/pages/storage-targets/sql-databases/sqlite.adoc index 3ddc4d15..09cdd653 100644 --- a/docs/modules/storage/pages/storage-targets/sql-databases/sqlite.adoc +++ b/docs/modules/storage/pages/storage-targets/sql-databases/sqlite.adoc @@ -10,7 +10,7 @@ org.xerial sqlite-jdbc - 3.32.3 + 3.48.0.0 ----