Merge branch 'main' into StoreSizeLimit_#319_#321

eclipse-store · Feb 6, 2025 · 1bcd401 · 1bcd401
2 parents f584a1b + 5fba596
commit 1bcd401
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 24 deletions.
diff --git a/afs/aws/pom.xml b/afs/aws/pom.xml
@@ -31,7 +31,7 @@
 			<dependency>
 				<groupId>software.amazon.awssdk</groupId>
 				<artifactId>bom</artifactId>
-				<version>2.27.24</version>
+				<version>2.30.11</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

diff --git a/afs/azure/pom.xml b/afs/azure/pom.xml
@@ -29,7 +29,7 @@
 			<dependency>
 				<groupId>com.azure</groupId>
 				<artifactId>azure-sdk-bom</artifactId>
-				<version>1.2.27</version>
+				<version>1.2.31</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

diff --git a/afs/googlecloud/pom.xml b/afs/googlecloud/pom.xml
@@ -29,7 +29,7 @@
 			<dependency>
 				<groupId>com.google.cloud</groupId>
 				<artifactId>libraries-bom</artifactId>
-				<version>26.45.0</version>
+				<version>26.53.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

diff --git a/afs/kafka/pom.xml b/afs/kafka/pom.xml
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.apache.kafka</groupId>
 			<artifactId>kafka-clients</artifactId>
-			<version>3.8.0</version>
+			<version>3.9.0</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

diff --git 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/.../eclipse/store/afs/oraclecloud/objectstorage/types/OracleCloudObjectStorageConnector.java b/.../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
@@ -29,7 +29,7 @@
 			<dependency>
 				<groupId>com.oracle.oci.sdk</groupId>
 				<artifactId>oci-java-sdk-bom</artifactId>
-				<version>2.73.0</version>
+				<version>3.44.4</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

diff --git a/afs/redis/pom.xml b/afs/redis/pom.xml
@@ -33,7 +33,7 @@
 		<dependency>
 			<groupId>io.lettuce</groupId>
 			<artifactId>lettuce-core</artifactId>
-			<version>6.5.2.RELEASE</version>
+			<version>6.5.3.RELEASE</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

diff --git 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
@@ -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/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 @@
 <dependency>
 	<groupId>software.amazon.awssdk</groupId>
 	<artifactId>dynamodb</artifactId>
-	<version>2.17.272</version>
+	<version>2.30.11</version>
 </dependency>
 ----
 

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
@@ -10,7 +10,7 @@
 <dependency>
 	<groupId>software.amazon.awssdk</groupId>
 	<artifactId>s3</artifactId>
-	<version>2.26.14</version>
+	<version>2.30.11</version>
 </dependency>
 ----
 

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
@@ -10,7 +10,7 @@
 <dependency>
 	<groupId>com.azure</groupId>
 	<artifactId>azure-storage-blob</artifactId>
-	<version>12.10.0</version>
+	<version>12.29.0</version>
 </dependency>
 	
 ----

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
@@ -10,7 +10,7 @@
 <dependency>
 	<groupId>com.google.cloud</groupId>
 	<artifactId>google-cloud-firestore</artifactId>
-	<version>3.0.17</version>
+	<version>3.30.6</version>
 </dependency>
 ----
 

diff --git 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 @@
 <dependency>
     <groupId>org.apache.kafka</groupId>
     <artifactId>kafka-clients</artifactId>
-    <version>3.1.2</version>
+    <version>3.9.0</version>
 </dependency>
 ----
 

diff --git a/...ules/storage/pages/storage-targets/blob-stores/oracle-cloud-object-storage.adoc b/...ules/storage/pages/storage-targets/blob-stores/oracle-cloud-object-storage.adoc
@@ -10,7 +10,12 @@
 <dependency>
 	<groupId>com.oracle.oci.sdk</groupId>
 	<artifactId>oci-java-sdk-objectstorage</artifactId>
-	<version>2.21.0</version>
+	<version>3.44.4</version>
+</dependency>
+<dependency>
+	<groupId>com.oracle.oci.sdk</groupId>
+	<artifactId>oci-java-sdk-common-httpclient-jersey</artifactId>
+	<version>3.44.4</version>
 </dependency>
 ----
 

diff --git 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 @@
 <dependency>
 	<groupId>io.lettuce</groupId>
 	<artifactId>lettuce-core</artifactId>
-	<version>6.2.6.RELEASE</version>
+	<version>6.5.3.RELEASE</version>
 </dependency>
 ----
 

diff --git 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 @@
 <dependency>
 	<groupId>org.mariadb.jdbc</groupId>
 	<artifactId>mariadb-java-client</artifactId>
-	<version>2.7.1</version>
+	<version>3.5.1</version>
 </dependency>
 ----
 

diff --git 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 @@
 <dependency>
 	<groupId>com.oracle.database.jdbc</groupId>
 	<artifactId>ojdbc8</artifactId>
-	<version>19.7.0.0</version>
+	<version>23.3.0.23.09</version>
 </dependency>
 ----
 

diff --git 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 @@
 <dependency>
 	<groupId>org.postgresql</groupId>
 	<artifactId>postgresql</artifactId>
-	<version>42.2.14</version>
+	<version>42.7.5</version>
 </dependency>
 ----
 

diff --git 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 @@
 <dependency>
 	<groupId>org.xerial</groupId>
 	<artifactId>sqlite-jdbc</artifactId>
-	<version>3.32.3</version>
+	<version>3.48.0.0</version>
 </dependency>
 ----
 

diff --git 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
@@ -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
 ````