Skip to content

Commit 78f1ea9

Browse files
quantdevvquantdevv
committed
resolved dependency & structured classes
1 parent 931ab84 commit 78f1ea9

File tree

9 files changed

+90
-73
lines changed

9 files changed

+90
-73
lines changed

‎polling-publisher/etc/polling-publisher.urm.puml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@startuml
2+
@enduml

‎polling-publisher/polling-service/pom.xml

+2-13
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,9 @@
3434
</parent>
3535

3636
<artifactId>polling-service</artifactId>
37-
<version>1.26.0-SNAPSHOT</version>
38-
<packaging>pom</packaging>
37+
<packaging>jar</packaging>
3938

40-
<dependencyManagement>
41-
<dependencies>
42-
<dependency>
43-
<groupId>com.h2database</groupId>
44-
<artifactId>h2</artifactId>
45-
<scope>runtime</scope>
46-
</dependency>
47-
</dependencies>
48-
</dependencyManagement>
49-
50-
<build>
39+
<build>
5140
<plugins>
5241
<plugin>
5342
<groupId>org.apache.maven.plugins</groupId>

‎polling-publisher/polling-service/src/main/java/com/iluwatar/polling/App.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ public class App {
4242
* @param args command line args.
4343
*/
4444
public static void main(String[] args) {
45-
SpringApplication.run(PollingApplication.class, args);
45+
SpringApplication.run(App.class, args);
4646
}
4747
}

‎polling-publisher/polling-service/src/test/java/com/iluwatar/polling/AppTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
package com.iluwatar.polling;
2626

27-
import org.junit.api.Test;
27+
import org.junit.jupiter.api.Test;
2828

