Release 1.0.2

technicalguru · technicalguru · commit b8fcc9d604e0 · 2024-01-31T13:13:49.000Z
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ two parts:
 
 ## Latest Version
 
-Latest version is 1.0.0.
+Latest version is 1.0.2.
 
 ## Documentation
 
diff --git a/mail-queue/pom.xml b/mail-queue/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>eu.ralph-schuster</groupId>
 		<artifactId>mail</artifactId>
-		<version>1.0.1</version>
+		<version>1.0.2</version>
 	</parent>
 
 	<properties>
@@ -33,7 +33,7 @@
 		<dependency>
 			<groupId>eu.ralph-schuster</groupId>
 			<artifactId>baselib</artifactId>
-			<version>4.1.2</version>
+			<version>5.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.cowwoc.token-bucket</groupId>
diff --git a/mail-queue/src/test/java/rs/mail/queue/MailQueueTest.java b/mail-queue/src/test/java/rs/mail/queue/MailQueueTest.java
@@ -3,14 +3,14 @@
  */
 package rs.mail.queue;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.Duration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.github.cowwoc.tokenbucket.Bucket;
 
diff --git a/mail-templates/pom.xml b/mail-templates/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>eu.ralph-schuster</groupId>
 		<artifactId>mail</artifactId>
-		<version>1.0.1</version>
+		<version>1.0.2</version>
 	</parent>
 
 	<properties>
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>eu.ralph-schuster</groupId>
 			<artifactId>baselib</artifactId>
-			<version>4.1.2</version>
+			<version>5.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.freemarker</groupId>
diff --git a/mail-templates/src/test/java/rs/mail/templates/cache/impl/DefaultCacheTest.java b/mail-templates/src/test/java/rs/mail/templates/cache/impl/DefaultCacheTest.java
@@ -3,16 +3,16 @@
  */
 package rs.mail.templates.cache.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collection;
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import rs.mail.templates.cache.Cache;
 
diff --git a/mail-templates/src/test/java/rs/mail/templates/cache/impl/FifoCacheManagerTest.java b/mail-templates/src/test/java/rs/mail/templates/cache/impl/FifoCacheManagerTest.java
@@ -3,11 +3,11 @@
  */
 package rs.mail.templates.cache.impl;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the {@link FifoCacheManager}.
diff --git a/mail-templates/src/test/java/rs/mail/templates/cache/impl/LfuCacheManagerTest.java b/mail-templates/src/test/java/rs/mail/templates/cache/impl/LfuCacheManagerTest.java
@@ -3,11 +3,11 @@
  */
 package rs.mail.templates.cache.impl;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the {@link LfuCacheManager}.
diff --git a/mail-templates/src/test/java/rs/mail/templates/cache/impl/LruCacheManagerTest.java b/mail-templates/src/test/java/rs/mail/templates/cache/impl/LruCacheManagerTest.java
@@ -3,11 +3,11 @@
  */
 package rs.mail.templates.cache.impl;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests the {@link LruCacheManager}.
diff --git a/mail-templates/src/test/java/rs/mail/templates/impl/AbstractMessageBuilderTest.java b/mail-templates/src/test/java/rs/mail/templates/impl/AbstractMessageBuilderTest.java
@@ -1,16 +1,16 @@
 package rs.mail.templates.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.Locale;
 
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import rs.mail.templates.BuilderException;
 import rs.mail.templates.BuilderResult;
@@ -132,14 +132,14 @@ protected AbstractMessageBuilder<BuilderResult> createMessageBuilder() {
 		return (AbstractMessageBuilder<BuilderResult>)MessageBuilderFactory.newBuilder(new BuilderResultCreator());
 	}
 	
-	@Before
+	@BeforeEach
 	public void beforeEach() throws IOException {
 		resolver = new DefaultTemplateResolver(new File(curDir, "src/test/resources/resolver"));
 		context  = new TemplateContext();
 		context.setLocale(Locale.GERMANY);
 	}
 	
-	@BeforeClass
+	@BeforeAll
 	public static void beforeClass() {
 		curDir = Paths.get("").toAbsolutePath().toFile();
 	}
