Update to use pact-broker

Author: ArneLimburg

.github/workflows/build.yaml

@@ -16,8 +16,14 @@ jobs:
           distribution: 'temurin'
           cache: maven
 
+      - name: Build with Docker
+        run: docker compose build
+
+      - name: Start with Docker
+        run: docker compose up -d
+
       - name: Build customer-service
-        run: mvn clean package -f customer-service/pom.xml -Dservice.name=customer-service
+        run: mvn clean package -f customer-service/pom.xml -Dservice.name=customer-service pact:publish
 
       - name: Build billing-service
         run: mvn clean package -f billing-service/pom.xml -Dservice.name=billing-service
@@ -28,11 +34,5 @@ jobs:
       - name: Build address-validation-service
         run: mvn clean package -f address-validation-service/pom.xml -Dservice.name=address-validation-service
 
-      - name: Build with Docker
-        run: docker compose build
-
-      - name: Start with Docker
-        run: docker compose up -d
-
       - name: Stop Docker Containers
         run: docker compose down

address-validation-service/Jenkinsfile

@@ -48,7 +48,7 @@ pipeline {
                 }
             }
             steps {
-                sh "mvn test -B"
+                sh "mvn test -DpactBroker.url=http://pact:9292 -Dpact.verifier.publishResults=true -B"
             }
         }
         stage ('Package') {

address-validation-service/src/test/java/de/openknowledge/sample/address/AddressValidationServiceTest.java

@@ -27,12 +27,14 @@
 import au.com.dius.pact.provider.junit5.HttpTestTarget;
 import au.com.dius.pact.provider.junit5.PactVerificationContext;
 import au.com.dius.pact.provider.junit5.PactVerificationInvocationContextProvider;
+import au.com.dius.pact.provider.junitsupport.IgnoreNoPactsToVerify;
 import au.com.dius.pact.provider.junitsupport.Provider;
 import au.com.dius.pact.provider.junitsupport.State;
-import au.com.dius.pact.provider.junitsupport.loader.PactFolder;
+import au.com.dius.pact.provider.junitsupport.loader.PactBroker;
 
+@IgnoreNoPactsToVerify
 @Provider("address-validation-service")
-@PactFolder("src/test/pacts")
+@PactBroker(url = "${pactBroker.url:http://localhost:5000}")
 @MonoMeecrowaveConfig
 public class AddressValidationServiceTest {
 

billing-service/Jenkinsfile

@@ -48,7 +48,7 @@ pipeline {
                 }
             }
             steps {
-                sh "mvn test -B"
+                sh "mvn test -DpactBroker.url=http://pact:9292 -Dpact.verifier.publishResults=true -B"
             }
         }
         stage ('Package') {

billing-service/src/test/java/de/openknowledge/sample/address/BillingAddressServiceTest.java

@@ -27,12 +27,14 @@
 import au.com.dius.pact.provider.junit5.HttpTestTarget;
 import au.com.dius.pact.provider.junit5.PactVerificationContext;
 import au.com.dius.pact.provider.junit5.PactVerificationInvocationContextProvider;
+import au.com.dius.pact.provider.junitsupport.IgnoreNoPactsToVerify;
 import au.com.dius.pact.provider.junitsupport.Provider;
 import au.com.dius.pact.provider.junitsupport.State;
-import au.com.dius.pact.provider.junitsupport.loader.PactFolder;
+import au.com.dius.pact.provider.junitsupport.loader.PactBroker;
 
+@IgnoreNoPactsToVerify
 @Provider("billing-service")
-@PactFolder("src/test/pacts")
+@PactBroker(url = "${pactBroker.url:http://localhost:5000}")
 @MonoMeecrowaveConfig
 public class BillingAddressServiceTest {
 

customer-service/Jenkinsfile

@@ -48,7 +48,7 @@ pipeline {
                 }
             }
             steps {
-                sh "mvn test -B"
+                sh 'mvn test pact:publish -DpactBroker.url=http://pact:9292 -B'
             }
         }
         stage ('Package') {

customer-service/pom.xml

@@ -26,6 +26,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <failOnMissingWebXml>false</failOnMissingWebXml>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <pactBroker.url>http://localhost:5000</pactBroker.url>
         <meecrowave.version>1.2.15</meecrowave.version>
         <deltaspike.version>1.9.6</deltaspike.version>
         <junit.version>5.8.2</junit.version>
@@ -252,6 +253,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>au.com.dius.pact.provider</groupId>
+                <artifactId>maven</artifactId>
+                <version>4.3.5</version>
+                <configuration>
+                    <pactBrokerUrl>${pactBroker.url}</pactBrokerUrl>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

delivery-service/Jenkinsfile

@@ -48,7 +48,7 @@ pipeline {
                 }
             }
             steps {
-                sh "mvn test -B"
+                sh "mvn test pact:publish -DpactBroker.url=http://pact:9292 -Dpact.verifier.publishResults=true -B"
             }
         }
         stage ('Package') {

delivery-service/pom.xml

@@ -26,6 +26,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <failOnMissingWebXml>false</failOnMissingWebXml>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <pactBroker.url>http://localhost:5000</pactBroker.url>
         <meecrowave.version>1.2.15</meecrowave.version>
         <deltaspike.version>1.9.6</deltaspike.version>
         <hibernate.version>5.4.21.Final</hibernate.version>
@@ -226,6 +227,7 @@
                 <configuration>
                     <systemPropertyVariables>
                         <pact.provider.version>${project.version}</pact.provider.version>
+                        <pactBroker.url>${pactBroker.url}</pactBroker.url>
                         <javax.persistence.jdbc.url>jdbc:h2:mem:delivery</javax.persistence.jdbc.url>
                         <javax.persistence.jdbc.driver>org.h2.Driver</javax.persistence.jdbc.driver>
                         <javax.persistence.jdbc.user>sa</javax.persistence.jdbc.user>
@@ -266,7 +268,7 @@
                 <artifactId>maven</artifactId>
                 <version>4.3.5</version>
                 <configuration>
-                    <pactBrokerUrl>http://localhost:5000</pactBrokerUrl>
+                    <pactBrokerUrl>${pactBroker.url}</pactBrokerUrl>
                 </configuration>
             </plugin>
         </plugins>

delivery-service/src/test/java/de/openknowledge/sample/address/DeliveryAddressServiceTest.java

@@ -38,16 +38,18 @@
 import au.com.dius.pact.provider.junit5.HttpTestTarget;
 import au.com.dius.pact.provider.junit5.PactVerificationContext;
 import au.com.dius.pact.provider.junit5.PactVerificationInvocationContextProvider;
+import au.com.dius.pact.provider.junitsupport.IgnoreNoPactsToVerify;
 import au.com.dius.pact.provider.junitsupport.Provider;
 import au.com.dius.pact.provider.junitsupport.State;
 import au.com.dius.pact.provider.junitsupport.StateChangeAction;
-import au.com.dius.pact.provider.junitsupport.loader.PactFolder;
+import au.com.dius.pact.provider.junitsupport.loader.PactBroker;
 import de.openknowledge.sample.address.domain.AddressValidationService;
 import rocks.limburg.cdimock.MockitoBeans;
 
+@IgnoreNoPactsToVerify
 @MockitoBeans(types = {AddressValidationService.class})
 @Provider("delivery-service")
-@PactFolder("src/test/pacts")
+@PactBroker(url = "${pactBroker.url:http://localhost:5000}")
 @MonoMeecrowaveConfig
 public class DeliveryAddressServiceTest {