2929
public class AppTest {
3030

‎polling-publisher/polling-service/src/test/java/com/iluwatar/polling/DataSourceServiceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
package com.iluwatar.polling;
2727

2828
import org.junit.jupiter.api.Test;
29-
import static org.junit.jupiter.api.Assertions;
29+
import org.junit.jupiter.api.Assertions;
3030

3131
/*
3232
* this class contains the unit test for DataSoourceServiceTest class.

‎polling-publisher/pom.xml

+77-40
Original file line numberDiff line numberDiff line change
@@ -33,59 +33,96 @@
3333
<version>1.26.0-SNAPSHOT</version>
3434
</parent>
3535

36-
<groupId>com.iluwatar</groupId>
3736
<artifactId>polling-publisher</artifactId>
38-
<version>1.26.0-SNAPSHOT</version>
3937
<packaging>pom</packaging>
4038

41-
39+
<modules>
40+
<module>polling-service</module>
41+
<module>subscriber-service</module>
42+
</modules>
43+
4244
<properties>
4345
<java.version>21</java.version>
44-
<spring.boot.version>3.2.0</spring.boot.version>
46+
<spring.boot.version>3.4.0</spring.boot.version>
4547
</properties>
4648

47-
<dependencyManagement>
48-
<dependencies>
49-
<dependency>
50-
<groupId>org.springframework.boot</groupId>
51-
<artifactId>spring-boot-dependencies</artifactId>
52-
<version>${spring.boot.version}</version>
53-
<type>pom</type>
54-
<scope>import</scope>
55-
</dependency>
56-
57-
<dependency>
49+
<dependencies>
50+
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
51+
<dependency>
52+
<groupId>org.junit.jupiter</groupId>
53+
<artifactId>junit-jupiter-api</artifactId>
54+
<version>5.10.1</version>
55+
<scope>test</scope>
56+
</dependency>
57+
<dependency>
5858
<groupId>org.junit.jupiter</groupId>
5959
<artifactId>junit-jupiter-engine</artifactId>
60+
<version>5.9.2</version>
6061
<scope>test</scope>
61-
</dependency>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.springframework.boot</groupId>
65+
<artifactId>spring-boot-dependencies</artifactId>
66+
<version>${spring.boot.version}</version>
67+
<type>pom</type>
68+
<scope>import</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.springframework.boot</groupId>
72+
<artifactId>spring-boot-starter-web</artifactId>
73+
<version>${spring.boot.version}</version>
74+
</dependency>
6275

63-
<dependency>
76+
<dependency>
77+
<groupId>org.springframework.boot</groupId>
78+
<artifactId>spring-boot-starter</artifactId>
79+
<version>${spring.boot.version}</version>
80+
</dependency>
81+
82+
<!-- Spring Boot Test -->
83+
<dependency>
84+
<groupId>org.springframework.boot</groupId>
85+
<artifactId>spring-boot-starter-test</artifactId>
86+
<version>${spring.boot.version}</version>
87+
<scope>test</scope>
88+
</dependency>
89+
90+
<!-- https://mvnrepository.com/artifact/org.springframework.kafka/spring-kafka -->
91+
<dependency>
92+
<groupId>org.springframework.kafka</groupId>
93+
<artifactId>spring-kafka</artifactId>
94+
<version>3.3.2</version>
95+
</dependency>
96+
97+
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot -->
98+
<dependency>
99+
<groupId>org.springframework.boot</groupId>
100+
<artifactId>spring-boot</artifactId>
101+
<version>${spring.boot.version}</version>
102+
</dependency>
103+
104+
<dependency>
64105
<groupId>org.mockito</groupId>
65106
<artifactId>mockito-core</artifactId>
66107
<scope>test</scope>
67-
</dependency>
68-
</dependencies>
69-
</dependencyManagement>
70-
71-
<!-- <build>
72-
<plugins>
73-
<plugin>
74-
<groupId>org.apache.maven.plugins</groupId>
75-
<artifactId>maven-assembly-plugin</artifactId>
76-
<executions>
77-
<execution>
78-
<configuration>
79-
<archive>
80-
<manifest>
81-
<mainClass>com.iluwatar.polling-publisher.App</mainClass>
82-
</manifest>
83-
</archive>
84-
</configuration>
85-
</execution>
86-
</executions>
87-
</plugin>
88-
</plugins>
89-
</build> -->
108+
</dependency>
109+
</dependencies>
110+
111+
<build>
112+
<pluginManagement>
113+
<plugins>
114+
<plugin>
115+
<groupId>org.apache.maven.plugins</groupId>
116+
<artifactId>maven-compiler-plugin</artifactId>
117+
<!-- <artifactId>maven-assembly-plugin</artifactId>-->
118+
<version>3.8.1</version>
119+
<configuration>
120+
<source>21</source>
121+
<target>21</target>
122+
</configuration>
123+
</plugin>
124+
</plugins>
125+
</pluginManagement>
126+
</build>
90127

91128
</project>

‎polling-publisher/subscriber-service/pom.xml

+2-15
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,10 @@
3333
<version>1.26.0-SNAPSHOT</version>
3434
</parent>
3535

36-
<groupId>com.iluwatar</groupId>
3736
<artifactId>subscriber-service</artifactId>
38-
<version>1.26.0-SNAPSHOT</version>
39-
<packaging>pom</packaging>
37+
<packaging>jar</packaging>
4038

41-
<dependencyManagement>
42-
<dependencies>
43-
44-
<dependency>
45-
<groupId>org.mockito</groupId>
46-
<artifactId>mockito-core</artifactId>
47-
<scope>test</scope>
48-
</dependency>
49-
</dependencies>
50-
</dependencyManagement>
51-
52-
<build>
39+
<build>
5340
<plugins>
5441
<plugin>
5542
<groupId>org.apache.maven.plugins</groupId>

‎polling-publisher/subscriber-service/src/main/java/com/iluwatar/subscriber/App.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
@SpringBootApplication
3535
public class App {
3636
public static void main(String[] args) {
37-
SpringApplication.run(SubscriberApplication.class, args);
37+
SpringApplication.run(App.class, args);
3838
}
3939
}
4040

‎polling-publisher/subscriber-service/src/test/java/com/iluwatar/subscriber/AppTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@
2525

2626
package com.iluwatar.subscriber;
2727

28+
import org.springframework.boot.SpringApplication;
29+
2830
public class AppTest {
2931
public static void main(String[] args) {
30-
SpringApplication.run(SubscriberApplication.class, args);
32+
SpringApplication.run(App.class, args);
3133
}
3234
}

0 commit comments

Comments
 (0)