diff --git a/handlebars-maven-plugin-tests/pom.xml b/handlebars-maven-plugin-tests/pom.xml
index aab1f9386..924c5e1bd 100644
--- a/handlebars-maven-plugin-tests/pom.xml
+++ b/handlebars-maven-plugin-tests/pom.xml
@@ -8,7 +8,6 @@
4.0.0
- com.github.jknack
handlebars-maven-plugin-tests
war
@@ -41,12 +40,6 @@
-
- org.apache.maven.plugins
- maven-war-plugin
- 3.3.2
-
-
org.apache.maven.plugins
diff --git a/handlebars-maven-plugin/pom.xml b/handlebars-maven-plugin/pom.xml
index ba6c894a9..dce7aa0f5 100644
--- a/handlebars-maven-plugin/pom.xml
+++ b/handlebars-maven-plugin/pom.xml
@@ -24,7 +24,6 @@
ch.qos.logback
logback-classic
- compile
@@ -36,32 +35,26 @@
org.apache.maven
maven-plugin-api
- 3.8.3
-
-
-
- org.apache.maven
- maven-project
- 2.2.1
+ 3.9.6
org.apache.maven
maven-core
- 3.8.3
+ 3.9.6
org.apache.maven.plugin-tools
maven-plugin-annotations
- 3.6.1
+ 3.11.0
provided
org.codehaus.plexus
plexus-utils
- 3.4.1
+ 3.5.1
@@ -85,6 +78,12 @@
tests
+
+ org.mockito
+ mockito-junit-jupiter
+ test
+
+
org.mockito
mockito-core
@@ -97,7 +96,7 @@
org.apache.maven.plugins
maven-plugin-plugin
- 3.6.1
+ 3.11.0
true
@@ -112,7 +111,6 @@
-
diff --git a/handlebars-maven-plugin/src/main/java/com/github/jknack/handlebars/maven/I18nJsPlugin.java b/handlebars-maven-plugin/src/main/java/com/github/jknack/handlebars/maven/I18nJsPlugin.java
index 1bd99bd0e..a7ebb9b37 100644
--- a/handlebars-maven-plugin/src/main/java/com/github/jknack/handlebars/maven/I18nJsPlugin.java
+++ b/handlebars-maven-plugin/src/main/java/com/github/jknack/handlebars/maven/I18nJsPlugin.java
@@ -12,13 +12,7 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.Set;
+import java.util.*;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@@ -31,7 +25,6 @@
import com.github.jknack.handlebars.TagType;
import com.github.jknack.handlebars.Template;
import com.github.jknack.handlebars.helper.I18nHelper;
-import edu.emory.mathcs.backport.java.util.Collections;
/**
* Convert {@link ResourceBundle} to JavaScript using the I18n.js API.
diff --git a/handlebars-maven-plugin/src/test/java/com/github/jknack/handlebars/maven/PrecompilePluginTest.java b/handlebars-maven-plugin/src/test/java/com/github/jknack/handlebars/maven/PrecompilePluginTest.java
index f36e8381f..4669bbece 100644
--- a/handlebars-maven-plugin/src/test/java/com/github/jknack/handlebars/maven/PrecompilePluginTest.java
+++ b/handlebars-maven-plugin/src/test/java/com/github/jknack/handlebars/maven/PrecompilePluginTest.java
@@ -7,8 +7,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
import java.io.File;
import java.io.IOException;
@@ -222,7 +221,7 @@ public void partials() throws Exception {
private MavenProject newProject(final String... classpath)
throws DependencyResolutionRequiredException {
- MavenProject project = mock(MavenProject.class);
+ MavenProject project = spy(new MavenProject());
when(project.getRuntimeClasspathElements()).thenReturn(Lists.newArrayList(classpath));
return project;
}
diff --git a/pom.xml b/pom.xml
index 086e95478..281e4c0c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,13 @@
org.mockito
mockito-core
- 5.11.0
+ ${mockito.version}
+
+
+
+ org.mockito
+ mockito-junit-jupiter
+ ${mockito.version}
@@ -425,6 +431,7 @@
6.0.0
0.8.11
4.13.1
+ 5.11.0
yyyy-MM-dd HH:mm:ssa
3.1.0
${maven.build.timestamp}