Skip to content

Commit ee7b3e6

Browse files
OlgaMaciaszekOlgaMaciaszek
committed
Merge remote-tracking branch 'origin/4.1.x' into 4.2.x
Signed-off-by: Olga Maciaszek-Sharma <[email protected]> # Conflicts: # docker/pom.xml # docker/spring-cloud-contract-docker/pom.xml # docker/spring-cloud-contract-docker/project/gradle.properties # docker/spring-cloud-contract-stub-runner-docker/pom.xml # docs/pom.xml # pom.xml # specs/pom.xml # specs/spring-cloud-contract-spec-groovy/pom.xml # specs/spring-cloud-contract-spec-java/pom.xml # specs/spring-cloud-contract-spec-kotlin/pom.xml # specs/spring-cloud-contract-spec/pom.xml # spring-cloud-contract-dependencies/pom.xml # spring-cloud-contract-shade/pom.xml # spring-cloud-contract-starters/pom.xml # spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml # spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml # spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml # spring-cloud-contract-stub-runner-boot/pom.xml # spring-cloud-contract-stub-runner/pom.xml # spring-cloud-contract-tools/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties # spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties # spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties # spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties # spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml # spring-cloud-contract-verifier/pom.xml # spring-cloud-contract-wiremock/pom.xml # tests/pom.xml # tests/samples-messaging-amqp/pom.xml # tests/samples-messaging-camel/pom.xml # tests/samples-messaging-integration/pom.xml # tests/samples-messaging-jms/pom.xml # tests/spring-cloud-contract-stub-runner-amqp/pom.xml # tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml # tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml # tests/spring-cloud-contract-stub-runner-context-path/pom.xml # tests/spring-cloud-contract-stub-runner-integration/pom.xml # tests/spring-cloud-contract-stub-runner-jms/pom.xml # tests/spring-cloud-contract-stub-runner-kafka/pom.xml # tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml # tests/spring-cloud-contract-stub-runner-moco/pom.xml # tests/spring-cloud-contract-stub-runner-stream/pom.xml
2 parents 7ce1e1d + 174d80a commit ee7b3e6

File tree

9 files changed

+103
-2
lines changed

9 files changed

+103
-2
lines changed

‎docs/modules/ROOT/pages/project-features-stubrunner/stub-runner-boot.adoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
[[features-stub-runner-boot]]
22
= Using the Stub Runner Boot Application
33

4+
WARNING:: Due to the limitations in the current artifact repository release tool, we cannot currently release executable jars and as of `4.1.6` we're skipping the release of this artifact. Stub Runner Boot is still available through the xref:../docker-project.adoc#docker-stubrunner[Docker Stub Runner Boot image], which is the preferred way of using the app. You can also access https://github.com/spring-cloud/spring-cloud-contract/https://github.com/spring-cloud/spring-cloud-contract/tree/main/spring-cloud-contract-stub-runner-boot[the sources in the project repository] and build the app yourself. If the required adjustments are made in the artifact repository tooling, we'll resume publishing this jar.
5+
46
include::partial$_attributes.adoc[]
57

68
Spring Cloud Contract Stub Runner Boot is a Spring Boot application that exposes REST endpoints to

‎pom.xml‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,13 @@
607607
<groupId>org.apache.maven.plugins</groupId>
608608
<artifactId>maven-checkstyle-plugin</artifactId>
609609
</plugin>
610+
<plugin>
611+
<groupId>org.jetbrains.dokka</groupId>
612+
<artifactId>dokka-maven-plugin</artifactId>
613+
<configuration>
614+
<skip>true</skip>
615+
</configuration>
616+
</plugin>
610617
</plugins>
611618
</build>
612619

@@ -632,7 +639,9 @@
632639
<repository>
633640
<id>netflix-candidates</id>
634641
<name>Netflix Candidates</name>
635-
<url>https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates</url>
642+
<url>
643+
https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates
644+
</url>
636645
<snapshots>
637646
<enabled>false</enabled>
638647
</snapshots>
@@ -731,6 +740,22 @@
731740
</plugins>
732741
</build>
733742
</profile>
743+
<profile>
744+
<id>central</id>
745+
<build>
746+
<plugins>
747+
<plugin>
748+
<groupId>org.sonatype.central</groupId>
749+
<artifactId>central-publishing-maven-plugin</artifactId>
750+
<configuration>
751+
<excludeArtifacts>
752+
<artifact>spring-cloud-contract-stub-runner-boot</artifact>
753+
</excludeArtifacts>
754+
</configuration>
755+
</plugin>
756+
</plugins>
757+
</build>
758+
</profile>
734759
</profiles>
735760

