Skip to content

Commit 01cca79

Browse files
goellnerphillipgoellnerphillip
committed
Modulerize project for a cleaner separation of server and client. Both can be built by calling maven from the root directory
1 parent 407cb5d commit 01cca79

29 files changed

+475
-218
lines changed

‎pom.xml‎

Lines changed: 7 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>de.dhbw.ravensburg.verteiltesysteme</groupId>
8-
<artifactId>sampling-message-server</artifactId>
8+
<artifactId>sampling-message-service</artifactId>
99
<version>0.1</version>
10+
<packaging>pom</packaging>
11+
1012
<properties>
1113
<maven.compiler.source>1.8</maven.compiler.source>
1214
<maven.compiler.target>1.8</maven.compiler.target>
@@ -16,149 +18,8 @@
1618
<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
1719
</properties>
1820

19-
<build>
20-
<extensions>
21-
<extension>
22-
<groupId>kr.motd.maven</groupId>
23-
<artifactId>os-maven-plugin</artifactId>
24-
<version>1.5.0.Final</version>
25-
</extension>
26-
</extensions>
27-
<plugins>
28-
<plugin>
29-
<groupId>org.xolstice.maven.plugins</groupId>
30-
<artifactId>protobuf-maven-plugin</artifactId>
31-
<version>0.5.1</version>
32-
<configuration>
33-
<protocArtifact>com.google.protobuf:protoc:3.5.1-1:exe:${os.detected.classifier}</protocArtifact>
34-
<pluginId>grpc-java</pluginId>
35-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.11.0:exe:${os.detected.classifier}</pluginArtifact>
36-
</configuration>
37-
<executions>
38-
<execution>
39-
<goals>
40-
<goal>compile</goal>
41-
<goal>compile-custom</goal>
42-
</goals>
43-
</execution>
44-
</executions>
45-
</plugin>
46-
<plugin>
47-
<groupId>org.apache.maven.plugins</groupId>
48-
<artifactId>maven-compiler-plugin</artifactId>
49-
<version>3.7.0</version>
50-
</plugin>
51-
<plugin>
52-
<artifactId>maven-assembly-plugin</artifactId>
53-
<configuration>
54-
<archive>
55-
<manifest>
56-
<mainClass>de.dhbw.ravensburg.verteiltesysteme.Main</mainClass>
57-
</manifest>
58-
</archive>
59-
<descriptorRefs>
60-
<descriptorRef>jar-with-dependencies</descriptorRef>
61-
</descriptorRefs>
62-
</configuration>
63-
<executions>
64-
<execution>
65-
<id>make-assembly</id> <!-- this is used for inheritance merges -->
66-
<phase>package</phase> <!-- bind to the packaging phase -->
67-
<goals>
68-
<goal>single</goal>
69-
</goals>
70-
</execution>
71-
</executions>
72-
</plugin>
73-
<plugin>
74-
<groupId>org.codehaus.mojo</groupId>
75-
<artifactId>build-helper-maven-plugin</artifactId>
76-
<version>1.9.1</version>
77-
<executions>
78-
<execution>
79-
<id>add-integration-test-source-as-test-sources</id>
80-
<phase>generate-test-sources</phase>
81-
<goals>
82-
<goal>add-test-source</goal>
83-
</goals>
84-
<configuration>
85-
<sources>
86-
<source>src/it/java</source>
87-
</sources>
88-
</configuration>
89-
</execution>
90-
</executions>
91-
</plugin>
92-
<plugin>
93-
<groupId>org.apache.maven.plugins</groupId>
94-
<artifactId>maven-failsafe-plugin</artifactId>
95-
<version>2.20</version>
96-
<executions>
97-
<execution>
98-
<id>integration-test</id>
99-
<goals>
100-
<goal>integration-test</goal>
101-
<goal>verify</goal>
102-
</goals>
103-
</execution>
104-
</executions>
105-
</plugin>
106-
</plugins>
107-
</build>
108-
109-
<dependencies>
110-
<dependency>
111-
<groupId>io.grpc</groupId>
112-
<artifactId>grpc-netty</artifactId>
113-
<version>${io.grpc.version}</version>
114-
</dependency>
115-
<dependency>
116-
<groupId>io.grpc</groupId>
117-
<artifactId>grpc-protobuf</artifactId>
118-
<version>${io.grpc.version}</version>
119-
</dependency>
120-
<dependency>
121-
<groupId>io.grpc</groupId>
122-
<artifactId>grpc-stub</artifactId>
123-
<version>${io.grpc.version}</version>
124-
</dependency>
125-
<dependency>
126-
<groupId>org.projectlombok</groupId>
127-
<artifactId>lombok</artifactId>
128-
<version>${org.projectlombok.version}</version>
129-
<scope>provided</scope>
130-
</dependency>
131-
<dependency>
132-
<groupId>org.apache.logging.log4j</groupId>
133-
<artifactId>log4j-api</artifactId>
134-
<version>${org.apache.logging.log4j.version}</version>
135-
</dependency>
136-
<dependency>
137-
<groupId>org.apache.logging.log4j</groupId>
138-
<artifactId>log4j-core</artifactId>
139-
<version>${org.apache.logging.log4j.version}</version>
140-
</dependency>
141-
<dependency>
142-
<groupId>org.apache.logging.log4j</groupId>
143-
<artifactId>log4j-slf4j-impl</artifactId>
144-
<version>${org.apache.logging.log4j.version}</version>
145-
</dependency>
146-
<dependency>
147-
<groupId>org.mapstruct</groupId>
148-
<artifactId>mapstruct-jdk8</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
149-
<version>${org.mapstruct.version}</version>
150-
</dependency>
151-
<dependency>
152-
<groupId>org.mapstruct</groupId>
153-
<artifactId>mapstruct-processor</artifactId>
154-
<version>${org.mapstruct.version}</version>
155-
</dependency>
156-
157-
<dependency>
158-
<groupId>org.testng</groupId>
159-
<artifactId>testng</artifactId>
160-
<version>6.14.3</version>
161-
<scope>test</scope>
162-
</dependency>
163-
</dependencies>
21+
<modules>
22+
<module>sampling-message-server</module>
23+
<module>sampling-message-client</module>
24+
</modules>
16425
</project>

