chore: publish and verify with branches not tags

Author: YOU54F

README.md

@@ -1084,7 +1084,7 @@ pact {
 		pactBrokerUrl = 'http://localhost:8000/'
 		pactBrokerUsername = getOrDefault('PACT_BROKER_USERNAME', 'pact_workshop')
 		pactBrokerPassword = getOrDefault('PACT_BROKER_PASSWORD', 'pact_workshop')
-		tags = [getGitBranch(), 'test', 'prod']
+		consumerBranch = getGitBranch()
 		consumerVersion = getGitHash()
 	}
 }
@@ -1150,9 +1150,9 @@ def getGitBranch = { ->
 test {
     useJUnitPlatform()
 
+    systemProperty 'pact.provider.branch', getGitBranch()
     if (System.getProperty('pactPublishResults') == 'true') {
         systemProperty 'pact.provider.version', getGitHash()
-        systemProperty 'pact.provider.tag', getGitBranch()
         systemProperty 'pact.verifier.publishResults', 'true'
     }
 }

consumer/build.gradle

@@ -72,7 +72,7 @@ pact {
 		pactBrokerUrl = 'http://localhost:8000/'
 		pactBrokerUsername = 'pact_workshop'
 		pactBrokerPassword = 'pact_workshop'
-		tags = [getGitBranch(), 'test', 'prod']
+		consumerBranch = getGitBranch()
 		consumerVersion = getGitHash()
 	}
 }

provider/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id 'org.springframework.boot' version '3.2.2'
     id 'io.spring.dependency-management' version '1.1.4'
-    // id 'io.spring.dependency-management' version '1.1.4'
 }
 
 group = 'au.com.dius.pactworkshop'
@@ -40,9 +39,9 @@ def getGitBranch = { ->
 test {
     useJUnitPlatform()
 
+    systemProperty 'pact.provider.branch', getGitBranch()
     if (System.getProperty('pactPublishResults') == 'true') {
         systemProperty 'pact.provider.version', getGitHash()
-        systemProperty 'pact.provider.tag', getGitBranch()
         systemProperty 'pact.verifier.publishResults', 'true'
     }
 }

provider/src/test/java/au/com/dius/pactworkshop/provider/ProductPactProviderTest.java

@@ -7,7 +7,8 @@
 import au.com.dius.pact.provider.junitsupport.State;
 import au.com.dius.pact.provider.junitsupport.loader.PactBroker;
 import au.com.dius.pact.provider.junitsupport.loader.PactBrokerAuth;
-import au.com.dius.pact.provider.junitsupport.loader.PactFolder;
+import au.com.dius.pact.provider.junitsupport.loader.SelectorBuilder;
+// import au.com.dius.pact.provider.junitsupport.loader.PactFolder;
 import org.apache.hc.core5.http.HttpRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestTemplate;
@@ -33,10 +34,18 @@
         port = "8000",
         authentication = @PactBrokerAuth(username = "pact_workshop", password = "pact_workshop")
 )
+
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class ProductPactProviderTest {
-
+    @au.com.dius.pact.provider.junitsupport.loader.PactBrokerConsumerVersionSelectors
+    public static SelectorBuilder consumerVersionSelectors() {
+      // Select Pacts for consumers deployed to production with branch from CI build 
+      return new SelectorBuilder()
+        .deployedOrReleased()
+        .mainBranch()
+        .branch("dep_update");
+    }
     @LocalServerPort
     int port;