File tree Expand file tree Collapse file tree 14 files changed +223
-177
lines changed
main/java/io/pactflow/example/xml/consumer/todo
test/java/io/pactflow/example/xml/consumer/todo Expand file tree Collapse file tree 14 files changed +223
-177
lines changed Original file line number Diff line number Diff 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 :
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
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
Original file line number Diff line number Diff line change 1+ 17.0
Original file line number Diff line number Diff line change @@ -31,8 +31,8 @@ fake_ci: .env
3131
3232publish_pacts : .env
3333 # Hack because of matcher issues
34- @sed -i ' s/\.\[/\[/g' ./build/pacts/pactflow-example-consumer-java-soap-pactflow-example-provider-java-soap.json
35- @" ${PACT_CLI} " publish ${PWD} /build/pacts --consumer-app-version ${GIT_COMMIT} --tag ${GIT_BRANCH}
34+ # @sed -i 's/\.\[/\[/g' ./build/pacts/pactflow-example-consumer-java-soap-pactflow-example-provider-java-soap.json
35+ @" ${PACT_CLI} " publish ${PWD} /build/pacts --consumer-app-version ${GIT_COMMIT} --branch ${GIT_BRANCH}
3636
3737# # =====================
3838# # Build/test tasks
@@ -45,7 +45,7 @@ test: .env
4545# # Deploy tasks
4646# # =====================
4747
48- deploy : deploy_app tag record_deployment
48+ deploy : deploy_app record_deployment
4949
5050no_deploy :
5151 @echo " Not deploying as not on master branch"
@@ -62,13 +62,6 @@ can_i_deploy: .env
6262deploy_app :
6363 @echo " Deploying to prod"
6464
65- tag : .env
66- @" ${PACT_CLI} " broker create-version-tag \
67- --pacticipant ${PACTICIPANT} \
68- --version ${GIT_COMMIT} \
69- --auto-create-version \
70- --tag ${GIT_BRANCH}
71-
7265record_deployment : .env
7366 @" ${PACT_CLI} " broker record-deployment --pacticipant ${PACTICIPANT} --version ${GIT_COMMIT} --environment production
7467
Original file line number Diff line number Diff line change 11plugins {
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'
55}
66
77group = ' io.pactflow.example.xml.consumer'
88version = ' 0.0.1-SNAPSHOT'
9- sourceCompatibility = ' 11'
9+ java {
10+ sourceCompatibility = ' 17'
11+ }
1012
1113repositories {
1214 mavenLocal()
@@ -21,11 +23,12 @@ configurations {
2123
2224dependencies {
2325 implementation ' org.springframework.boot:spring-boot-starter-data-jpa'
24- implementation " org.apache.httpcomponents:fluent-hc:4.5.5"
26+ implementation " org.apache.httpcomponents:fluent-hc:4.5.14"
27+ implementation ' jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
2528 compileOnly ' org.projectlombok:lombok'
2629 annotationProcessor ' org.projectlombok:lombok'
2730
28- testImplementation ' au.com.dius.pact.consumer:junit5:4.1.7 '
31+ testImplementation ' au.com.dius.pact.consumer:junit5:4.5.13 '
2932 testImplementation(' org.springframework.boot:spring-boot-starter-test' ) {
3033 exclude group : ' org.junit.vintage' , module : ' junit-vintage-engine'
3134 }
Original file line number Diff line number Diff line change 11distributionBase =GRADLE_USER_HOME
22distributionPath =wrapper/dists
3- distributionUrl =https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
3+ distributionUrl =https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
4+ networkTimeout =10000
45zipStoreBase =GRADLE_USER_HOME
56zipStorePath =wrapper/dists
You can’t perform that action at this time.
0 commit comments