Skip to content

Commit

Permalink
Merge pull request dapr#1044 from amardeep2006/feat/bumpup-java-depen…
Browse files Browse the repository at this point in the history
…dencies-quickstarts

feat: upgraded springboot to 3.3.1 and bumped up other dependencies
  • Loading branch information
paulyuk authored Jul 14, 2024
2 parents 3d7699b + bc0430a commit 46f1b0a
Show file tree
Hide file tree
Showing 23 changed files with 75 additions and 76 deletions.
10 changes: 5 additions & 5 deletions bindings/java/http/batch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.3</version>
<version>3.3.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>com.service</groupId>
Expand All @@ -19,12 +19,12 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20211205</version>
<version>20240303</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.0</version>
<version>2.17.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -33,7 +33,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.22</version>
<version>1.18.32</version>
<optional>true</optional>
</dependency>
</dependencies>
Expand All @@ -42,7 +42,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.4</version>
<version>3.3.1</version>
</plugin>
</plugins>
</build>
Expand Down
12 changes: 6 additions & 6 deletions bindings/java/sdk/batch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.3</version>
<version>3.3.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>com.service</groupId>
Expand All @@ -19,7 +19,7 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.9.0</version>
<version>4.12.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -38,13 +38,13 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.22</version>
<version>1.18.32</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.0</version>
<version>2.17.1</version>
</dependency>
</dependencies>

Expand All @@ -53,12 +53,12 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.4</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<version>3.3.1</version>
</plugin>
</plugins>
</build>
Expand Down
8 changes: 4 additions & 4 deletions configuration/java/http/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ This quickstart includes one service:
## Prerequisites

