Skip to content

Commit e6dd752

Browse files
OlgaMaciaszekOlgaMaciaszek
committed
Merge remote-tracking branch 'origin/4.2.x' into 4.3.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 a1cbbc1 + 46077e9 commit e6dd752

File tree

4 files changed

+115
-22
lines changed

4 files changed

+115
-22
lines changed

‎pom.xml‎

Lines changed: 52 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<xerces.version>2.12.2</xerces.version>
6767
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
6868
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
69+
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
6970

7071
<contract.kotlin.version>1.8.22</contract.kotlin.version>
7172
<commons-beanutils.version>1.9.4</commons-beanutils.version>
@@ -504,6 +505,23 @@
504505
<url>https://spring.io/</url>
505506
</organization>
506507

508+
<licenses>
509+
<license>
510+
<name>Apache License, Version 2.0</name>
511+
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
512+
</license>
513+
</licenses>
514+
515+
<scm>
516+
<connection>scm:git:https://github.com/spring-cloud/spring-cloud-contract.git
517+
</connection>
518+
<developerConnection>
519+
scm:git:[email protected]:spring-cloud/spring-cloud-contract.git
520+
</developerConnection>
521+
<url>https://github.com/spring-cloud/spring-cloud-contract</url>
522+
<tag>HEAD</tag>
523+
</scm>
524+
507525
<developers>
508526
<developer>
509527
<id>mariuszs</id>
@@ -518,25 +536,25 @@
518536
<developer>
519537
<id>dsyer</id>
520538
<name>David Syer</name>
521-
<email>dsyer@vmware.com</email>
539+
<email>david.syer at broadcom.com</email>
522540
</developer>
523541
<developer>
524542
<id>OlgaMaciaszek</id>
525543
<name>Olga Maciaszek-Sharma</name>
526-
<email>[email protected]</email>
544+
<email>olga.maciaszek-sharma at broadcom.com</email>
545+
</developer>
546+
<developer>
547+
<id>sgibb</id>
548+
<name>Spencer Gibb</name>
549+
<email>spencer.gibb at broadcom.com</email>
550+
</developer>
551+
<developer>
552+
<id>rbaxter</id>
553+
<name>Ryan Baxter</name>
554+
<email>ryan.baxter at broadcom.com</email>
527555
</developer>
528556
</developers>
529557

530-
<scm>
531-
<connection>scm:git:https://github.com/spring-cloud/spring-cloud-contract.git
532-
</connection>
533-
<developerConnection>
534-
scm:git:[email protected]:spring-cloud/spring-cloud-contract.git
535-
</developerConnection>
536-
<url>https://github.com/spring-cloud/spring-cloud-contract</url>
537-
<tag>HEAD</tag>
538-
</scm>
539-
540558
<issueManagement>
541559
<system>GitHub</system>
542560
<url>https://github.com/spring-cloud/spring-cloud-contract/issues</url>
@@ -553,7 +571,7 @@
553571
<plugin>
554572
<groupId>org.codehaus.mojo</groupId>
555573
<artifactId>flatten-maven-plugin</artifactId>
556-
<version>1.5.0</version>
574+
<version>${flatten-maven-plugin.version}</version>
557575
</plugin>
558576
<plugin>
559577
<groupId>org.apache.maven.plugins</groupId>
@@ -614,6 +632,10 @@
614632
<skip>true</skip>
615633
</configuration>
616634
</plugin>
635+
<plugin>
636+
<groupId>org.codehaus.mojo</groupId>
637+
<artifactId>flatten-maven-plugin</artifactId>
638+
</plugin>
617639
</plugins>
618640
</build>
619641

