Merge branch 'main' into fix/issue-1906

paulcwarren · May 1, 2024 · 6e2bae5 · 6e2bae5
2 parents 451f7f8 + 7a214ce
commit 6e2bae5
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -32,9 +32,9 @@ jobs:
         mvn -B -P tests -Dmaven.javadoc.skip=true install jacoco:report  --file pom.xml
         bash <(curl -s https://codecov.io/bash)
       env:
-        AWS_REGION: {{ secrets.AWS_REGION }}
-        AWS_ACCESS_KEY: {{ secrets.AWS_ACCESS_KEY_ID_ID_ID_ID_ID }}
-        AWS_SECRET_KEY: {{ secrets.AWS_SECRET_KEY }}
+        AWS_REGION: ${{ secrets.AWS_REGION }}
+        AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID_ID_ID_ID_ID }}
+        AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
 
     - name: Publish JARs
       run: |
@@ -59,9 +59,9 @@ jobs:
         CI_DEPLOY_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
         GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
         GPG_PASSPHASE: ${{ secrets.GPG_PASSPHRASE }}
-        AWS_REGION: {{ secrets.AWS_REGION }}
-        AWS_ACCESS_KEY: {{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_KEY: {{ secrets.AWS_SECRET_KEY }}
+        AWS_REGION: ${{ secrets.AWS_REGION }}
+        AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
 
     - name: Publish Docs
       run: |

diff --git a/.github/workflows/prs.yml b/.github/workflows/prs.yml
@@ -33,9 +33,9 @@ jobs:
           echo "spring_content_version=${project_version}" >> $GITHUB_OUTPUT
         popd
       env:
-        AWS_REGION: {{ secrets.AWS_REGION }}
-        AWS_ACCESS_KEY: {{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_KEY: {{ secrets.AWS_SECRET_KEY }}
+        AWS_REGION: ${{ secrets.AWS_REGION }}
+        AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
 
     - name: Save Maven Cache
       id: cache-maven-save
@@ -75,9 +75,9 @@ jobs:
           SPRING_CONTENT_VERSION=${{ needs.build.outputs.spring_content_version }} mvn -B clean install
         popd
       env:
-        AWS_REGION: {{ secrets.AWS_REGION }}
-        AWS_ACCESS_KEY: {{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_KEY: {{ secrets.AWS_SECRET_KEY }}
+        AWS_REGION: ${{ secrets.AWS_REGION }}
+        AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
 
     # - name: Setup tmate session if anything fails
     #   if: ${{ failure() }}
@@ -113,6 +113,6 @@ jobs:
           SPRING_CONTENT_VERSION=${{ needs.build.outputs.spring_content_version }} mvn -B clean install
         popd        
       env:
-        AWS_REGION: {{ secrets.AWS_REGION }}
-        AWS_ACCESS_KEY: {{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_KEY: {{ secrets.AWS_SECRET_KEY }}
+        AWS_REGION: ${{ secrets.AWS_REGION }}
+        AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
diff --git a/pom.xml b/pom.xml
@@ -51,16 +51,16 @@ Integrates with Spring Data, Spring Data REST and Apache Solr</description>
         <spring-content.version>${project.version}</spring-content.version>
         <ginkgo4j-version>1.0.15</ginkgo4j-version>
         <springboot-version>3.2.5</springboot-version>
-        <spring-cloud.version>2023.0.0</spring-cloud.version>
-        <commonsio-version>2.15.1</commonsio-version>
+        <spring-cloud.version>2023.0.1</spring-cloud.version>
+        <commonsio-version>2.16.1</commonsio-version>
         <commons-lang.version>2.6</commons-lang.version>
-        <common-logging.version>1.3.0</common-logging.version>
+        <common-logging.version>1.3.1</common-logging.version>
         <commons-text.version>1.11.0</commons-text.version>
         <jakarta-persistence-api.version>3.1.0</jakarta-persistence-api.version>
         <hibernate.version>5.6.15.Final</hibernate.version>
         <hibernate-orm.version>6.1.7.Final</hibernate-orm.version>
         <solr-solrj.version>9.5.0</solr-solrj.version>
-        <elasticsearch-rest-high-level-client.version>7.17.18</elasticsearch-rest-high-level-client.version>
+        <elasticsearch-rest-high-level-client.version>7.17.20</elasticsearch-rest-high-level-client.version>
 
         <!-- Test dependencies -->
         <test-containers.version>1.17.6</test-containers.version>
@@ -144,7 +144,7 @@ Integrates with Spring Data, Spring Data REST and Apache Solr</description>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.12.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>17</source>
                     <target>17</target>
@@ -218,7 +218,7 @@ Integrates with Spring Data, Spring Data REST and Apache Solr</description>
              <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.11</version>
+                <version>0.8.12</version>
                 <executions>
                    <!-- Prepare execution with Surefire -->
                    <execution>
@@ -344,7 +344,7 @@ Integrates with Spring Data, Spring Data REST and Apache Solr</description>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.3.0</version>
+                        <version>3.3.1</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>

diff --git a/spring-content-azure-storage/pom.xml b/spring-content-azure-storage/pom.xml
@@ -27,12 +27,12 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-storage-blob</artifactId>
-            <version>12.25.2</version>
+            <version>12.25.3</version>
         </dependency>
 		<dependency>
 		  <groupId>com.azure</groupId>
 		  <artifactId>azure-storage-file-share</artifactId>
-		  <version>12.21.2</version>
+		  <version>12.21.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>

diff --git a/spring-content-gcs/pom.xml b/spring-content-gcs/pom.xml
@@ -22,7 +22,7 @@
  		<dependency>
  			<groupId>com.google.cloud</groupId>
  			<artifactId>spring-cloud-gcp-storage</artifactId>
- 			<version>5.1.0</version>
+ 			<version>5.1.2</version>
  		</dependency>
  		<dependency>
 		    <groupId>com.google.cloud</groupId>
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>spring-cloud-gcp-core</artifactId>
-            <version>5.1.0</version>
+            <version>5.1.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-nio</artifactId>
-            <version>0.127.14</version>
+            <version>0.127.15</version>
             <scope>test</scope>
         </dependency>
 	</dependencies>

diff --git a/spring-content-s3/pom.xml b/spring-content-s3/pom.xml
@@ -22,7 +22,7 @@
 		<dependency>
 		    <groupId>software.amazon.awssdk</groupId>
 		    <artifactId>s3</artifactId>
-            <version>2.25.40</version>
+        <version>2.25.40</version>
 		</dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>