feat: allow multipart parts with content types

.github/workflows/codeql.yaml

@@ -16,6 +16,12 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
@@ -37,7 +43,7 @@ jobs:
       #    project uses a compiled language
 
       - run: |
-           ./mvnw clean install -B -U -Pspring
+           ./mvnw clean install -B -U -Pspring -DskipTests
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2

.github/workflows/maven.yml

@@ -5,22 +5,22 @@ name: Build
 
 on:
   push:
-    branches: [ 3.1.x, 3.0.x ]
+    branches: [ main, 3.1.x, 3.0.x ]
   pull_request:
-    branches: [ 3.1.x, 3.0.x ]
+    branches: [ main, 3.1.x, 3.0.x ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - uses: actions/checkout@v3
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        distribution: 'temurin' # See 'Supported distributions' for available options
-        java-version: 8
+        distribution: 'temurin'
+        java-version: 17
     - name: Cache local Maven repository
       uses: actions/cache@v3
       with:

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

.sdkmanrc

@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=8.0.292.hs-adpt
+java=17.0.1-tem

docker/pom.xml

@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.9-SNAPSHOT</version>
+		<version>4.0.5-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
 	<artifactId>spring-cloud-contract-docker-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.1.9-SNAPSHOT</version>
+	<version>4.0.5-SNAPSHOT</version>
 	<name>Spring Cloud Contract Docker Parent</name>
 	<description>Spring Cloud Contract Docker Parent</description>
 
@@ -28,26 +28,26 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 		</profile>
-		<!--<profile>
-			<id>integration</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<modules>
-				<module>spring-cloud-contract-docker</module>
-				<module>spring-cloud-contract-stub-runner-docker</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>deploy</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<modules>
-				<module>spring-cloud-contract-docker</module>
-				<module>spring-cloud-contract-stub-runner-docker</module>
-			</modules>
-		</profile>-->
+<!--		<profile>-->
+<!--			<id>integration</id>-->
+<!--			<activation>-->
+<!--				<activeByDefault>false</activeByDefault>-->
+<!--			</activation>-->
+<!--			<modules>-->
+<!--				<module>spring-cloud-contract-docker</module>-->
+<!--				<module>spring-cloud-contract-stub-runner-docker</module>-->
+<!--			</modules>-->
+<!--		</profile>-->
+<!--		<profile>-->
+<!--			<id>deploy</id>-->
+<!--			<activation>-->
+<!--				<activeByDefault>false</activeByDefault>-->
+<!--			</activation>-->
+<!--			<modules>-->
+<!--				<module>spring-cloud-contract-docker</module>-->
+<!--				<module>spring-cloud-contract-stub-runner-docker</module>-->
+<!--			</modules>-->
+<!--		</profile>-->
 	</profiles>
 
 	<build>

docker/spring-cloud-contract-docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG SDKMAN_JAVA_INSTALLATION=8.0.292.hs-adpt
+ARG SDKMAN_JAVA_INSTALLATION=17.0.1-tem
 
 LABEL Author="Marcin Grzejszczak <[email protected]>"
 LABEL Author="Bastian Doetsch <[email protected]>"

docker/spring-cloud-contract-docker/get_dependencies.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-WRAPPER_VERSION="7.3"
+WRAPPER_VERSION="7.5.1"
 GRADLE_BIN_DIR="gradle-${WRAPPER_VERSION}-bin"
 GRADLE_WRAPPER_DIR="${HOME}/.gradle/wrapper/dists/${GRADLE_BIN_DIR}"
 CURRENT_DIR="$( pwd )"

docker/spring-cloud-contract-docker/pom.xml

@@ -6,35 +6,43 @@
 	<properties>
 		<dependency-management-plugin.version>1.0.8.RELEASE</dependency-management-plugin.version>
 		<plexus-archiver.version>4.2.5</plexus-archiver.version>
-		<sdkman-java-installation.version>8.0.292.hs-adpt</sdkman-java-installation.version>
+		<sdkman-java-installation.version>17.0.1-tem</sdkman-java-installation.version>
 	</properties>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-docker-parent</artifactId>
-		<version>3.1.9-SNAPSHOT</version>
+		<version>4.0.5-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
 	<artifactId>spring-cloud-contract-docker</artifactId>
 	<packaging>pom</packaging>
-	<version>3.1.9-SNAPSHOT</version>
+	<version>4.0.5-SNAPSHOT</version>
 	<name>Spring Cloud Contract Docker</name>
 	<description>Spring Cloud Contract Docker</description>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-dependencies</artifactId>
+			<version>${project.version}</version>
+			<type>pom</type>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.groovy</groupId>
 			<artifactId>groovy</artifactId>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
+			<groupId>org.apache.groovy</groupId>
 			<artifactId>groovy-ant</artifactId>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
+			<groupId>org.apache.groovy</groupId>
 			<artifactId>groovy-groovydoc</artifactId>
 			<scope>compile</scope>
 		</dependency>
@@ -48,6 +56,78 @@
 			<artifactId>spring-cloud-contract-gradle-plugin</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-wiremock</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-spec</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-tools</artifactId>
+			<version>${project.version}</version>
+			<type>pom</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-spec-java</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-spec-groovy</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-spec-kotlin</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-verifier</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-converters</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-stub-runner</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-stub-runner-boot</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-shade</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-contract-stub-runner-jetty</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-maven-plugin</artifactId>
+			<scope>compile</scope>
+		</dependency>
 		<dependency>
 			<groupId>io.spring.gradle</groupId>
 			<artifactId>dependency-management-plugin</artifactId>
@@ -74,7 +154,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.1.2</version>
 				<executions>
 					<execution>
 						<id>copy-dependencies</id>

docker/spring-cloud-contract-docker/project/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.daemon=false
-verifierVersion=3.1.9-SNAPSHOT
-springBootVersion=2.6.15
-camelVersion=3.14.5
+verifierVersion=4.0.5-SNAPSHOT
+springBootVersion=3.0.9
+camelVersion=3.11.0

docker/spring-cloud-contract-docker/project/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

docker/spring-cloud-contract-docker/project/gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

docker/spring-cloud-contract-docker/project/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

docker/spring-cloud-contract-docker/project/src/test/java/contracts/ContractTestsBase.java

@@ -31,7 +31,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cloud.contract.verifier.converter.YamlContract;
-import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
+import org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver;
 import org.springframework.cloud.contract.verifier.messaging.amqp.AmqpMetadata;
 import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier;
 import org.springframework.cloud.contract.verifier.messaging.camel.StandaloneMetadata;
@@ -88,7 +88,7 @@ public abstract class ContractTestsBase {
 	String messagingType;
 
 	@Autowired
-	MessageVerifier messageVerifier;
+	MessageVerifierReceiver messageVerifier;
 
 	@BeforeEach
 	public void setup(TestInfo testInfo) {
@@ -120,9 +120,6 @@ private void setupAmqpIfPresent(YamlContract contract) {
 		AmqpMetadata amqpMetadata = AmqpMetadata.fromMetadata(contract.metadata);
 		if (isMessagingType("rabbit") && hasDeclaredOutputQueue(amqpMetadata) || isMessagingType("kafka")) {
 			log.info("First will try to receive a message to setup the connection with the broker");
-			if (contract.input != null && StringUtils.hasText(contract.input.messageFrom)) {
-				setupConnection(contract.input.messageFrom, contract);
-			}
 			if (contract.outputMessage != null && StringUtils.hasText(contract.outputMessage.sentTo)){
 				setupConnection(contract.outputMessage.sentTo, contract);
 			}