Skip to content

Commit 892028b

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 (#2)
1 parent 5edab50 commit 892028b

File tree

2 files changed

+28
-92
lines changed

2 files changed

+28
-92
lines changed

‎pom.xml‎

Lines changed: 8 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
24
<modelVersion>4.0.0</modelVersion>
35

46
<parent>
57
<groupId>io.scalecube</groupId>
68
<artifactId>scalecube-parent</artifactId>
7-
<version>0.3.12</version>
9+
<version>0.3.14</version>
810
</parent>
911

1012
<artifactId>scalecube-reports</artifactId>
@@ -55,90 +57,19 @@
5557
</scm>
5658

5759
<properties>
58-
<junit.version>5.13.4</junit.version>
59-
<mockito.version>5.19.0</mockito.version>
60-
<hamcrest.version>1.3</hamcrest.version>
61-
<reactor.version>2024.0.8</reactor.version>
62-
<slf4j.version>1.7.36</slf4j.version>
63-
<log4j.version>2.17.2</log4j.version>
60+
<scalecube-test-support.version>0.1.0</scalecube-test-support.version>
6461

6562
<distributionManagement.url>https://maven.pkg.github.com/scalecube/scalecube-reports
6663
</distributionManagement.url>
6764
<checkstyle.suppressions.location>checkstyle-suppressions.xml</checkstyle.suppressions.location>
6865
</properties>
6966

70-
<dependencyManagement>
71-
<dependencies>
72-
<!-- Reactor -->
73-
<dependency>
74-
<groupId>io.projectreactor</groupId>
75-
<artifactId>reactor-bom</artifactId>
76-
<version>${reactor.version}</version>
77-
<type>pom</type>
78-
<scope>import</scope>
79-
</dependency>
80-
81-
<!-- Logging -->
82-
<dependency>
83-
<groupId>org.slf4j</groupId>
84-
<artifactId>slf4j-api</artifactId>
85-
<version>${slf4j.version}</version>
86-
</dependency>
87-
<dependency>
88-
<groupId>org.apache.logging.log4j</groupId>
89-
<artifactId>log4j-bom</artifactId>
90-
<version>${log4j.version}</version>
91-
<type>pom</type>
92-
<scope>import</scope>
93-
</dependency>
94-
95-
<!-- Tests -->
96-
<dependency>
97-
<groupId>org.junit</groupId>
98-
<artifactId>junit-bom</artifactId>
99-
<version>${junit.version}</version>
100-
<type>pom</type>
101-
<scope>import</scope>
102-
</dependency>
103-
<dependency>
104-
<groupId>org.mockito</groupId>
105-
<artifactId>mockito-core</artifactId>
106-
<version>${mockito.version}</version>
107-
</dependency>
108-
<dependency>
109-
<groupId>org.mockito</groupId>
110-
<artifactId>mockito-junit-jupiter</artifactId>
111-
<version>${mockito.version}</version>
112-
</dependency>
113-
</dependencies>
114-
</dependencyManagement>
115-
11667
<dependencies>
11768
<!-- Tests -->
11869
<dependency>
119-
<groupId>org.junit.jupiter</groupId>
120-
<artifactId>junit-jupiter-api</artifactId>
121-
<scope>test</scope>
122-
</dependency>
123-
<dependency>
124-
<groupId>org.junit.jupiter</groupId>
125-
<artifactId>junit-jupiter-engine</artifactId>
126-
<scope>test</scope>
127-
</dependency>
128-
<dependency>
129-
<groupId>org.junit.jupiter</groupId>
130-
<artifactId>junit-jupiter-params</artifactId>
131-
<scope>test</scope>
132-
</dependency>
133-
<dependency>
134-
<groupId>io.projectreactor</groupId>
135-
<artifactId>reactor-test</artifactId>
136-
<scope>test</scope>
137-
</dependency>
138-
<dependency>
139-
<groupId>org.assertj</groupId>
140-
<artifactId>assertj-core</artifactId>
141-
<version>3.25.3</version>
70+
<groupId>io.scalecube</groupId>
71+
<artifactId>scalecube-test-support</artifactId>
72+
<version>${scalecube-test-support.version}</version>
14273
<scope>test</scope>
14374
</dependency>
14475
<dependency>
@@ -147,21 +78,6 @@
14778
<version>5.9</version>
14879
<scope>test</scope>
14980
</dependency>
150-
<dependency>
151-
<groupId>org.slf4j</groupId>
152-
<artifactId>slf4j-api</artifactId>
153-
<scope>test</scope>
154-
</dependency>
155-
<dependency>
156-
<groupId>org.apache.logging.log4j</groupId>
157-
<artifactId>log4j-slf4j-impl</artifactId>
158-
<scope>test</scope>
159-
</dependency>
160-
<dependency>
161-
<groupId>org.apache.logging.log4j</groupId>
162-
<artifactId>log4j-core</artifactId>
163-
<scope>test</scope>
164-
</dependency>
16581
</dependencies>
16682

16783
</project>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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+
<Root level="${env:logLevel:-DEBUG}">
16+
<AppenderRef ref="${env:logAppender:-STDOUT}"/>
17+
</Root>
18+
</Loggers>
19+
20+
</Configuration>

0 commit comments

Comments
 (0)