diff --git a/timestamp-batch-3.0.x/pom.xml b/timestamp-batch-3.0.x/pom.xml
index f565a3f..e20ef85 100644
--- a/timestamp-batch-3.0.x/pom.xml
+++ b/timestamp-batch-3.0.x/pom.xml
@@ -5,7 +5,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.0.5
+ 3.0.8
io.spring
@@ -16,7 +16,7 @@
17
- 2022.0.2
+ 2022.0.3
@@ -28,7 +28,14 @@
org.springframework.cloud
spring-cloud-starter-task
-
+
+ org.springframework.boot
+ spring-boot-starter-batch
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
org.postgresql
postgresql
@@ -53,8 +60,16 @@
true
- org.springframework.boot
- spring-boot-starter-batch
+ io.micrometer
+ micrometer-core
+
+
+ io.micrometer
+ micrometer-observation
+
+
+ io.micrometer
+ micrometer-registry-prometheus
org.assertj
diff --git a/timestamp-batch-3.0.x/src/main/java/io/spring/configuration/TimestampBatchTaskConfiguration.java b/timestamp-batch-3.0.x/src/main/java/io/spring/configuration/TimestampBatchTaskConfiguration.java
index ba70afc..eb0fb2a 100644
--- a/timestamp-batch-3.0.x/src/main/java/io/spring/configuration/TimestampBatchTaskConfiguration.java
+++ b/timestamp-batch-3.0.x/src/main/java/io/spring/configuration/TimestampBatchTaskConfiguration.java
@@ -28,6 +28,7 @@ import org.springframework.batch.core.step.tasklet.Tasklet;
import org.springframework.batch.repeat.RepeatStatus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
@@ -55,7 +56,7 @@ public class TimestampBatchTaskConfiguration extends DefaultBatchConfiguration {
private TimestampBatchTaskProperties config;
@Bean
- @ConditionalOnProperty(name = "spring.datasource.driver-class-name", matchIfMissing = true, havingValue="matchonlyifmissing")
+ @ConditionalOnMissingBean
public DataSource dataSource() {
return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2)
.addScript("/org/springframework/batch/core/schema-h2.sql")
diff --git a/timestamp-task-3.0.x/pom.xml b/timestamp-task-3.0.x/pom.xml
index d512d51..4ada7ce 100644
--- a/timestamp-task-3.0.x/pom.xml
+++ b/timestamp-task-3.0.x/pom.xml
@@ -5,7 +5,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.0.5
+ 3.0.8
io.spring
@@ -16,7 +16,7 @@
17
- 2022.0.2
+ 2022.0.3
@@ -28,7 +28,10 @@
org.springframework.cloud
spring-cloud-starter-task
-
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
org.postgresql
postgresql
@@ -52,6 +55,18 @@
spring-boot-configuration-processor
true
+
+ io.micrometer
+ micrometer-core
+
+
+ io.micrometer
+ micrometer-observation
+
+
+ io.micrometer
+ micrometer-registry-prometheus
+