diff --git a/mail-templates/src/test/java/rs/mail/templates/impl/FreemarkerMessageBuilderTest.java b/mail-templates/src/test/java/rs/mail/templates/impl/FreemarkerMessageBuilderTest.java
@@ -1,17 +1,17 @@
 package rs.mail.templates.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Locale;
 
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import rs.mail.templates.BuilderException;
 import rs.mail.templates.BuilderResult;
@@ -90,7 +90,7 @@ public void testBuild_withTranslations() throws BuilderException {
 	}
 	
 
-	@Before
+	@BeforeEach
 	public void beforeEach() throws IOException {
 		resolver = new DefaultTemplateResolver(new File(curDir, "src/test/resources/freemarker"));
 		primaryResolver  = new DefaultTemplateResolver(new File(curDir, "src/test/resources/freemarker/primary"));
@@ -102,7 +102,7 @@ public void beforeEach() throws IOException {
 		context.setValue("aMessage", "A message");
 	}
 	
-	@BeforeClass
+	@BeforeAll
 	public static void beforeClass() {
 		curDir = Paths.get("").toAbsolutePath().toFile();
 	}
diff --git a/mail-templates/src/test/java/rs/mail/templates/resolver/DefaultI18nResolverTest.java b/mail-templates/src/test/java/rs/mail/templates/resolver/DefaultI18nResolverTest.java
@@ -1,20 +1,20 @@
 package rs.mail.templates.resolver;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Locale;
 
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import rs.mail.templates.I18n;
 import rs.mail.templates.ResolverException;
@@ -130,13 +130,13 @@ public void testResolve_withCacheDifferentLanguage()  throws ResolverException,
 	}
 	
 
-	@Before
+	@BeforeEach
 	public void beforeEach() throws IOException {
 		resolver = new DefaultI18nResolver(new File(curDir, "src/test/resources/resolver"));
 		context  = new TemplateContext();
 	}
 	
-	@BeforeClass
+	@BeforeAll
 	public static void beforeClass() {
 		curDir = Paths.get("").toAbsolutePath().toFile();
 	}
diff --git a/mail-templates/src/test/java/rs/mail/templates/resolver/DefaultTemplateResolverTest.java b/mail-templates/src/test/java/rs/mail/templates/resolver/DefaultTemplateResolverTest.java
@@ -1,20 +1,20 @@
 package rs.mail.templates.resolver;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Locale;
 
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import rs.mail.templates.ContentType;
 import rs.mail.templates.ResolverException;
@@ -190,13 +190,13 @@ public void testResolve_withCacheDifferentLanguage()  throws ResolverException,
 	}
 	
 
-	@Before
+	@BeforeEach
 	public void beforeEach() throws IOException {
 		resolver = new DefaultTemplateResolver(new File(curDir, "src/test/resources/resolver"));
 		context  = new TemplateContext();
 	}
 	
-	@BeforeClass
+	@BeforeAll
 	public static void beforeClass() {
 		curDir = Paths.get("").toAbsolutePath().toFile();
 	}
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>eu.ralph-schuster</groupId>
 		<artifactId>pom-oss</artifactId>
-		<version>2.2.0</version>
+		<version>3.0.1</version>
 	</parent>
 
 	<properties>
@@ -13,7 +13,7 @@
 	</properties>
 
 	<artifactId>mail</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 	<packaging>pom</packaging>
 
 	<url>https://github.com/technicalguru/java-mail</url>
@@ -24,7 +24,7 @@
 		<connection>scm:git:https://github.com/technicalguru/java-mail.git</connection>
 		<developerConnection>scm:git:https://github.com/technicalguru/java-mail.git</developerConnection>
 		<url>https://github.com/technicalguru/java-mail</url>
-		<tag>mail-1.0.1</tag>
+		<tag>mail-1.0.2</tag>
 	</scm>
 
 	<issueManagement>
@@ -44,4 +44,14 @@
 		<module>mail-queue</module>
 	</modules>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.2.5</version>
+			</plugin>
+		</plugins>
+	</build>
+
 </project>
