Skip to content

Commit 65785a1

Browse files
OlgaMaciaszekOlgaMaciaszek
committed
Merge remote-tracking branch 'origin/4.3.x'
2 parents 2245912 + e6dd752 commit 65785a1

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>2.1.10</contract.kotlin.version>
7172
<commons-beanutils.version>1.9.4</commons-beanutils.version>
@@ -499,6 +500,23 @@
499500
<url>https://spring.io/</url>
500501
</organization>
501502

503+
<licenses>
504+
<license>
505+
<name>Apache License, Version 2.0</name>
506+
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
507+
</license>
508+
</licenses>
509+
510+
<scm>
511+
<connection>scm:git:https://github.com/spring-cloud/spring-cloud-contract.git
512+
</connection>
513+
<developerConnection>
514+
scm:git:[email protected]:spring-cloud/spring-cloud-contract.git
515+
</developerConnection>
516+
<url>https://github.com/spring-cloud/spring-cloud-contract</url>
517+
<tag>HEAD</tag>
518+
</scm>
519+
502520
<developers>
503521
<developer>
504522
<id>mariuszs</id>
@@ -513,25 +531,25 @@
513531
<developer>
514532
<id>dsyer</id>
515533
<name>David Syer</name>
516-
<email>dsyer@vmware.com</email>
534+
<email>david.syer at broadcom.com</email>
517535
</developer>
518536
<developer>
519537
<id>OlgaMaciaszek</id>
520538
<name>Olga Maciaszek-Sharma</name>
521-
<email>[email protected]</email>
539+
<email>olga.maciaszek-sharma at broadcom.com</email>
540+
</developer>
541+
<developer>
542+
<id>sgibb</id>
543+
<name>Spencer Gibb</name>
544+
<email>spencer.gibb at broadcom.com</email>
545+
</developer>
546+
<developer>
547+
<id>rbaxter</id>
548+
<name>Ryan Baxter</name>
549+
<email>ryan.baxter at broadcom.com</email>
522550
</developer>
523551
</developers>
524552

525-
<scm>
526-
<connection>scm:git:https://github.com/spring-cloud/spring-cloud-contract.git
527-
</connection>
528-
<developerConnection>
529-
scm:git:[email protected]:spring-cloud/spring-cloud-contract.git
530-
</developerConnection>
531-
<url>https://github.com/spring-cloud/spring-cloud-contract</url>
532-
<tag>HEAD</tag>
533-
</scm>
534-
535553
<issueManagement>
536554
<system>GitHub</system>
537555
<url>https://github.com/spring-cloud/spring-cloud-contract/issues</url>
@@ -548,7 +566,7 @@
548566
<plugin>
549567
<groupId>org.codehaus.mojo</groupId>
550568
<artifactId>flatten-maven-plugin</artifactId>
551-
<version>1.5.0</version>
569+
<version>${flatten-maven-plugin.version}</version>
552570
</plugin>
553571
<plugin>
554572
<groupId>org.apache.maven.plugins</groupId>
@@ -609,6 +627,10 @@
609627
<skip>true</skip>
610628
</configuration>
611629
</plugin>
630+
<plugin>
631+
<groupId>org.codehaus.mojo</groupId>
632+
<artifactId>flatten-maven-plugin</artifactId>
633+
</plugin>
612634
</plugins>
613635
</build>
614636

@@ -745,6 +767,23 @@
745767
<configuration>
746768
<excludeArtifacts>
747769
<artifact>spring-cloud-contract-stub-runner-boot</artifact>
770+
<artifact>spring-cloud-contract-docker-parent</artifact>
771+
<artifact>spring-cloud-contract-specs</artifact>
772+
<artifact>spring-cloud-contract-tests</artifact>
773+
<artifact>spring-cloud-contract-stub-runner-boot-zookeeper</artifact>
774+
<artifact>spring-cloud-contract-stub-runner-boot-eureka</artifact>
775+
<artifact>spring-cloud-contract-sample-jms</artifact>
776+
<artifact>spring-cloud-contract-stub-runner-kafka</artifact>
777+
<artifactId>spring-cloud-contract-sample-amqp</artifactId>
778+
<artifactId>spring-cloud-contract-stub-runner-integration</artifactId>
779+
<artifactId>spring-cloud-contract-stub-runner-amqp</artifactId>
780+
<artifactId>spring-cloud-contract-sample-integration</artifactId>
781+
<artifactId>spring-cloud-contract-stub-runner-jms</artifactId>
782+
<artifactId>spring-cloud-contract-sample-camel</artifactId>
783+
<artifactId>spring-cloud-contract-stub-runner-stream</artifactId>
784+
<artifactId>spring-cloud-contract-stub-runner-context-path</artifactId>
785+
<artifactId>spring-cloud-contract-stub-runner-moco</artifactId>
786+
<artifactId>spring-cloud-contract-stub-runner-moco-contract-jar</artifactId>
748787
</excludeArtifacts>
749788
</configuration>
750789
</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)