SpringCloud/spring-cloud-dataflow-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Spring Boot to 2.7.16 and 3.1.4

Browse Source
This commit is contained in:
Corneil du Plessis
2023-09-23 14:59:39 +02:00
parent 2265fa794a
commit 0fda00af72
9 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
monitoring-samples/task-apps/task-demo-metrics-prometheus/README.md
View File

@@ -10,17 +10,17 @@ Otherwise, follow the instructions below to build your own `monitorable` Task fr
Follow the [Task development instructions](https://docs.spring.io/spring-cloud-task/docs/2.3.0/reference/#getting-started-developing-first-task) and then: Follow the [Task development instructions](https://docs.spring.io/spring-cloud-task/docs/2.3.0/reference/#getting-started-developing-first-task) and then:
* Set the parent POM version of Boot to 2.4.3 or latest * Set the parent POM version of Boot to 2.7.16 or latest
```xml ```xml
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.3</version> <version>2.7.16</version>
<relativePath/> <relativePath/>
</parent> </parent>
``` ```
* Make sure that `spring-cloud-task-dependencies` version `2.3.0` or newer are imported: * Make sure that `spring-cloud-task-dependencies` version `2.4.6` or newer are imported:
```xml ```xml
<dependencyManagement> <dependencyManagement>
@@ -28,7 +28,7 @@ Follow the [Task development instructions](https://docs.spring.io/spring-cloud-t
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>spring-cloud-task-dependencies</artifactId>
<version>2.3.0</version> <version>2.4.6</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@@ -74,12 +74,7 @@ To enable Prometheus metrics collection add:
<dependency> <dependency>
<groupId>io.micrometer.prometheus</groupId> <groupId>io.micrometer.prometheus</groupId>
<artifactId>prometheus-rsocket-spring</artifactId> <artifactId>prometheus-rsocket-spring</artifactId>
<version>1.3.0</version> <version>1.5.2</version>
</dependency>
<dependency>
<groupId>io.micrometer.prometheus</groupId>
<artifactId>prometheus-rsocket-client</artifactId>
<version>1.3.0</version>
</dependency> </dependency>
``` ```
@@ -97,7 +92,7 @@ To enable Prometheus metrics collection add:
<plugin> <plugin>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-apps-metadata-plugin</artifactId> <artifactId>spring-cloud-dataflow-apps-metadata-plugin</artifactId>
<version>1.0.2</version> <version>1.0.7</version>
<configuration> <configuration>
<storeFilteredMetadata>true</storeFilteredMetadata> <storeFilteredMetadata>true</storeFilteredMetadata>
<metadataFilter> <metadataFilter>

18
monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml
View File

@@ -2,21 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<!--
spring-boot-starter-parent:2.1.13.RELEASE
prometheus-rsocket-spring.version:0.9.0
rsocket-transport-netty:1.0.0-RC5
spring-boot-starter-parent:2.3.2.RELEASE
prometheus-rsocket-spring.version:0.9.0
rsocket-transport-netty:1.0.0-RC5
-->
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.11</version> <version>2.7.16</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>io.spring.task</groupId> <groupId>io.spring.task</groupId>
@@ -27,8 +16,8 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<prometheus-rsocket-spring.version>1.4.0</prometheus-rsocket-spring.version> <prometheus-rsocket-spring.version>1.5.2</prometheus-rsocket-spring.version>
<spring-cloud-task-dependencies.version>2.4.5</spring-cloud-task-dependencies.version> <spring-cloud-task-dependencies.version>2.4.6</spring-cloud-task-dependencies.version>
</properties> </properties>
<dependencies> <dependencies>
@@ -57,6 +46,7 @@
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
<version>2.2.224</version>
</dependency> </dependency>
<!-- Enable Prometheus metrics collection (via Prometheus RSocket Proxy) --> <!-- Enable Prometheus metrics collection (via Prometheus RSocket Proxy) -->

2
restaurant-stream-apps/scdf-app-customer/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.8</version> <version>2.7.16</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>io.spring</groupId> <groupId>io.spring</groupId>

2
restaurant-stream-apps/scdf-app-kitchen/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.8</version> <version>2.7.16</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>io.spring</groupId> <groupId>io.spring</groupId>

2
restaurant-stream-apps/scdf-app-waitron/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.8</version> <version>2.7.16</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>io.spring</groupId> <groupId>io.spring</groupId>

3
timestamp-batch-2.0.x/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.5</version> <version>2.7.16</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>io.spring</groupId> <groupId>io.spring</groupId>
@@ -37,6 +37,7 @@
<dependency> <dependency>
<groupId>org.mariadb.jdbc</groupId> <groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId> <artifactId>mariadb-java-client</artifactId>
<version>[3.1.2,)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>

6
timestamp-batch-3.0.x/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.8</version> <version>3.1.4</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>io.spring</groupId> <groupId>io.spring</groupId>
@@ -16,7 +16,7 @@
<properties> <properties>
<java.version>17</java.version> <java.version>17</java.version>
<spring-cloud.version>2022.0.3</spring-cloud.version> <spring-cloud.version>2022.0.4</spring-cloud.version>
</properties> </properties>
<dependencies> <dependencies>
@@ -44,10 +44,12 @@
<dependency> <dependency>
<groupId>org.mariadb.jdbc</groupId> <groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId> <artifactId>mariadb-java-client</artifactId>
<version>[3.1.2,)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<version>[2.2,)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>

2
timestamp-task-2.0.x/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.5</version> <version>2.7.16</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>io.spring</groupId> <groupId>io.spring</groupId>

6
timestamp-task-3.0.x/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.8</version> <version>3.1.4</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>io.spring</groupId> <groupId>io.spring</groupId>
@@ -16,7 +16,7 @@
<properties> <properties>
<java.version>17</java.version> <java.version>17</java.version>
<spring-cloud.version>2022.0.3</spring-cloud.version> <spring-cloud.version>2022.0.4</spring-cloud.version>
</properties> </properties>
<dependencies> <dependencies>
@@ -40,10 +40,12 @@
<dependency> <dependency>
<groupId>org.mariadb.jdbc</groupId> <groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId> <artifactId>mariadb-java-client</artifactId>
<version>[3.1.2,)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<version>[2.2,)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>