Skip to content

Bump from spring boot 2.3.5.RELEASE to 2.7.8 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Bump from spring boot 2.3.5.RELEASE to 2.7.8 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cea07c7
Bump from spring boot 2.3.5.RELEASE to 2.7.8
champel Feb 3, 2023
e635b2f
Merge branch 'master' into bump-to-spring-boot-2-7-8
champel Feb 3, 2023
4af3292
Ensure old versions of spring boot are still compatible
champel Feb 5, 2023
242d93a
Generate updated javadocs for 1.8.0 (#836)
artursouza Feb 16, 2023
806ddc0
Update Dapr runtime and CLI to 1.10. (#837)
artursouza Feb 16, 2023
568cb77
Merge branch 'master' into bump-to-spring-boot-2-7-8
champel Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
40 changes: 29 additions & 11 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,37 @@ on:

jobs:
build:
name: "Build jdk:${{ matrix.java }} sb:${{ matrix.spring-boot-version }} exp:${{ matrix.experimental }}"
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental }}
strategy:
fail-fast: true
matrix:
java: [ 11, 13, 15, 16 ]
spring-boot-version: [ 2.7.8 ]
experimental: [ false ]
include:
- java: 11
spring-boot-version: 2.6.14
experimental: false
- java: 11
spring-boot-version: 2.5.7
experimental: false
- java: 11
spring-boot-version: 2.4.0
experimental: false
- java: 11
spring-boot-version: 2.3.6.RELEASE
experimental: false
env:
GOVER: 1.19
GOOS: linux
GOARCH: amd64
GOPROXY: https://proxy.golang.org
JDK_VER: ${{ matrix.java }}
DAPR_CLI_VER: 1.10.0-rc.1
DAPR_RUNTIME_VER: 1.10.0-rc.2
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.10.0-rc.1/install/install.sh
DAPR_CLI_VER: 1.10.0
DAPR_RUNTIME_VER: 1.10.0
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.10.0/install/install.sh
DAPR_CLI_REF:
DAPR_REF:
steps:
Expand Down Expand Up @@ -92,18 +110,18 @@ jobs:
docker-compose -f ./sdk-tests/deploy/local-test-mongo.yml up -d
docker ps
- name: Clean up files
run: mvn clean
run: mvn clean -B
- name: Build sdk
run: mvn compile -q
run: mvn compile -B -q
- name: Unit tests
run: mvn test -q
run: mvn -B test -q
- name: Codecov
uses: codecov/[email protected]
- name: Install jars
run: mvn install -q
- name: Integration tests
run: mvn install -q -B -DskipTests
- name: Integration tests using spring boot version ${{ matrix.spring-boot-version }}
id: integration_tests
run: mvn -f sdk-tests/pom.xml verify
run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} mvn -B -f sdk-tests/pom.xml verify
- name: Upload test report for sdk
uses: actions/upload-artifact@master
with:
Expand Down Expand Up @@ -145,7 +163,7 @@ jobs:
java-version: ${{ env.JDK_VER }}
- name: Get pom parent version
run: |
PARENT_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
PARENT_VERSION=$(mvn -B -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
echo "PARENT_VERSION=$PARENT_VERSION" >> $GITHUB_ENV
- name: Is SNAPSHOT release ?
if: contains(github.ref, 'master') && contains(env.PARENT_VERSION, '-SNAPSHOT')
Expand All @@ -157,7 +175,7 @@ jobs:
echo "DEPLOY_OSSRH=true" >> $GITHUB_ENV
- name: Install jars
if: env.DEPLOY_OSSRH == 'true'
run: mvn clean install -q
run: mvn clean install -B -q
- name: Publish to ossrh
if: env.DEPLOY_OSSRH == 'true'
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ jobs:
GOARCH: amd64
GOPROXY: https://proxy.golang.org
JDK_VER: ${{ matrix.java }}
DAPR_CLI_VER: 1.10.0-rc.1
DAPR_RUNTIME_VER: 1.10.0-rc.2
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.10.0-rc.1/install/install.sh
DAPR_CLI_VER: 1.10.0
DAPR_RUNTIME_VER: 1.10.0
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.10.0/install/install.sh
DAPR_CLI_REF:
DAPR_REF:
steps:
Expand Down
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,19 @@ For a Maven project, add the following to your `pom.xml` file:
<dependency>
<groupId>io.dapr</groupId>
<artifactId>dapr-sdk</artifactId>
<version>1.7.1</version>
<version>1.8.0</version>
</dependency>
<!-- Dapr's SDK for Actors (optional). -->
<dependency>
<groupId>io.dapr</groupId>
<artifactId>dapr-sdk-actors</artifactId>
<version>1.7.1</version>
<version>1.8.0</version>
</dependency>
<!-- Dapr's SDK integration with SpringBoot (optional). -->
<dependency>
<groupId>io.dapr</groupId>
<artifactId>dapr-sdk-springboot</artifactId>
<version>1.7.1</version>
<version>1.8.0</version>
</dependency>
...
</dependencies>
Expand All @@ -78,11 +78,11 @@ For a Gradle project, add the following to your `build.gradle` file:
dependencies {
...
// Dapr's core SDK with all features, except Actors.
compile('io.dapr:dapr-sdk:1.7.1')
compile('io.dapr:dapr-sdk:1.8.0')
// Dapr's SDK for Actors (optional).
compile('io.dapr:dapr-sdk-actors:1.7.1')
compile('io.dapr:dapr-sdk-actors:1.8.0')
// Dapr's SDK integration with SpringBoot (optional).
compile('io.dapr:dapr-sdk-springboot:1.7.1')
compile('io.dapr:dapr-sdk-springboot:1.8.0')
}
```

Expand Down
12 changes: 6 additions & 6 deletions daprdocs/content/en/java-sdk-docs/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ For a Maven project, add the following to your `pom.xml` file:
<dependency>
<groupId>io.dapr</groupId>
<artifactId>dapr-sdk</artifactId>
<version>1.7.1</version>
<version>1.8.0</version>
</dependency>
<!-- Dapr's SDK for Actors (optional). -->
<dependency>
<groupId>io.dapr</groupId>
<artifactId>dapr-sdk-actors</artifactId>
<version>1.7.1</version>
<version>1.8.0</version>
</dependency>
<!-- Dapr's SDK integration with SpringBoot (optional). -->
<dependency>
<groupId>io.dapr</groupId>
<artifactId>dapr-sdk-springboot</artifactId>
<version>1.7.1</version>
<version>1.8.0</version>
</dependency>
...
</dependencies>
Expand All @@ -57,11 +57,11 @@ For a Gradle project, add the following to your `build.gradle` file:
dependencies {
...
// Dapr's core SDK with all features, except Actors.
compile('io.dapr:dapr-sdk:1.7.1')
compile('io.dapr:dapr-sdk:1.8.0')
// Dapr's SDK for Actors (optional).
compile('io.dapr:dapr-sdk-actors:1.7.1')
compile('io.dapr:dapr-sdk-actors:1.8.0')
// Dapr's SDK integration with SpringBoot (optional).
compile('io.dapr:dapr-sdk-springboot:1.7.1')
compile('io.dapr:dapr-sdk-springboot:1.8.0')
}
```

Expand Down
Loading