chore(deps) : upgrade versions and adds shedlock deps

rajadilipkolli · Feb 19, 2024 · e93b11a · e93b11a
1 parent 999a9d6
commit e93b11a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 40 deletions.
diff --git a/scheduler/boot-shedlock-sample/docker/docker-compose.yml b/scheduler/boot-shedlock-sample/docker/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.8'
 services:
 
   postgresqldb:
-    image: postgres:16.0-alpine
+    image: postgres:16.2-alpine
     environment:
       - POSTGRES_USER=appuser
       - POSTGRES_PASSWORD=secret

diff --git a/scheduler/boot-shedlock-sample/pom.xml b/scheduler/boot-shedlock-sample/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.5</version>
+        <version>3.2.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.learning.shedlock</groupId>
@@ -21,13 +21,12 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <java.version>17</java.version>
-        <spring-cloud.version>2022.0.4</spring-cloud.version>
-        <springdoc-openapi.version>2.2.0</springdoc-openapi.version>
-        <commons-io.version>2.15.0</commons-io.version>
+        <springdoc-openapi.version>2.3.0</springdoc-openapi.version>
+        <shedlock.version>5.11.0</shedlock.version>
 
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
-        <spotless.version>2.40.0</spotless.version>
-        <dependency-check-maven.version>8.4.2</dependency-check-maven.version>
+        <spotless.version>2.43.0</spotless.version>
+        <dependency-check-maven.version>9.0.9</dependency-check-maven.version>
         <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
         <sonar-maven-plugin.version>3.10.0.2594</sonar-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
@@ -88,13 +87,14 @@
             <version>${springdoc-openapi.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
+            <groupId>net.javacrumbs.shedlock</groupId>
+            <artifactId>shedlock-spring</artifactId>
+            <version>${shedlock.version}</version>
         </dependency>
         <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
+            <groupId>net.javacrumbs.shedlock</groupId>
+            <artifactId>shedlock-provider-jdbc-template</artifactId>
+            <version>${shedlock.version}</version>
         </dependency>
 
         <dependency>
@@ -107,11 +107,6 @@
             <artifactId>spring-boot-testcontainers</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -124,18 +119,6 @@
         </dependency>
     </dependencies>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <build>
         <plugins>
             <plugin>

diff --git a/scheduler/boot-shedlock-sample/src/main/resources/db/changelog/migration/01-init.sql b/scheduler/boot-shedlock-sample/src/main/resources/db/changelog/migration/01-init.sql
@@ -0,0 +1,7 @@
+CREATE TABLE lockProvider (
+ name VARCHAR(64),
+ lock_until TIMESTAMP(3) NULL,
+ locked_at TIMESTAMP(3) NULL,
+ locked_by VARCHAR(255),
+ PRIMARY KEY (name)
+)
diff --git a/scheduler/boot-shedlock-sample/src/main/resources/db/changelog/migration/01-init.xml b/scheduler/boot-shedlock-sample/src/main/resources/db/changelog/migration/01-init.xml
diff --git a/scheduler/boot-shedlock-sample/src/test/java/com/learning/shedlock/SchemaValidationTest.java b/scheduler/boot-shedlock-sample/src/test/java/com/learning/shedlock/SchemaValidationTest.java
@@ -7,7 +7,7 @@
         properties = {
             "spring.jpa.hibernate.ddl-auto=validate",
             "spring.test.database.replace=none",
-            "spring.datasource.url=jdbc:tc:postgresql:16.0-alpine:///db"
+            "spring.datasource.url=jdbc:tc:postgresql:16.2-alpine:///db"
         })
 class SchemaValidationTest {
 

diff --git a/...ler/boot-shedlock-sample/src/test/java/com/learning/shedlock/common/ContainersConfig.java b/...ler/boot-shedlock-sample/src/test/java/com/learning/shedlock/common/ContainersConfig.java
@@ -12,6 +12,6 @@ public class ContainersConfig {
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.0-alpine"));
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.2-alpine"));
     }
 }