Skip to content

Commit 39f6c2a

Browse files
OlgaMaciaszekOlgaMaciaszek
committed
Merge remote-tracking branch 'origin/4.3.x'
Signed-off-by: Olga Maciaszek-Sharma <[email protected]> # Conflicts: # docker/spring-cloud-contract-docker/project/gradle.properties # pom.xml # 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
2 parents 93c584a + a1cbbc1 commit 39f6c2a

File tree

9 files changed

+100
-1
lines changed

9 files changed

+100
-1
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: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,13 @@
602602
<groupId>org.apache.maven.plugins</groupId>
603603
<artifactId>maven-checkstyle-plugin</artifactId>
604604
</plugin>
605+
<plugin>
606+
<groupId>org.jetbrains.dokka</groupId>
607+
<artifactId>dokka-maven-plugin</artifactId>
608+
<configuration>
609+
<skip>true</skip>
610+
</configuration>
611+
</plugin>
605612
</plugins>
606613
</build>
607614

@@ -728,6 +735,22 @@
728735
</plugins>
729736
</build>
730737
</profile>
738+
<profile>
739+
<id>central</id>
740+
<build>
741+
<plugins>
742+
<plugin>
743+
<groupId>org.sonatype.central</groupId>
744+
<artifactId>central-publishing-maven-plugin</artifactId>
745+
<configuration>
746+
<excludeArtifacts>
747+
<artifact>spring-cloud-contract-stub-runner-boot</artifact>
748+
</excludeArtifacts>
749+
</configuration>
750+
</plugin>
751+
</plugins>
752+
</build>
753+
</profile>
731754
</profiles>
732755

733756
</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
@@ -106,6 +106,21 @@
106106
</execution>
107107
</executions>
108108
</plugin>
109+
<plugin>
110+
<groupId>org.jetbrains.dokka</groupId>
111+
<artifactId>dokka-maven-plugin</artifactId>
112+
<configuration>
113+
<skip>false</skip>
114+
</configuration>
115+
<executions>
116+
<execution>
117+
<phase>package</phase>
118+
<goals>
119+
<goal>javadocJar</goal>
120+
</goals>
121+
</execution>
122+
</executions>
123+
</plugin>
109124
<plugin>
110125
<groupId>org.apache.maven.plugins</groupId>
111126
<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)