- [Maven 3.x](https://maven.apache.org/install.html)
- Java JDK 11 (or greater):
- [Microsoft JDK 11](https://docs.microsoft.com/en-us/java/openjdk/download#openjdk-11)
- [Oracle JDK 11](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK11)
- [OpenJDK 11](https://jdk.java.net/11/)
- Java JDK 17 (or greater):
- [Microsoft JDK 17](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-17)
- [Oracle JDK 17](https://www.oracle.com/java/technologies/downloads/?er=221886#java17)
- [OpenJDK 17](https://jdk.java.net/17/)
- Locally running redis container - a redis container named `dapr_redis` is automatically created when you run `dapr init`

## Add configuration items to the config store
Expand Down
6 changes: 3 additions & 3 deletions configuration/java/http/order-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.3</version>
<version>3.3.1</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
Expand All @@ -25,15 +25,15 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20220924</version>
<version>20240303</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.4</version>
<version>3.3.1</version>
</plugin>
</plugins>
</build>
Expand Down
8 changes: 4 additions & 4 deletions configuration/java/sdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ This quickstart includes one service:
## Prerequisites

- [Maven 3.x](https://maven.apache.org/install.html)
- Java JDK 11 (or greater):
- [Microsoft JDK 11](https://docs.microsoft.com/en-us/java/openjdk/download#openjdk-11)
- [Oracle JDK 11](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK11)
- [OpenJDK 11](https://jdk.java.net/11/)
- Java JDK 17 (or greater):
- [Microsoft JDK 17](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-17)
- [Oracle JDK 17](https://www.oracle.com/java/technologies/downloads/?er=221886#java17)
- [OpenJDK 17](https://jdk.java.net/17/)
- Locally running redis container - a redis container named `dapr_redis` is automatically created when you run `dapr init`

## Add configuration items to the config store
Expand Down
6 changes: 3 additions & 3 deletions configuration/java/sdk/order-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<slf4jVersion>1.6.1</slf4jVersion>
<slf4jVersion>2.0.13</slf4jVersion>
</properties>
<dependencies>
<dependency>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.4.0</version>
<version>3.6.7</version>
</dependency>
</dependencies>

Expand All @@ -31,7 +31,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.3</version>
<version>3.3.1</version>
<executions>
<execution>
<goals>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.service;

import io.dapr.client.DaprClientBuilder;
import io.dapr.client.DaprPreviewClient;
import io.dapr.client.DaprClient;
import io.dapr.client.domain.ConfigurationItem;
import io.dapr.client.domain.SubscribeConfigurationResponse;
Expand Down
8 changes: 4 additions & 4 deletions pub_sub/java/http/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ And one subscriber:
## Pre-requisites

* [Dapr and Dapr Cli](https://docs.dapr.io/getting-started/install-dapr-cli/).
* Java JDK 11 (or greater):
* [Microsoft JDK 11](https://docs.microsoft.com/en-us/java/openjdk/download#openjdk-11)
* [Oracle JDK 11](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK11)
* [OpenJDK 11](https://jdk.java.net/11/)
* Java JDK 17 (or greater):
* [Microsoft JDK 17](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-17)
* [Oracle JDK 17](https://www.oracle.com/java/technologies/downloads/?er=221886#java17)
* [OpenJDK 17](https://jdk.java.net/17/)
* [Apache Maven](https://maven.apache.org/install.html) version 3.x.

## Run all apps with multi-app run template file:
Expand Down
6 changes: 3 additions & 3 deletions pub_sub/java/http/checkout/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<slf4jVersion>1.6.1</slf4jVersion>
<slf4jVersion>2.0.13</slf4jVersion>
</properties>
<dependencies>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20211205</version>
<version>20240303</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -35,7 +35,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.4</version>
<version>3.3.1</version>
<executions>
<execution>
<goals>
Expand Down
6 changes: 3 additions & 3 deletions pub_sub/java/http/order-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.3</version>
<version>3.3.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.service</groupId>
Expand All @@ -24,7 +24,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.22</version>
<version>1.18.32</version>
<optional>true</optional>
</dependency>
</dependencies>
Expand All @@ -33,7 +33,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.4</version>
<version>3.3.1</version>
</plugin>
</plugins>
</build>
Expand Down
8 changes: 4 additions & 4 deletions pub_sub/java/sdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ And one subscriber:
## Pre-requisites

* [Dapr and Dapr Cli](https://docs.dapr.io/getting-started/install-dapr-cli/).
* Java JDK 11 (or greater):
* [Microsoft JDK 11](https://docs.microsoft.com/en-us/java/openjdk/download#openjdk-11)
* [Oracle JDK 11](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK11)
* [OpenJDK 11](https://jdk.java.net/11/)
* Java JDK 17 (or greater):
* [Microsoft JDK 17](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-17)
* [Oracle JDK 17](https://www.oracle.com/java/technologies/downloads/?er=221886#java17)
* [OpenJDK 17](https://jdk.java.net/17/)
* [Apache Maven](https://maven.apache.org/install.html) version 3.x.

## Run all apps with multi-app run template file:
Expand Down
8 changes: 4 additions & 4 deletions pub_sub/java/sdk/checkout/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<slf4jVersion>1.6.1</slf4jVersion>
<slf4jVersion>2.0.13</slf4jVersion>
</properties>
<dependencies>
<dependency>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.9.0</version>
<version>4.12.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.22</version>
<version>1.18.32</version>
<optional>true</optional>
</dependency>
</dependencies>
Expand All @@ -47,7 +47,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.4</version>
<version>3.3.1</version>
<executions>
<execution>
<goals>
Expand Down
8 changes: 4 additions & 4 deletions pub_sub/java/sdk/order-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.3</version>
<version>3.3.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.service</groupId>
Expand Down Expand Up @@ -34,7 +34,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.22</version>
<version>1.18.32</version>
<optional>true</optional>
</dependency>
</dependencies>
Expand All @@ -44,12 +44,12 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.4</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<version>3.3.1</version>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion secrets_management/java/http/order-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.3</version>
<version>3.3.1</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion secrets_management/java/sdk/order-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.3</version>
<version>3.3.1</version>
<executions>
<execution>
<goals>
Expand Down
8 changes: 4 additions & 4 deletions service_invocation/java/http/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ And one order processor service:
## Pre-requisites

* [Dapr and Dapr Cli](https://docs.dapr.io/getting-started/install-dapr-cli/).
* Java JDK 11 (or greater):
* [Microsoft JDK 11](https://docs.microsoft.com/en-us/java/openjdk/download#openjdk-11)
* [Oracle JDK 11](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK11)
* [OpenJDK 11](https://jdk.java.net/11/)
* Java JDK 17 (or greater):
* [Microsoft JDK 17](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-17)
* [Oracle JDK 17](https://www.oracle.com/java/technologies/downloads/?er=221886#java17)
* [OpenJDK 17](https://jdk.java.net/17/)
* [Apache Maven](https://maven.apache.org/install.html) version 3.x.

## Run all apps with multi-app run template file:
Expand Down
6 changes: 3 additions & 3 deletions service_invocation/java/http/checkout/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<slf4jVersion>1.6.1</slf4jVersion>
<slf4jVersion>2.0.13</slf4jVersion>
</properties>
<dependencies>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20211205</version>
<version>20240303</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.3</version>
<version>3.3.1</version>
<executions>
<execution>
<goals>
Expand Down
Loading

0 comments on commit 46f1b0a

Please sign in to comment.