Skip to content

Commit 9b171c3

Browse files
authored
Merge pull request #32 from pactflow/deps/java_17
chore(deps):springboot 3.3x/pact 4.5.x/gradle 8
2 parents 5326c5a + 8128bf3 commit 9b171c3

File tree

7 files changed

+221
-158
lines changed

7 files changed

+221
-158
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
# 'pactflow-example-bi-directional-provider-dotnet'
2828
]
2929
steps:
30-
- uses: actions/checkout@v2
31-
- name: Set up JDK 11
32-
uses: actions/setup-java@v2
30+
- uses: actions/checkout@v4
31+
- name: Set up JDK 17
32+
uses: actions/setup-java@v4
3333
with:
3434
distribution: 'zulu'
35-
java-version: '11'
35+
java-version: '17'
3636
- name: Test for ${{ matrix.pact_provider }}
3737
run: make test
3838
env:
@@ -47,7 +47,7 @@ jobs:
4747
runs-on: ubuntu-latest
4848
needs: test
4949
steps:
50-
- uses: actions/checkout@v2
50+
- uses: actions/checkout@v4
5151
- run: docker pull pactfoundation/pact-cli:latest
5252
- name: Can I deploy?
5353
run: GIT_BRANCH=${GIT_REF:11} make can_i_deploy
@@ -57,7 +57,7 @@ jobs:
5757
runs-on: ubuntu-latest
5858
needs: can-i-deploy
5959
steps:
60-
- uses: actions/checkout@v2
60+
- uses: actions/checkout@v4
6161
- run: docker pull pactfoundation/pact-cli:latest
6262
- name: Deploy
6363
run: GIT_BRANCH=${GIT_REF:11} make deploy

.java-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
11.0
1+
17.0

build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
plugins {
2-
id 'org.springframework.boot' version '2.2.2.RELEASE'
3-
id 'io.spring.dependency-management' version '1.0.8.RELEASE'
2+
id 'org.springframework.boot' version '3.3.4'
3+
id 'io.spring.dependency-management' version '1.1.6'
44
id 'java'
5-
id "au.com.dius.pact" version "4.5.9"
5+
id "au.com.dius.pact" version "4.5.13"
66
}
77

88
group = 'com.example'
99
version = '0.0.1-SNAPSHOT'
10-
sourceCompatibility = '11'
10+
java {
11+
sourceCompatibility = '17'
12+
}
1113

1214
repositories {
1315
mavenCentral()
@@ -21,8 +23,8 @@ configurations {
2123

2224
dependencies {
2325
implementation 'org.springframework.boot:spring-boot-starter-web'
24-
implementation "org.apache.httpcomponents:fluent-hc:4.5.5"
25-
testImplementation 'au.com.dius.pact.consumer:junit5:4.5.9'
26+
implementation "org.apache.httpcomponents:fluent-hc:4.5.14"
27+
testImplementation 'au.com.dius.pact.consumer:junit5:4.5.13'
2628

2729
compileOnly 'org.projectlombok:lombok'
2830
annotationProcessor 'org.projectlombok:lombok'

gradle/wrapper/gradle-wrapper.jar

-12.3 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)