chore: update docs + build

Author: mefellows

Makefile

@@ -3,8 +3,8 @@ WEBHOOK_UUID := "9GS-Z8nSAbUzvJW4xmhdsg"
 PACT_CHANGED_WEBHOOK_UUID := "c76b601e-d66a-4eb1-88a4-6ebc50c0df8b"
 PACT_CLI="docker run --rm -v ${PWD}:${PWD} -e PACT_BROKER_BASE_URL -e PACT_BROKER_TOKEN pactfoundation/pact-cli"
 
-# Only deploy from master
-ifeq ($(GIT_BRANCH),master)
+# Only deploy from main
+ifeq ($(GIT_BRANCH),main)
 	DEPLOY_TARGET=deploy
 else
 	DEPLOY_TARGET=no_deploy
@@ -43,7 +43,7 @@ fake_ci_webhook:
 ## =====================
 
 test: .env
-	./gradlew clean test -i
+	GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` ./gradlew clean test -i
 
 ## =====================
 ## Deploy tasks
@@ -52,7 +52,7 @@ test: .env
 deploy: can_i_deploy deploy_app record_deployment
 
 no_deploy:
-	@echo "Not deploying as not on master branch"
+	@echo "Not deploying as not on main branch"
 
 can_i_deploy: .env
 	@"${PACT_CLI}" broker can-i-deploy --pacticipant ${PACTICIPANT} --version ${GIT_COMMIT} --to-environment production
@@ -101,4 +101,4 @@ test_pact_changed_webhook:
 
 schema-test:
 	# @./node_modules/.bin/swagger-mock-validator ./oas/swagger.yml ../example-consumer-cypress/pacts/example-cypress-consumer-pactflow-example-provider.json
-	./node_modules/.bin/swagger-mock-validator --user dXfltyFMgNOFZAxr8io9wJ37iUpY42M:O5AIZWxelWbLvqMd8PkAVycBJh2Psyg1 --tag master --provider pactflow-example-provider ./oas/swagger.yml https://test.pactflow.io
+	./node_modules/.bin/swagger-mock-validator --user dXfltyFMgNOFZAxr8io9wJ37iUpY42M:O5AIZWxelWbLvqMd8PkAVycBJh2Psyg1 --tag main --provider pactflow-example-provider ./oas/swagger.yml https://test.pactflow.io

README.md

@@ -2,11 +2,11 @@
 
 ![Build](https://github.com/pactflow/example-provider-springboot/workflows/Build/badge.svg)
 
-[![Can I deploy Status](https://test.pactflow.io/pacticipants/pactflow-example-provider-springboot/branches/master/latest-version/can-i-deploy/to-environment/production/badge.svg)](https://test.pactflow.io/overview/provider/pactflow-example-provider-springboot/consumer/pactflow-example-consumer-java-junit)
+[![Can I deploy Status](https://test.pactflow.io/pacticipants/pactflow-example-provider-java-graphql/branches/main/latest-version/can-i-deploy/to-environment/production/badge.svg)](https://test.pactflow.io/overview/provider/pactflow-example-provider-java-graphql/consumer/pactflow-example-consumer-java-junit)
 
-[![Pact Status](https://test.pactflow.io/pacts/provider/pactflow-example-provider-springboot/consumer/pactflow-example-consumer-java-junit/latest/badge.svg)](https://test.pactflow.io/pacts/provider/pactflow-example-provider-springboot/consumer/pactflow-example-consumer-java-junit/latest) (latest pact)
+[![Pact Status](https://test.pactflow.io/pacts/provider/pactflow-example-provider-java-graphql/consumer/pactflow-example-consumer-java-junit/latest/badge.svg)](https://test.pactflow.io/pacts/provider/pactflow-example-provider-java-graphql/consumer/pactflow-example-consumer-java-junit/latest) (latest pact)
 
-[![Pact Status](https://test.pactflow.io/pacts/provider/pactflow-example-provider-springboot/consumer/pactflow-example-consumer-java-junit/latest/prod/badge.svg)](https://test.pactflow.io/pacts/provider/pactflow-example-provider-springboot/consumer/pactflow-example-consumer-java-junit/latest/prod) (prod/prod pact)
+[![Pact Status](https://test.pactflow.io/pacts/provider/pactflow-example-provider-java-graphql/consumer/pactflow-example-consumer-java-junit/latest/prod/badge.svg)](https://test.pactflow.io/pacts/provider/pactflow-example-provider-java-graphql/consumer/pactflow-example-consumer-java-junit/latest/prod) (prod/prod pact)
 
 
 This is an example of a Java Spring Boot GraphQL provider that uses Pact, [PactFlow](https://pactflow.io) and GitHub Actions to ensure that it is compatible with the expectations its consumers have of it.
@@ -23,7 +23,7 @@ The project uses a Makefile to simulate a very simple build pipeline with two st
   - Run tests (including the pact tests that generate the contract)
   - Publish pacts, tagging the consumer version with the name of the current branch
   - Check if we are safe to deploy to prod (ie. has the pact content been successfully verified)
-- Deploy (only from master)
+- Deploy (only from main)
   - Deploy app (just pretend for the purposes of this example!)
   - Tag the deployed consumer version as 'prod'
 
@@ -32,7 +32,8 @@ The project uses a Makefile to simulate a very simple build pipeline with two st
 - Docker
 - A [PactFlow](https://pactflow.io) account
 - A [read/write API Token](https://docs.pactflow.io/#configuring-your-api-token) from your PactFlow account
-- Java 8+ installed
+- Java 19+ installed
+- A linux based environment (e.g. MacOSX, Linux, Windows Subsystem for Linux)
 
 ## Usage
 

src/test/java/com/example/springboot/ProductsPactTest.java

@@ -18,7 +18,7 @@
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @Provider("pactflow-example-provider-java-graphql")
-@PactBroker(scheme = "https", host = "${PACT_BROKER_HOST}", providerBranch = "${GIT_COMMIT}", enablePendingPacts = "true", authentication = @PactBrokerAuth(token = "${PACT_BROKER_TOKEN}"))
+@PactBroker(scheme = "https", host = "${PACT_BROKER_HOST}", providerBranch = "${GIT_BRANCH}", enablePendingPacts = "true", authentication = @PactBrokerAuth(token = "${PACT_BROKER_TOKEN}"))
 class ProductsPactTest {
 
   @Autowired