renamed java packages, log4j config cleanup

hhund · Nov 14, 2023 · 047541c · 047541c
1 parent 54377cb
commit 047541c
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 34 deletions.
diff --git a/pom.xml b/pom.xml
@@ -105,16 +105,18 @@
 			<artifactId>slf4j-api</artifactId>
 			<version>${slf4j.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j2-impl</artifactId>
-			<version>2.21.1</version>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.13.2</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
+			<version>2.21.1</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -169,7 +171,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.2.2</version>
 				<configuration>
-					<excludedGroups>de.rwh.utils.test.DockerTest</excludedGroups>
+					<excludedGroups>de.hsheilbronn.mi.utils.test.IntegrationTest</excludedGroups>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -180,7 +182,7 @@
 					<includes>
 						<include>**/*</include>
 					</includes>
-					<groups>de.rwh.utils.test.DockerTest</groups>
+					<groups>de.hsheilbronn.mi.utils.test.IntegrationTest</groups>
 				</configuration>
 				<executions>
 					<execution>

diff --git a/...PostgreSqlLiquibaseTemplateClassRule.java → ...PostgreSqlLiquibaseTemplateClassRule.java b/...PostgreSqlLiquibaseTemplateClassRule.java → ...PostgreSqlLiquibaseTemplateClassRule.java
@@ -1,4 +1,4 @@
-package de.rwh.utils.test;
+package de.hsheilbronn.mi.utils.test;
 
 import java.io.ByteArrayOutputStream;
 import java.sql.Connection;

diff --git a/...lContainerLiquibaseTemplateClassRule.java → ...lContainerLiquibaseTemplateClassRule.java b/...lContainerLiquibaseTemplateClassRule.java → ...lContainerLiquibaseTemplateClassRule.java
@@ -1,4 +1,4 @@
-package de.rwh.utils.test;
+package de.hsheilbronn.mi.utils.test;
 
 import java.io.ByteArrayOutputStream;
 import java.sql.Connection;

diff --git a/.../rwh/utils/test/PostgresTemplateRule.java → ...n/mi/utils/test/PostgresTemplateRule.java b/.../rwh/utils/test/PostgresTemplateRule.java → ...n/mi/utils/test/PostgresTemplateRule.java
@@ -1,4 +1,4 @@
-package de.rwh.utils.test;
+package de.hsheilbronn.mi.utils.test;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

diff --git a/.../de/rwh/utils/test/TemplateClassRule.java → ...ronn/mi/utils/test/TemplateClassRule.java b/.../de/rwh/utils/test/TemplateClassRule.java → ...ronn/mi/utils/test/TemplateClassRule.java
@@ -1,4 +1,4 @@
-package de.rwh.utils.test;
+package de.hsheilbronn.mi.utils.test;
 
 import org.apache.commons.dbcp2.BasicDataSource;
 

diff --git a/...greSqlLiquibaseTemplateClassRuleTest.java → ...greSqlLiquibaseTemplateClassRuleTest.java b/...greSqlLiquibaseTemplateClassRuleTest.java → ...greSqlLiquibaseTemplateClassRuleTest.java
@@ -1,4 +1,4 @@
-package de.rwh.utils.test;
+package de.hsheilbronn.mi.utils.test;
 
 import static org.junit.Assert.assertEquals;
 
@@ -17,7 +17,7 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 
-@Category(DockerTest.class)
+@Category(IntegrationTest.class)
 public class ExternalPostgreSqlLiquibaseTemplateClassRuleTest
 {
 	static

diff --git a/src/test/java/de/hsheilbronn/mi/utils/test/IntegrationTest.java b/src/test/java/de/hsheilbronn/mi/utils/test/IntegrationTest.java
@@ -0,0 +1,6 @@
+package de.hsheilbronn.mi.utils.test;
+
+public interface IntegrationTest
+{
+
+}
diff --git a/...tainerLiquibaseTemplateClassRuleTest.java → ...tainerLiquibaseTemplateClassRuleTest.java b/...tainerLiquibaseTemplateClassRuleTest.java → ...tainerLiquibaseTemplateClassRuleTest.java
@@ -1,4 +1,4 @@
-package de.rwh.utils.test;
+package de.hsheilbronn.mi.utils.test;
 
 import static org.junit.Assert.assertEquals;
 

diff --git a/src/test/java/de/rwh/utils/test/DockerTest.java b/src/test/java/de/rwh/utils/test/DockerTest.java
diff --git a/src/test/resources/log4j2.xml b/src/test/resources/log4j2.xml
@@ -1,22 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="INFO" monitorInterval="30"
-	verbose="false">
-
+<Configuration status="INFO" strict="true" monitorInterval="30" verbose="false">
 	<Appenders>
-		<Console name="CONSOLE" target="SYSTEM_OUT">
-			<PatternLayout pattern="%p\t%t - %C{1}.%M(%L) | %m%n" />
-		</Console>
+		<Appender name="CONSOLE" type="Console">
+			<Layout type="PatternLayout" pattern="%p\t%t - %C{1}.%M(%L) | %m%n" />
+		</Appender>
 	</Appenders>
-
 	<Loggers>
-		<Logger name="de.rwh" level="DEBUG" />
+		<Logger name="de.hsheilbronn.mi.utils.test" level="DEBUG" />
 		<Logger name="org.apache.commons.dbcp2" level="INFO" />
 
-		<Logger name="liquibase" level="WARN" />
-		<Logger name="LiquibaseSchemaResolver" level="WARN" />
-		<Logger name="ResourceAccessorXsdStreamResolver" level="WARN" />
-		<Logger name="ContextClassLoaderXsdStreamResolver" level="WARN" />
-
 		<Root level="WARN">
 			<AppenderRef ref="CONSOLE" />
 		</Root>