@@ -750,6 +772,23 @@
750772
<configuration>
751773
<excludeArtifacts>
752774
<artifact>spring-cloud-contract-stub-runner-boot</artifact>
775+
<artifact>spring-cloud-contract-docker-parent</artifact>
776+
<artifact>spring-cloud-contract-specs</artifact>
777+
<artifact>spring-cloud-contract-tests</artifact>
778+
<artifact>spring-cloud-contract-stub-runner-boot-zookeeper</artifact>
779+
<artifact>spring-cloud-contract-stub-runner-boot-eureka</artifact>
780+
<artifact>spring-cloud-contract-sample-jms</artifact>
781+
<artifact>spring-cloud-contract-stub-runner-kafka</artifact>
782+
<artifactId>spring-cloud-contract-sample-amqp</artifactId>
783+
<artifactId>spring-cloud-contract-stub-runner-integration</artifactId>
784+
<artifactId>spring-cloud-contract-stub-runner-amqp</artifactId>
785+
<artifactId>spring-cloud-contract-sample-integration</artifactId>
786+
<artifactId>spring-cloud-contract-stub-runner-jms</artifactId>
787+
<artifactId>spring-cloud-contract-sample-camel</artifactId>
788+
<artifactId>spring-cloud-contract-stub-runner-stream</artifactId>
789+
<artifactId>spring-cloud-contract-stub-runner-context-path</artifactId>
790+
<artifactId>spring-cloud-contract-stub-runner-moco</artifactId>
791+
<artifactId>spring-cloud-contract-stub-runner-moco-contract-jar</artifactId>
753792
</excludeArtifacts>
754793
</configuration>
755794
</plugin>

‎spring-cloud-contract-stub-runner-boot/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,18 @@
2222
<groupId>org.springframework.cloud</groupId>
2323
<artifactId>spring-cloud-contract-spec-kotlin</artifactId>
2424
</dependency>
25+
<dependency>
26+
<groupId>org.springframework.cloud</groupId>
27+
<artifactId>spring-cloud-stream-binder-rabbit</artifactId>
28+
<!--Because of the docker creation process explicit version is needed-->
29+
<version>4.3.1-SNAPSHOT</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.springframework.cloud</groupId>
33+
<artifactId>spring-cloud-stream-binder-kafka</artifactId>
34+
<!--Because of the docker creation process explicit version is needed-->
35+
<version>4.3.1-SNAPSHOT</version>
36+
</dependency>
2537
<dependency>
2638
<groupId>org.springframework.boot</groupId>
2739
<artifactId>spring-boot-starter-web</artifactId>

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,57 @@
1616

1717
<name>Spring Cloud Contract Tools</name>
1818
<description>Spring Cloud Contract Tools</description>
19+
<url>https://github.com/spring-cloud/spring-cloud-contract</url>
20+
21+
<licenses>
22+
<license>
23+
<name>Apache License, Version 2.0</name>
24+
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
25+
</license>
26+
</licenses>
27+
28+
<scm>
29+
<connection>scm:git:https://github.com/spring-cloud/spring-cloud-contract.git
30+
</connection>
31+
<developerConnection>
32+
scm:git:[email protected]:spring-cloud/spring-cloud-contract.git
33+
</developerConnection>
34+
<url>https://github.com/spring-cloud/spring-cloud-contract</url>
35+
<tag>HEAD</tag>
36+
</scm>
37+
38+
<developers>
39+
<developer>
40+
<id>mariuszs</id>
41+
<name>Mariusz Smykula</name>
42+
<email>[email protected]</email>
43+
</developer>
44+
<developer>
45+
<id>marcingrzejszczak</id>
46+
<name>Marcin Grzejszczak</name>
47+
<email>[email protected]</email>
48+
</developer>
49+
<developer>
50+
<id>dsyer</id>
51+
<name>David Syer</name>
52+
<email>david.syer at broadcom.com</email>
53+
</developer>
54+
<developer>
55+
<id>OlgaMaciaszek</id>
56+
<name>Olga Maciaszek-Sharma</name>
57+
<email>olga.maciaszek-sharma at broadcom.com</email>
58+
</developer>
59+
<developer>
60+
<id>sgibb</id>
61+
<name>Spencer Gibb</name>
62+
<email>spencer.gibb at broadcom.com</email>
63+
</developer>
64+
<developer>
65+
<id>rbaxter</id>
66+
<name>Ryan Baxter</name>
67+
<email>ryan.baxter at broadcom.com</email>
68+
</developer>
69+
</developers>
1970

2071
<modules>
2172
<module>spring-cloud-contract-converters</module>

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -311,15 +311,6 @@
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>
323314
<plugin>
324315
<groupId>org.codehaus.mojo</groupId>
325316
<artifactId>exec-maven-plugin</artifactId>

0 commit comments

Comments
 (0)