Skip to content

Commit ea642bb

Browse files
etrandafir93etrandafir93
committed
move consumer/producer sample projects to root
1 parent c4c56bd commit ea642bb

16 files changed

Lines changed: 166 additions & 106 deletions

File tree

consumer_producer_kafka_avro/pom.xml renamed to consumer_kafka_avro/pom.xml

Lines changed: 74 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,18 @@
1111
</parent>
1212

1313
<groupId>org.springframework.cloud</groupId>
14-
<artifactId>spring-cloud-contract-sample-kafka</artifactId>
14+
<artifactId>consumer_kafka_avro</artifactId>
1515
<version>5.0.2-SNAPSHOT</version>
16-
<packaging>pom</packaging>
16+
<packaging>jar</packaging>
1717

1818
<properties>
1919
<spring-boot.version>4.0.1</spring-boot.version>
2020
<kafka-avro-serializer.version>8.1.1</kafka-avro-serializer.version>
2121
<spring-cloud.version>2025.1.0</spring-cloud.version>
2222
<testcontainers.version>1.20.4</testcontainers.version>
23+
<avro.version>1.12.0</avro.version>
2324
</properties>
2425

25-
<modules>
26-
<module>sample-kafka-avro-producer</module>
27-
<module>sample-kafka-avro-consumer</module>
28-
</modules>
29-
3026
<repositories>
3127
<repository>
3228
<id>confluent</id>
@@ -91,6 +87,53 @@
9187
</dependencies>
9288
</dependencyManagement>
9389

90+
<dependencies>
91+
<dependency>
92+
<groupId>org.apache.avro</groupId>
93+
<artifactId>avro</artifactId>
94+
<version>${avro.version}</version>
95+
</dependency>
96+
<dependency>
97+
<groupId>org.springframework.boot</groupId>
98+
<artifactId>spring-boot-starter</artifactId>
99+
</dependency>
100+
<dependency>
101+
<groupId>org.springframework.boot</groupId>
102+
<artifactId>spring-boot-starter-kafka</artifactId>
103+
</dependency>
104+
<dependency>
105+
<groupId>io.confluent</groupId>
106+
<artifactId>kafka-avro-serializer</artifactId>
107+
</dependency>
108+
109+
<dependency>
110+
<groupId>org.springframework.boot</groupId>
111+
<artifactId>spring-boot-starter-test</artifactId>
112+
<scope>test</scope>
113+
</dependency>
114+
<dependency>
115+
<groupId>org.springframework.cloud</groupId>
116+
<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
117+
<scope>test</scope>
118+
</dependency>
119+
120+
<dependency>
121+
<groupId>org.testcontainers</groupId>
122+
<artifactId>testcontainers</artifactId>
123+
<scope>test</scope>
124+
</dependency>
125+
<dependency>
126+
<groupId>org.testcontainers</groupId>
127+
<artifactId>junit-jupiter</artifactId>
128+
<scope>test</scope>
129+
</dependency>
130+
<dependency>
131+
<groupId>org.testcontainers</groupId>
132+
<artifactId>kafka</artifactId>
133+
<scope>test</scope>
134+
</dependency>
135+
</dependencies>
136+
94137
<build>
95138
<pluginManagement>
96139
<plugins>
@@ -101,5 +144,29 @@
101144
</plugin>
102145
</plugins>
103146
</pluginManagement>
147+
<plugins>
148+
<plugin>
149+
<groupId>org.apache.avro</groupId>
150+
<artifactId>avro-maven-plugin</artifactId>
151+
<version>1.11.3</version>
152+
<executions>
153+
<execution>
154+
<phase>generate-sources</phase>
155+
<goals>
156+
<goal>schema</goal>
157+
</goals>
158+
<configuration>
159+
<sourceDirectory>${project.basedir}/src/main/resources/avro</sourceDirectory>
160+
<outputDirectory>${project.build.directory}/generated-sources/avro</outputDirectory>
161+
<stringType>String</stringType>
162+
</configuration>
163+
</execution>
164+
</executions>
165+
</plugin>
166+
<plugin>
167+
<groupId>org.springframework.boot</groupId>
168+
<artifactId>spring-boot-maven-plugin</artifactId>
169+
</plugin>
170+
</plugins>
104171
</build>
105172
</project>

