Merge pull request #12 from pactflow/deps/springboot3

chore(deps):springboot 3.3x/pact 4.5.x/gradle 8

Author: YOU54F

.github/workflows/build.yml

@@ -27,12 +27,12 @@ jobs:
             # 'pactflow-example-bi-directional-provider-dotnet'
           ]
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu' 
-          java-version: '11'
+          java-version: '17'
       - name: Test for ${{ matrix.pact_provider }}
         run: make test
         env:
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: test
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: docker pull pactfoundation/pact-cli:latest
       - name: Can I deploy?
         run: GIT_BRANCH=${GIT_REF:11} make can_i_deploy
@@ -57,7 +57,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: can-i-deploy
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: docker pull pactfoundation/pact-cli:latest
       - name: Deploy
         run: GIT_BRANCH=${GIT_REF:11} make deploy

.java-version

@@ -0,0 +1 @@
+17.0

Makefile

@@ -31,8 +31,8 @@ fake_ci: .env
 
 publish_pacts: .env
 	# Hack because of matcher issues
-	@sed -i 's/\.\[/\[/g' ./build/pacts/pactflow-example-consumer-java-soap-pactflow-example-provider-java-soap.json
-	@"${PACT_CLI}" publish ${PWD}/build/pacts --consumer-app-version ${GIT_COMMIT} --tag ${GIT_BRANCH}
+	# @sed -i 's/\.\[/\[/g' ./build/pacts/pactflow-example-consumer-java-soap-pactflow-example-provider-java-soap.json
+	@"${PACT_CLI}" publish ${PWD}/build/pacts --consumer-app-version ${GIT_COMMIT} --branch ${GIT_BRANCH}
 
 ## =====================
 ## Build/test tasks
@@ -45,7 +45,7 @@ test: .env
 ## Deploy tasks
 ## =====================
 
-deploy: deploy_app tag record_deployment
+deploy: deploy_app record_deployment
 
 no_deploy:
 	@echo "Not deploying as not on master branch"
@@ -62,13 +62,6 @@ can_i_deploy: .env
 deploy_app:
 	@echo "Deploying to prod"
 
-tag: .env
-	@"${PACT_CLI}" broker create-version-tag \
-	  --pacticipant ${PACTICIPANT} \
-	  --version ${GIT_COMMIT} \
-		--auto-create-version \
-	  --tag ${GIT_BRANCH}
-
 record_deployment: .env
 	@"${PACT_CLI}" broker record-deployment --pacticipant ${PACTICIPANT} --version ${GIT_COMMIT} --environment production
 

build.gradle

@@ -1,12 +1,14 @@
 plugins {
-  id 'org.springframework.boot' version '2.2.2.RELEASE'
-  id 'io.spring.dependency-management' version '1.0.8.RELEASE'
+  id 'org.springframework.boot' version '3.3.4'
+  id 'io.spring.dependency-management' version '1.1.6'
   id 'java'
 }
 
 group = 'io.pactflow.example.xml.consumer'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '11'
+java {
+  sourceCompatibility = '17'
+}
 
 repositories {
   mavenLocal()
@@ -21,11 +23,12 @@ configurations {
 
 dependencies {
   implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-  implementation "org.apache.httpcomponents:fluent-hc:4.5.5"
+  implementation "org.apache.httpcomponents:fluent-hc:4.5.14"
+  implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
   compileOnly 'org.projectlombok:lombok'
   annotationProcessor 'org.projectlombok:lombok'
 
-  testImplementation 'au.com.dius.pact.consumer:junit5:4.1.7'
+  testImplementation 'au.com.dius.pact.consumer:junit5:4.5.13'
   testImplementation('org.springframework.boot:spring-boot-starter-test') {
     exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
   }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists