Skip to content

Commit ac578f6

Browse files
artem-vartem-v
authored
Set parent to 0.3.14, set dependency on scalecube-test-support, clean… (#407)
* Set parent to 0.3.14, set dependency on scalecube-test-support, clean poms, cleanup duplicate test utility classes
1 parent c10c75e commit ac578f6

File tree

10 files changed

+54
-176
lines changed

10 files changed

+54
-176
lines changed

‎cluster-testlib/pom.xml‎

Lines changed: 3 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
35
<parent>
46
<artifactId>scalecube-cluster-parent</artifactId>
57
<groupId>io.scalecube</groupId>
@@ -21,55 +23,6 @@
2123
<artifactId>scalecube-cluster-api</artifactId>
2224
<version>${project.version}</version>
2325
</dependency>
24-
25-
<dependency>
26-
<groupId>org.slf4j</groupId>
27-
<artifactId>slf4j-api</artifactId>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.apache.logging.log4j</groupId>
31-
<artifactId>log4j-slf4j-impl</artifactId>
32-
</dependency>
33-
<dependency>
34-
<groupId>org.apache.logging.log4j</groupId>
35-
<artifactId>log4j-core</artifactId>
36-
</dependency>
37-
38-
<dependency>
39-
<groupId>org.junit.jupiter</groupId>
40-
<artifactId>junit-jupiter-api</artifactId>
41-
<version>${junit-jupiter.version}</version>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.junit.jupiter</groupId>
45-
<artifactId>junit-jupiter-engine</artifactId>
46-
<version>${junit-jupiter.version}</version>
47-
</dependency>
48-
<dependency>
49-
<groupId>org.junit.jupiter</groupId>
50-
<artifactId>junit-jupiter-params</artifactId>
51-
<version>${junit-jupiter.version}</version>
52-
</dependency>
53-
<dependency>
54-
<groupId>org.mockito</groupId>
55-
<artifactId>mockito-junit-jupiter</artifactId>
56-
<version>${mockito-junit.version}</version>
57-
<exclusions>
58-
<exclusion>
59-
<groupId>org.junit.jupiter</groupId>
60-
<artifactId>junit-jupiter-api</artifactId>
61-
</exclusion>
62-
</exclusions>
63-
</dependency>
64-
<dependency>
65-
<groupId>org.hamcrest</groupId>
66-
<artifactId>hamcrest-all</artifactId>
67-
<version>${hamcrest.version}</version>
68-
</dependency>
69-
<dependency>
70-
<groupId>io.projectreactor</groupId>
71-
<artifactId>reactor-test</artifactId>
72-
</dependency>
7326
</dependencies>
7427

7528
</project>

‎cluster-testlib/src/main/java/io/scalecube/cluster/utils/LoggingExtension.java‎

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

‎cluster-testlib/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎cluster-testlib/src/main/resources/junit-platform.properties‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎cluster/pom.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<parent>
@@ -26,8 +28,7 @@
2628
<groupId>org.slf4j</groupId>
2729
<artifactId>slf4j-api</artifactId>
2830
</dependency>
29-
30-
<!-- Test dependencies -->
31+
<!-- Tests -->
3132
<dependency>
3233
<groupId>${project.groupId}</groupId>
3334
<artifactId>scalecube-transport-netty</artifactId>

‎cluster-testlib/src/main/resources/log4j2.xml‎ renamed to ‎cluster/src/test/resources/log4j2-test.xml‎

File renamed without changes.

‎codec-parent/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@
2828
<artifactId>scalecube-cluster-api</artifactId>
2929
<version>${project.version}</version>
3030
</dependency>
31-
<!-- Tests -->
32-
<dependency>
33-
<groupId>${project.groupId}</groupId>
34-
<artifactId>scalecube-cluster-testlib</artifactId>
35-
<version>${project.version}</version>
36-
<scope>test</scope>
37-
</dependency>
3831
</dependencies>
3932

4033
</project>

‎examples/src/main/resources/log4j2.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration status="warn">
3+
4+
<Appenders>
5+
<Console name="console" target="SYSTEM_OUT">
6+
<PatternLayout>
7+
<pattern>%level{length=1} %date{HHmm:ss,SSS} %logger{1.} %message [%thread]%n</pattern>
8+
</PatternLayout>
9+
</Console>
10+
</Appenders>
11+
12+
<Loggers>
13+
<Logger name="io.scalecube.cluster.BaseTest" level="info"/>
14+
<Logger name="io.scalecube.cluster.utils.BaseTest" level="info"/>
15+
<Logger name="io.scalecube.transport.netty.BaseTest" level="info"/>
16+
<Logger name="reactor.util" level="${env:reactorUtilLogLevel:-warn}"/>
17+
<Logger name="reactor.core" level="${env:reactorCoreLogLevel:-warn}"/>
18+
<Logger name="reactor.netty" level="${env:reactorNettyLogLevel:-warn}"/>
19+
<Logger name="io.netty" level="${env:nettyLogLevel:-warn}"/>
20+
<Logger name="io.scalecube.cluster.transport" level="${env:clusterTransport:-info}"/>
21+
<Logger name="io.scalecube.cluster.fdetector" level="${env:clusterFdetector:-info}"/>
22+
<Logger name="io.scalecube.cluster.gossip" level="${env:clusterGossip:-info}"/>
23+
<Logger name="io.scalecube.cluster.membership" level="${env:clusterMembership:-info}"/>
24+
<Logger name="io.scalecube.cluster.metadata" level="${env:clusterMetadata:-info}"/>
25+
<Logger name="io.scalecube.cluster.utils" level="${env:clusterUtils:-info}"/>
26+
27+
<Root level="${env:logLevel:-info}">
28+
<AppenderRef ref="console"/>
29+
</Root>
30+
</Loggers>
31+
32+
</Configuration>

‎pom.xml‎

Lines changed: 14 additions & 57 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-cluster-parent</artifactId>
@@ -33,15 +35,7 @@
3335
</scm>
3436

3537
<properties>
36-
<reactor.version>2024.0.8</reactor.version>
37-
<netty.version>4.2.6.Final</netty.version>
38-
<jackson.version>2.19.2</jackson.version>
39-
<slf4j.version>1.7.36</slf4j.version>
40-
41-
<mockito-junit.version>5.3.1</mockito-junit.version>
42-
<junit-jupiter.version>5.9.3</junit-jupiter.version>
43-
<hamcrest.version>1.3</hamcrest.version>
44-
<log4j.version>2.17.2</log4j.version>
38+
<scalecube-test-support.version>0.1.1</scalecube-test-support.version>
4539

4640
<distributionManagement.url>https://maven.pkg.github.com/scalecube/scalecube-cluster
4741
</distributionManagement.url>
@@ -57,51 +51,14 @@
5751
<module>codec-parent</module>
5852
</modules>
5953

60-
<dependencyManagement>
61-
<dependencies>
62-
<!-- Reactor -->
63-
<dependency>
64-
<groupId>io.projectreactor</groupId>
65-
<artifactId>reactor-bom</artifactId>
66-
<version>${reactor.version}</version>
67-
<type>pom</type>
68-
<scope>import</scope>
69-
</dependency>
70-
71-
<!-- Netty -->
72-
<dependency>
73-
<groupId>io.netty</groupId>
74-
<artifactId>netty-bom</artifactId>
75-
<version>${netty.version}</version>
76-
<type>pom</type>
77-
<scope>import</scope>
78-
</dependency>
79-
80-
<!-- Jackson -->
81-
<dependency>
82-
<groupId>com.fasterxml.jackson</groupId>
83-
<artifactId>jackson-bom</artifactId>
84-
<version>${jackson.version}</version>
85-
<type>pom</type>
86-
<scope>import</scope>
87-
</dependency>
88-
89-
<!-- Logging -->
90-
<dependency>
91-
<groupId>org.slf4j</groupId>
92-
<artifactId>slf4j-api</artifactId>
93-
<version>${slf4j.version}</version>
94-
</dependency>
95-
96-
<!-- Log4j -->
97-
<dependency>
98-
<groupId>org.apache.logging.log4j</groupId>
99-
<artifactId>log4j-bom</artifactId>
100-
<version>${log4j.version}</version>
101-
<type>pom</type>
102-
<scope>import</scope>
103-
</dependency>
104-
</dependencies>
105-
</dependencyManagement>
54+
<dependencies>
55+
<!-- Tests -->
56+
<dependency>
57+
<groupId>io.scalecube</groupId>
58+
<artifactId>scalecube-test-support</artifactId>
59+
<version>${scalecube-test-support.version}</version>
60+
<scope>test</scope>
61+
</dependency>
62+
</dependencies>
10663

10764
</project>

‎transport-parent/transport-netty/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717
<artifactId>scalecube-transport-api</artifactId>
1818
<version>${project.version}</version>
1919
</dependency>
20-
2120
<dependency>
2221
<groupId>io.projectreactor.netty</groupId>
2322
<artifactId>reactor-netty</artifactId>
2423
</dependency>
25-
26-
<!-- Test dependencies -->
24+
<!-- Tests -->
2725
<dependency>
2826
<groupId>${project.groupId}</groupId>
2927
<artifactId>scalecube-cluster-testlib</artifactId>

0 commit comments

Comments
 (0)