consumer_producer_kafka_avro/sample-kafka-avro-consumer/src/main/java/com/example/kafka/consumer/BooksReturnedListener.java renamed to consumer_kafka_avro/src/main/java/com/example/kafka/consumer/BooksReturnedListener.java

File renamed without changes.

consumer_producer_kafka_avro/sample-kafka-avro-consumer/src/main/java/com/example/kafka/consumer/EmailService.java renamed to consumer_kafka_avro/src/main/java/com/example/kafka/consumer/EmailService.java

File renamed without changes.

consumer_producer_kafka_avro/sample-kafka-avro-consumer/src/main/java/com/example/kafka/consumer/KafkaAvroConsumerApplication.java renamed to consumer_kafka_avro/src/main/java/com/example/kafka/consumer/KafkaAvroConsumerApplication.java

File renamed without changes.

consumer_producer_kafka_avro/sample-kafka-avro-consumer/src/main/resources/application.yml renamed to consumer_kafka_avro/src/main/resources/application.yml

File renamed without changes.

consumer_producer_kafka_avro/sample-kafka-avro-consumer/src/main/resources/avro/Book.avsc renamed to consumer_kafka_avro/src/main/resources/avro/Book.avsc

File renamed without changes.

consumer_producer_kafka_avro/sample-kafka-avro-consumer/src/test/java/com/example/kafka/consumer/CollaborationTest.java renamed to consumer_kafka_avro/src/test/java/com/example/kafka/consumer/CollaborationTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.example.kafka.avro.Book;
77

88
import org.jetbrains.annotations.Nullable;
9+
import org.junit.jupiter.api.Tag;
910
import org.junit.jupiter.api.Test;
1011
import org.junit.jupiter.api.extension.ExtendWith;
1112
import org.testcontainers.junit.jupiter.Container;
@@ -40,6 +41,7 @@
4041
import static org.mockito.ArgumentMatchers.contains;
4142
import static org.mockito.Mockito.verify;
4243

44+
@Tag("kafka-avro")
4345
@Testcontainers
4446
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = {
4547
CollaborationTest.TestConfig.class, KafkaAvroConsumerApplication.class })

‎consumer_producer_kafka_avro/sample-kafka-avro-consumer/pom.xml‎

Lines changed: 0 additions & 93 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<module>producer_with_latest_2_2_features</module>
6969
<!-- <module>producer_kotlin_ftw</module>--><!-- Kotlin issues -->
7070
<module>producer_java</module>
71+
<module>producer_kafka_avro</module>
7172
<module>producer_kafka_middleware</module>
7273
<module>producer_rabbit_middleware</module>
7374
<!-- <module>producer_jms_middleware</module>-->
@@ -76,14 +77,14 @@
7677
<!-- <module>producer_grpc</module>--> <!-- TODO: Java 17?? -->
7778
<module>consumer</module>
7879
<module>consumer_proto</module>
79-
<module>consumer_producer_kafka_avro</module>
8080
<module>consumer_with_stubs_per_consumer</module>
8181
<module>consumer_with_discovery</module>
8282
<module>consumer_with_restdocs</module>
8383
<!--<module>consumer_security</module>--> <!-- TODO: Fix me -->
8484
<module>consumer_with_latest_2_2_features</module>
8585
<module>consumer_java</module>
8686
<!-- <module>consumer_kotlin_ftw</module>--><!-- Kotlin issues -->
87+
<module>consumer_kafka_avro</module>
8788
<module>consumer_kafka_middleware</module>
8889
<module>consumer_rabbit_middleware</module>
8990
<!-- <module>consumer_jms_middleware</module>-->
@@ -136,6 +137,7 @@
136137
<module>producer_with_latest_2_2_features</module>
137138
<!-- <module>producer_kotlin_ftw</module>--><!-- Kotlin issues -->
138139
<module>producer_java</module>
140+
<module>producer_kafka_avro</module>
139141
<module>producer_kafka_middleware</module>
140142
<module>producer_rabbit_middleware</module>
141143
<!-- <module>producer_jms_middleware</module>-->
@@ -151,6 +153,7 @@
151153
<module>consumer_with_latest_2_2_features</module>
152154
<module>consumer_java</module>
153155
<!-- <module>consumer_kotlin_ftw</module>--><!-- Kotlin issues -->
156+
<module>consumer_kafka_avro</module>
154157
<module>consumer_kafka_middleware</module>
155158
<module>consumer_rabbit_middleware</module>
156159
<!-- <module>consumer_jms_middleware</module>-->