736761
</project>

‎scripts/noIntegration.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ FOLDER=`pwd`
77
set -e
88

99
./mvnw clean install ${@}
10-
${FOLDER}/scripts/generateDocs.sh ${@}
10+
${FOLDER}/scripts/generateDocs.sh ${@}

‎specs/spring-cloud-contract-spec-kotlin/pom.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,21 @@
101101
</execution>
102102
</executions>
103103
</plugin>
104+
<plugin>
105+
<groupId>org.jetbrains.dokka</groupId>
106+
<artifactId>dokka-maven-plugin</artifactId>
107+
<configuration>
108+
<skip>false</skip>
109+
</configuration>
110+
<executions>
111+
<execution>
112+
<phase>package</phase>
113+
<goals>
114+
<goal>javadocJar</goal>
115+
</goals>
116+
</execution>
117+
</executions>
118+
</plugin>
104119
<plugin>
105120
<groupId>org.apache.maven.plugins</groupId>
106121
<artifactId>maven-compiler-plugin</artifactId>

‎spring-cloud-contract-dependencies/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,4 +160,15 @@
160160
</pluginRepositories>
161161
</profile>
162162
</profiles>
163+
<build>
164+
<plugins>
165+
<plugin>
166+
<groupId>org.jetbrains.dokka</groupId>
167+
<artifactId>dokka-maven-plugin</artifactId>
168+
<configuration>
169+
<skip>true</skip>
170+
</configuration>
171+
</plugin>
172+
</plugins>
173+
</build>
163174
</project>

‎spring-cloud-contract-shade/pom.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,23 @@
306306
<failIfNoTests>false</failIfNoTests>
307307
</configuration>
308308
</plugin>
309+
<plugin>
310+
<groupId>org.apache.maven.plugins</groupId>
311+
<artifactId>maven-jar-plugin</artifactId>
312+
<executions>
313+
<execution>
314+
<id>empty-javadoc-jar</id>
315+
<phase>package</phase>
316+
<goals>
317+
<goal>jar</goal>
318+
</goals>
319+
<configuration>
320+
<classifier>javadoc</classifier>
321+
<classesDirectory>${basedir}/javadoc</classesDirectory>
322+
</configuration>
323+
</execution>
324+
</executions>
325+
</plugin>
309326
</plugins>
310327
</build>
311328
</project>

‎spring-cloud-contract-shade/src/main/javadoc/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This file is only here to make sure we generate a javadoc jar to pass Maven Central verification requirements.

‎spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,15 @@
311311
</activation>
312312
<build>
313313
<plugins>
314+
<plugin>
315+
<groupId>org.sonatype.central</groupId>
316+
<artifactId>central-publishing-maven-plugin</artifactId>
317+
<configuration>
318+
<excludeArtifacts>
319+
<artifact>spring-cloud-contract-gradle-plugin</artifact>
320+
</excludeArtifacts>
321+
</configuration>
322+
</plugin>
314323
<plugin>
315324
<groupId>org.codehaus.mojo</groupId>
316325
<artifactId>exec-maven-plugin</artifactId>

‎spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,26 @@
2323
<artifactId>spring-cloud-contract-gradle-plugin</artifactId>
2424
</dependency>
2525
</dependencies>
26+
<profiles>
27+
<profile>
28+
<id>central</id>
29+
<activation>
30+
<activeByDefault>false</activeByDefault>
31+
</activation>
32+
<build>
33+
<plugins>
34+
<plugin>
35+
<groupId>org.sonatype.central</groupId>
36+
<artifactId>central-publishing-maven-plugin</artifactId>
37+
<configuration>
38+
<excludeArtifacts>
39+
<artifact>org.springframework.cloud.contract.gradle.plugin</artifact>
40+
</excludeArtifacts>
41+
</configuration>
42+
</plugin>
43+
</plugins>
44+
</build>
45+
</profile>
46+
</profiles>
2647

2748
</project>

0 commit comments

Comments
 (0)