Merge branch 'patches-1.0.x'

# Conflicts: # main/filesystem-charsets/pom.xml
2026-09-20 06:54:16 +00:00 · 2016-05-10 14:49:20 +02:00
parent dcea9e21f0 b77d4b5ae2
commit 0477a0a2e3
13 changed files with 143 additions and 19 deletions
@@ -275,6 +275,14 @@
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-jul</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+		</dependency>
 	</dependencies>

 	<modules>