consumer_producer_kafka_avro/sample-kafka-avro-producer/pom.xml renamed to producer_kafka_avro/pom.xml

Lines changed: 84 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,89 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
7-
<groupId>org.springframework.cloud</groupId>
8-
<artifactId>spring-cloud-contract-sample-kafka</artifactId>
9-
<version>5.0.2-SNAPSHOT</version>
10-
<relativePath>../pom.xml</relativePath>
7+
<groupId>org.springframework.boot</groupId>
8+
<artifactId>spring-boot-starter-parent</artifactId>
9+
<version>4.0.1</version>
10+
<relativePath/> <!-- lookup parent from repository -->
1111
</parent>
1212

13-
<artifactId>sample-kafka-avro-producer</artifactId>
13+
<groupId>org.springframework.cloud</groupId>
14+
<artifactId>producer_kafka_avro</artifactId>
15+
<version>5.0.2-SNAPSHOT</version>
1416
<packaging>jar</packaging>
1517

1618
<properties>
19+
<spring-boot.version>4.0.1</spring-boot.version>
20+
<kafka-avro-serializer.version>8.1.1</kafka-avro-serializer.version>
21+
<spring-cloud.version>2025.1.0</spring-cloud.version>
22+
<testcontainers.version>1.20.4</testcontainers.version>
1723
<avro.version>1.12.0</avro.version>
1824
</properties>
1925

26+
<repositories>
27+
<repository>
28+
<id>confluent</id>
29+
<name>Confluent Maven Repository</name>
30+
<url>https://packages.confluent.io/maven/</url>
31+
</repository>
32+
<repository>
33+
<id>spring-snapshots</id>
34+
<name>Spring Snapshots</name>
35+
<url>https://repo.spring.io/snapshot</url>
36+
<snapshots>
37+
<enabled>true</enabled>
38+
</snapshots>
39+
</repository>
40+
</repositories>
41+
42+
<pluginRepositories>
43+
<pluginRepository>
44+
<id>spring-snapshots</id>
45+
<name>Spring Snapshots</name>
46+
<url>https://repo.spring.io/snapshot</url>
47+
<snapshots>
48+
<enabled>true</enabled>
49+
</snapshots>
50+
</pluginRepository>
51+
<pluginRepository>
52+
<id>spring-plugin-snapshots</id>
53+
<name>Spring Snapshots</name>
54+
<url>https://repo.spring.io/snapshot</url>
55+
<snapshots>
56+
<enabled>true</enabled>
57+
</snapshots>
58+
</pluginRepository>
59+
</pluginRepositories>
60+
61+
<dependencyManagement>
62+
<dependencies>
63+
<dependency>
64+
<groupId>org.springframework.cloud</groupId>
65+
<artifactId>spring-cloud-dependencies</artifactId>
66+
<version>${spring-cloud.version}</version>
67+
<type>pom</type>
68+
<scope>import</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.testcontainers</groupId>
72+
<artifactId>testcontainers-bom</artifactId>
73+
<version>1.20.4</version>
74+
<type>pom</type>
75+
<scope>import</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>org.springframework.boot</groupId>
79+
<artifactId>spring-boot-starter-kafka</artifactId>
80+
<version>4.0.1</version>
81+
</dependency>
82+
<dependency>
83+
<groupId>io.confluent</groupId>
84+
<artifactId>kafka-avro-serializer</artifactId>
85+
<version>${kafka-avro-serializer.version}</version>
86+
</dependency>
87+
</dependencies>
88+
</dependencyManagement>
89+
2090
<dependencies>
2191
<dependency>
2292
<groupId>org.apache.avro</groupId>
@@ -65,6 +135,15 @@
65135
</dependencies>
66136

67137
<build>
138+
<pluginManagement>
139+
<plugins>
140+
<plugin>
141+
<groupId>org.springframework.boot</groupId>
142+
<artifactId>spring-boot-maven-plugin</artifactId>
143+
<version>4.0.1</version>
144+
</plugin>
145+
</plugins>
146+
</pluginManagement>
68147
<plugins>
69148
<plugin>
70149
<groupId>org.apache.avro</groupId>

0 commit comments

Comments
 (0)