‎sampling-message-client/pom.xml‎

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="http://maven.apache.org/POM/4.0.0"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<artifactId>sampling-message-client</artifactId>
8+
<version>0.1</version>
9+
<packaging>jar</packaging>
10+
11+
<parent>
12+
<groupId>de.dhbw.ravensburg.verteiltesysteme</groupId>
13+
<artifactId>sampling-message-service</artifactId>
14+
<version>0.1</version>
15+
</parent>
16+
17+
<properties>
18+
<maven.compiler.source>1.8</maven.compiler.source>
19+
<maven.compiler.target>1.8</maven.compiler.target>
20+
<io.grpc.version>1.12.0</io.grpc.version>
21+
<org.apache.logging.log4j.version>2.11.0</org.apache.logging.log4j.version>
22+
<org.projectlombok.version>1.16.20</org.projectlombok.version>
23+
<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
24+
</properties>
25+
26+
<build>
27+
<extensions>
28+
<extension>
29+
<groupId>kr.motd.maven</groupId>
30+
<artifactId>os-maven-plugin</artifactId>
31+
<version>1.5.0.Final</version>
32+
</extension>
33+
</extensions>
34+
<plugins>
35+
<plugin>
36+
<groupId>org.xolstice.maven.plugins</groupId>
37+
<artifactId>protobuf-maven-plugin</artifactId>
38+
<version>0.5.1</version>
39+
<configuration>
40+
<protocArtifact>com.google.protobuf:protoc:3.5.1-1:exe:${os.detected.classifier}</protocArtifact>
41+
<pluginId>grpc-java</pluginId>
42+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.11.0:exe:${os.detected.classifier}</pluginArtifact>
43+
</configuration>
44+
<executions>
45+
<execution>
46+
<goals>
47+
<goal>compile</goal>
48+
<goal>compile-custom</goal>
49+
</goals>
50+
</execution>
51+
</executions>
52+
</plugin>
53+
<plugin>
54+
<groupId>org.apache.maven.plugins</groupId>
55+
<artifactId>maven-compiler-plugin</artifactId>
56+
<version>3.7.0</version>
57+
</plugin>
58+
<plugin>
59+
<artifactId>maven-assembly-plugin</artifactId>
60+
<configuration>
61+
<archive>
62+
<manifest>
63+
<mainClass>de.dhbw.ravensburg.verteiltesysteme.client.Main</mainClass>
64+
</manifest>
65+
</archive>
66+
<descriptorRefs>
67+
<descriptorRef>jar-with-dependencies</descriptorRef>
68+
</descriptorRefs>
69+
</configuration>
70+
<executions>
71+
<execution>
72+
<id>make-assembly</id> <!-- this is used for inheritance merges -->
73+
<phase>package</phase> <!-- bind to the packaging phase -->
74+
<goals>
75+
<goal>single</goal>
76+
</goals>
77+
</execution>
78+
</executions>
79+
</plugin>
80+
<plugin>
81+
<groupId>org.codehaus.mojo</groupId>
82+
<artifactId>build-helper-maven-plugin</artifactId>
83+
<version>1.9.1</version>
84+
<executions>
85+
<execution>
86+
<id>add-integration-test-source-as-test-sources</id>
87+
<phase>generate-test-sources</phase>
88+
<goals>
89+
<goal>add-test-source</goal>
90+
</goals>
91+
<configuration>
92+
<sources>
93+
<source>src/it/java</source>
94+
</sources>
95+
</configuration>
96+
</execution>
97+
</executions>
98+
</plugin>
99+
<plugin>
100+
<groupId>org.apache.maven.plugins</groupId>
101+
<artifactId>maven-failsafe-plugin</artifactId>
102+
<version>2.20</version>
103+
<executions>
104+
<execution>
105+
<id>integration-test</id>
106+
<goals>
107+
<goal>integration-test</goal>
108+
<goal>verify</goal>
109+
</goals>
110+
</execution>
111+
</executions>
112+
</plugin>
113+
</plugins>
114+
</build>
115+
116+
<dependencies>
117+
<dependency>
118+
<groupId>io.grpc</groupId>
119+
<artifactId>grpc-netty</artifactId>
120+
<version>${io.grpc.version}</version>
121+
</dependency>
122+
<dependency>
123+
<groupId>io.grpc</groupId>
124+
<artifactId>grpc-protobuf</artifactId>
125+
<version>${io.grpc.version}</version>
126+
</dependency>
127+
<dependency>
128+
<groupId>io.grpc</groupId>
129+
<artifactId>grpc-stub</artifactId>
130+
<version>${io.grpc.version}</version>
131+
</dependency>
132+
<dependency>
133+
<groupId>org.projectlombok</groupId>
134+
<artifactId>lombok</artifactId>
135+
<version>${org.projectlombok.version}</version>
136+
<scope>provided</scope>
137+
</dependency>
138+
<dependency>
139+
<groupId>org.apache.logging.log4j</groupId>
140+
<artifactId>log4j-api</artifactId>
141+
<version>${org.apache.logging.log4j.version}</version>
142+
</dependency>
143+
<dependency>
144+
<groupId>org.apache.logging.log4j</groupId>
145+
<artifactId>log4j-core</artifactId>
146+
<version>${org.apache.logging.log4j.version}</version>
147+
</dependency>
148+
<dependency>
149+
<groupId>org.apache.logging.log4j</groupId>
150+
<artifactId>log4j-slf4j-impl</artifactId>
151+
<version>${org.apache.logging.log4j.version}</version>
152+
</dependency>
153+
<dependency>
154+
<groupId>commons-cli</groupId>
155+
<artifactId>commons-cli</artifactId>
156+
<version>1.4</version>
157+
</dependency>
158+
159+
160+
<dependency>
161+
<groupId>org.testng</groupId>
162+
<artifactId>testng</artifactId>
163+
<version>6.14.3</version>
164+
<scope>test</scope>
165+
</dependency>
166+
<dependency>
167+
<groupId>de.dhbw.ravensburg.verteiltesysteme</groupId>
168+
<artifactId>sampling-message-server</artifactId>
169+
<version>0.1</version>
170+
</dependency>
171+
</dependencies>
172+
</project>

0 commit comments

Comments
 (0)