Merge branch '4.1.x'

spring-cloud · Dec 3, 2024 · 6156392 · 6156392
2 parents 49961ea + 86bf029
commit 6156392
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 24 deletions.
diff --git a/docker/spring-cloud-contract-docker/project/build.gradle b/docker/spring-cloud-contract-docker/project/build.gradle
@@ -178,6 +178,7 @@ task cleanOutput(type: Delete) {
 
 task copyOutput(type: Copy) {
 	dependsOn("cleanOutput")
+	mustRunAfter("build", "generatePomFileForMavenPublication")
 	from 'build'
 	into '/spring-cloud-contract-output'
 }

diff --git a/docs/antora.yml b/docs/antora.yml
@@ -6,7 +6,7 @@ nav:
 ext:
   collector:
     run:
-      command: ./mvnw --no-transfer-progress -B process-resources -Pdocs -pl docs -Dantora-maven-plugin.phase=none -Dgenerate-docs.phase=none -Dgenerate-readme.phase=none -Dgenerate-cloud-resources.phase=none -Dmaven-dependency-plugin-for-docs.phase=none -Dmaven-dependency-plugin-for-docs-classes.phase=none -DskipTests
+      command: ./mvnw --no-transfer-progress -B process-resources -Pdocs -pl docs -Dantora-maven-plugin.phase=none -Dgenerate-docs.phase=none -Dgenerate-readme.phase=none -Dgenerate-cloud-resources.phase=none -Dmaven-dependency-plugin-for-docs.phase=none -Dmaven-dependency-plugin-for-docs-classes.phase=none -DskipTests -DdisableConfigurationProperties
       local: true
     scan:
       dir: ./target/classes/antora-resources/
diff --git a/docs/pom.xml b/docs/pom.xml
@@ -25,27 +25,7 @@
 		<groovy.version>4.0.6</groovy.version>
 		<generate-adoc-resource.phase>process-classes</generate-adoc-resource.phase>
 	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
-			<version>4.1.5</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-cloud-starter-contract-verifier</artifactId>
-			<version>4.1.5</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.module</groupId>
-			<artifactId>jackson-module-jsonSchema</artifactId>
-			<version>${jackson-module-jsonSchema.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.amqp</groupId>
-			<artifactId>spring-amqp</artifactId>
-		</dependency>
-	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -126,7 +106,7 @@
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
 						<executions>
-							<!--<execution>
+							<execution>
 								<id>generate-docker-env-vars</id>
 								<phase>${generate-cloud-resources.phase}</phase>
 								<goals>
@@ -139,7 +119,7 @@
 										<argument>${maven.multiModuleProjectDirectory}/docs/modules/ROOT/partials/</argument>
 									</arguments>
 								</configuration>
-							</execution>-->
+							</execution>
 							<execution>
 								<id>generate-adoc-resources</id>
 								<phase>${generate-adoc-resource.phase}</phase>
@@ -185,5 +165,32 @@
 				<generate-adoc-resource.phase>none</generate-adoc-resource.phase>
 			</properties>
 		</profile>
+		<profile>
+			<id>enable-configuration-properties</id>
+			<activation>
+				<property>
+					<name>!disableConfigurationProperties</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>${project.groupId}</groupId>
+					<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>${project.groupId}</groupId>
+					<artifactId>spring-cloud-starter-contract-verifier</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>org.springframework.amqp</groupId>
+					<artifactId>spring-amqp</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>com.fasterxml.jackson.module</groupId>
+					<artifactId>jackson-module-jsonSchema</artifactId>
+					<version>${jackson-module-jsonSchema.version}</version>
+				</dependency>
+			</dependencies>
+		</profile>
 	</profiles>
 </project>