Skip to content

Commit 9938a9d

Browse files
artem-vartem-v
authored
Set parent to 0.3.14, set dependency on scalecube-test-support, clean poms, cleanup duplicate test utility classes (#937)
1 parent 140e057 commit 9938a9d

File tree

16 files changed

+153
-278
lines changed

16 files changed

+153
-278
lines changed

‎pom.xml‎

Lines changed: 9 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<parent>
68
<groupId>io.scalecube</groupId>
79
<artifactId>scalecube-parent</artifactId>
8-
<version>0.3.12</version>
10+
<version>0.3.14</version>
911
</parent>
1012

1113
<artifactId>scalecube-services-parent</artifactId>
@@ -59,20 +61,7 @@
5961
<properties>
6062
<scalecube-cluster.version>2.7.4</scalecube-cluster.version>
6163
<scalecube-security.version>1.1.8</scalecube-security.version>
62-
63-
<reactor.version>2024.0.8</reactor.version>
64-
<netty.version>4.2.6.Final</netty.version>
65-
<jackson.version>2.19.2</jackson.version>
66-
<rsocket.version>1.1.5</rsocket.version>
67-
<jsr305.version>3.0.2</jsr305.version>
68-
<slf4j.version>1.7.36</slf4j.version>
69-
70-
<mockito-junit.version>4.6.1</mockito-junit.version>
71-
<junit-jupiter.version>5.8.2</junit-jupiter.version>
72-
<hamcrest.version>1.3</hamcrest.version>
73-
<log4j.version>2.17.2</log4j.version>
74-
<vault-java-driver.version>5.1.0</vault-java-driver.version>
75-
<testcontainers.version>1.20.4</testcontainers.version>
64+
<scalecube-test-support.version>0.1.0</scalecube-test-support.version>
7665

7766
<distributionManagement.url>https://maven.pkg.github.com/scalecube/scalecube-services
7867
</distributionManagement.url>
@@ -87,7 +76,6 @@
8776
<module>services-discovery</module>
8877
<module>services-security</module>
8978
<module>services-examples</module>
90-
<module>services-testlib</module>
9179
</modules>
9280

9381
<dependencyManagement>
@@ -120,88 +108,15 @@
120108
<artifactId>scalecube-transport-netty</artifactId>
121109
<version>${scalecube-cluster.version}</version>
122110
</dependency>
123-
124-
<!-- Reactor -->
125-
<dependency>
126-
<groupId>io.projectreactor</groupId>
127-
<artifactId>reactor-bom</artifactId>
128-
<version>${reactor.version}</version>
129-
<type>pom</type>
130-
<scope>import</scope>
131-
</dependency>
132-
133-
<!-- Netty -->
134-
<dependency>
135-
<groupId>io.netty</groupId>
136-
<artifactId>netty-bom</artifactId>
137-
<version>${netty.version}</version>
138-
<type>pom</type>
139-
<scope>import</scope>
140-
</dependency>
141-
142-
<!-- Logging -->
143-
<dependency>
144-
<groupId>org.slf4j</groupId>
145-
<artifactId>slf4j-api</artifactId>
146-
<version>${slf4j.version}</version>
147-
</dependency>
148-
<dependency>
149-
<groupId>org.apache.logging.log4j</groupId>
150-
<artifactId>log4j-bom</artifactId>
151-
<version>${log4j.version}</version>
152-
<type>pom</type>
153-
<scope>import</scope>
154-
</dependency>
155-
156-
<!-- RSocket -->
157-
<dependency>
158-
<groupId>io.rsocket</groupId>
159-
<artifactId>rsocket-bom</artifactId>
160-
<version>${rsocket.version}</version>
161-
<type>pom</type>
162-
<scope>import</scope>
163-
</dependency>
164-
165-
<!-- Jackson -->
166-
<dependency>
167-
<groupId>com.fasterxml.jackson</groupId>
168-
<artifactId>jackson-bom</artifactId>
169-
<version>${jackson.version}</version>
170-
<type>pom</type>
171-
<scope>import</scope>
172-
</dependency>
173111
</dependencies>
174112
</dependencyManagement>
175113

176114
<dependencies>
177-
<!-- Test scope -->
178-
<dependency>
179-
<groupId>org.junit.jupiter</groupId>
180-
<artifactId>junit-jupiter-engine</artifactId>
181-
<version>${junit-jupiter.version}</version>
182-
<scope>test</scope>
183-
</dependency>
184-
<dependency>
185-
<groupId>org.junit.jupiter</groupId>
186-
<artifactId>junit-jupiter-params</artifactId>
187-
<version>${junit-jupiter.version}</version>
188-
<scope>test</scope>
189-
</dependency>
190-
<dependency>
191-
<groupId>org.mockito</groupId>
192-
<artifactId>mockito-junit-jupiter</artifactId>
193-
<version>${mockito-junit.version}</version>
194-
<scope>test</scope>
195-
</dependency>
196-
<dependency>
197-
<groupId>org.hamcrest</groupId>
198-
<artifactId>hamcrest-all</artifactId>
199-
<version>${hamcrest.version}</version>
200-
<scope>test</scope>
201-
</dependency>
115+
<!-- Tests -->
202116
<dependency>
203-
<groupId>io.projectreactor</groupId>
204-
<artifactId>reactor-test</artifactId>
117+
<groupId>io.scalecube</groupId>
118+
<artifactId>scalecube-test-support</artifactId>
119+
<version>${scalecube-test-support.version}</version>
205120
<scope>test</scope>
206121
</dependency>
207122
</dependencies>

‎services-api/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@
2121
<groupId>org.slf4j</groupId>
2222
<artifactId>slf4j-api</artifactId>
2323
</dependency>
24-
<!-- Tests -->
25-
<dependency>
26-
<groupId>io.scalecube</groupId>
27-
<artifactId>scalecube-services-testlib</artifactId>
28-
<version>${project.version}</version>
29-
<scope>test</scope>
30-
</dependency>
3124
</dependencies>
3225

3326
</project>

‎services-api/src/test/resources/log4j2-test.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration>
3+
4+
<Properties>
5+
<Property name="patternLayout">%level{length=1} %d{ISO8601} %c{1.} %m [%t]%n</Property>
6+
</Properties>
7+
8+
<Appenders>
9+
<Console name="STDOUT" target="SYSTEM_OUT">
10+
<PatternLayout pattern="${patternLayout}"/>
11+
</Console>
12+
</Appenders>
13+
14+
<Loggers>
15+
<Logger name="io.scalecube.services" level="${env:servicesLogLevel:-INFO}"/>
16+
<Logger name="io.scalecube.services.gateway" level="${env:gatewayLogLevel:-INFO}"/>
17+
<Logger name="io.scalecube.transport" level="${env:servicesTransportLogLevel:-INFO}"/>
18+
<Logger name="io.scalecube.cluster" level="${env:clusterLogLevel:-INFO}"/>
19+
<Logger name="io.scalecube.config" level="${env:configLogLevel:-INFO}"/>
20+
<Logger name="io.scalecube.config.audit" level="${env:configAuditLogLevel:-INFO}"/>
21+
<Logger name="reactor.util" level="${env:reactorUtilLogLevel:-WARN}"/>
22+
<Logger name="reactor.core" level="${env:reactorCoreLogLevel:-WARN}"/>
23+
<Logger name="reactor.netty" level="${env:reactorNettyLogLevel:-ERROR}"/>
24+
<Logger name="io.netty" level="${env:nettyLogLevel:-ERROR}"/>
25+
<logger name="io.rsocket.transport.netty" level="${env:rsocketTransportNettyLogLevel:-WARN}"/>
26+
<logger name="io.rsocket.FrameLogger" level="${env:rsocketFrameLoggerLogLevel:-WARN}"/>
27+
<logger name="io.rsocket" level="${env:rsocketLogLevel:-INFO}"/>
28+
29+
<Root level="${env:logLevel:-DEBUG}">
30+
<AppenderRef ref="${env:logAppender:-STDOUT}"/>
31+
</Root>
32+
</Loggers>
33+
34+
</Configuration>

‎services-discovery/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
2121
<artifactId>scalecube-cluster</artifactId>
2222
</dependency>
2323
<!-- Tests -->
24-
<dependency>
25-
<groupId>io.scalecube</groupId>
26-
<artifactId>scalecube-services-testlib</artifactId>
27-
<version>${project.version}</version>
28-
<scope>test</scope>
29-
</dependency>
3024
<dependency>
3125
<groupId>io.scalecube</groupId>
3226
<artifactId>scalecube-codec-jackson</artifactId>

‎services-discovery/src/test/resources/log4j2-test.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration>
3+
4+
<Properties>
5+
<Property name="patternLayout">%level{length=1} %d{ISO8601} %c{1.} %m [%t]%n</Property>
6+
</Properties>
7+
8+
<Appenders>
9+
<Console name="STDOUT" target="SYSTEM_OUT">
10+
<PatternLayout pattern="${patternLayout}"/>
11+
</Console>
12+
</Appenders>
13+
14+
<Loggers>
15+
<Logger name="io.scalecube.services" level="${env:servicesLogLevel:-INFO}"/>
16+
<Logger name="io.scalecube.services.gateway" level="${env:gatewayLogLevel:-INFO}"/>
17+
<Logger name="io.scalecube.transport" level="${env:servicesTransportLogLevel:-INFO}"/>
18+
<Logger name="io.scalecube.cluster" level="${env:clusterLogLevel:-INFO}"/>
19+
<Logger name="io.scalecube.config" level="${env:configLogLevel:-INFO}"/>
20+
<Logger name="io.scalecube.config.audit" level="${env:configAuditLogLevel:-INFO}"/>
21+
<Logger name="reactor.util" level="${env:reactorUtilLogLevel:-WARN}"/>
22+
<Logger name="reactor.core" level="${env:reactorCoreLogLevel:-WARN}"/>
23+
<Logger name="reactor.netty" level="${env:reactorNettyLogLevel:-ERROR}"/>
24+
<Logger name="io.netty" level="${env:nettyLogLevel:-ERROR}"/>
25+
<logger name="io.rsocket.transport.netty" level="${env:rsocketTransportNettyLogLevel:-WARN}"/>
26+
<logger name="io.rsocket.FrameLogger" level="${env:rsocketFrameLoggerLogLevel:-WARN}"/>
27+
<logger name="io.rsocket" level="${env:rsocketLogLevel:-INFO}"/>
28+
29+
<Root level="${env:logLevel:-DEBUG}">
30+
<AppenderRef ref="${env:logAppender:-STDOUT}"/>
31+
</Root>
32+
</Loggers>
33+
34+
</Configuration>

‎services-gateway/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@
4242
</dependency>
4343

4444
<!-- Tests -->
45-
<dependency>
46-
<groupId>io.scalecube</groupId>
47-
<artifactId>scalecube-services-testlib</artifactId>
48-
<version>${project.version}</version>
49-
<scope>test</scope>
50-
</dependency>
5145
<dependency>
5246
<groupId>io.scalecube</groupId>
5347
<artifactId>scalecube-services-examples</artifactId>

‎services-gateway/src/test/resources/log4j2-test.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration>
3+
4+
<Properties>
5+
<Property name="patternLayout">%level{length=1} %d{ISO8601} %c{1.} %m [%t]%n</Property>
6+
</Properties>
7+
8+
<Appenders>
9+
<Console name="STDOUT" target="SYSTEM_OUT">
10+
<PatternLayout pattern="${patternLayout}"/>
11+
</Console>
12+
</Appenders>
13+
14+
<Loggers>
15+
<Logger name="io.scalecube.services" level="${env:servicesLogLevel:-INFO}"/>
16+
<Logger name="io.scalecube.services.gateway" level="${env:gatewayLogLevel:-INFO}"/>
17+
<Logger name="io.scalecube.transport" level="${env:servicesTransportLogLevel:-INFO}"/>
18+
<Logger name="io.scalecube.cluster" level="${env:clusterLogLevel:-INFO}"/>
19+
<Logger name="io.scalecube.config" level="${env:configLogLevel:-INFO}"/>
20+
<Logger name="io.scalecube.config.audit" level="${env:configAuditLogLevel:-INFO}"/>
21+
<Logger name="reactor.util" level="${env:reactorUtilLogLevel:-WARN}"/>
22+
<Logger name="reactor.core" level="${env:reactorCoreLogLevel:-WARN}"/>
23+
<Logger name="reactor.netty" level="${env:reactorNettyLogLevel:-ERROR}"/>
24+
<Logger name="io.netty" level="${env:nettyLogLevel:-ERROR}"/>
25+
<logger name="io.rsocket.transport.netty" level="${env:rsocketTransportNettyLogLevel:-WARN}"/>
26+
<logger name="io.rsocket.FrameLogger" level="${env:rsocketFrameLoggerLogLevel:-WARN}"/>
27+
<logger name="io.rsocket" level="${env:rsocketLogLevel:-INFO}"/>
28+
29+
<Root level="${env:logLevel:-DEBUG}">
30+
<AppenderRef ref="${env:logAppender:-STDOUT}"/>
31+
</Root>
32+
</Loggers>
33+
34+
</Configuration>

‎services-security/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626
<artifactId>scalecube-security-vault</artifactId>
2727
</dependency>
2828
<!-- Tests -->
29-
<dependency>
30-
<groupId>io.scalecube</groupId>
31-
<artifactId>scalecube-services-testlib</artifactId>
32-
<version>${project.version}</version>
33-
<scope>test</scope>
34-
</dependency>
3529
<dependency>
3630
<groupId>io.scalecube</groupId>
3731
<artifactId>scalecube-security-tests</artifactId>

‎services-testlib/pom.xml‎

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

0 commit comments

Comments
 (0)