Skip to content

Commit 726db2e

Browse files
build: update maven plugin dependencies
1 parent a355f43 commit 726db2e

5 files changed

Lines changed: 22 additions & 32 deletions

File tree

handlebars-maven-plugin-tests/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
</parent>
99

1010
<modelVersion>4.0.0</modelVersion>
11-
<groupId>com.github.jknack</groupId>
1211
<artifactId>handlebars-maven-plugin-tests</artifactId>
1312
<packaging>war</packaging>
1413

@@ -41,12 +40,6 @@
4140
</executions>
4241
</plugin>
4342

44-
<plugin>
45-
<groupId>org.apache.maven.plugins</groupId>
46-
<artifactId>maven-war-plugin</artifactId>
47-
<version>3.3.2</version>
48-
</plugin>
49-
5043
<!-- Deploy plugin -->
5144
<plugin>
5245
<groupId>org.apache.maven.plugins</groupId>

handlebars-maven-plugin/pom.xml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<dependency>
2525
<groupId>ch.qos.logback</groupId>
2626
<artifactId>logback-classic</artifactId>
27-
<scope>compile</scope>
2827
</dependency>
2928

3029
<dependency>
@@ -36,32 +35,26 @@
3635
<dependency>
3736
<groupId>org.apache.maven</groupId>
3837
<artifactId>maven-plugin-api</artifactId>
39-
<version>3.8.3</version>
40-
</dependency>
41-
42-
<dependency>
43-
<groupId>org.apache.maven</groupId>
44-
<artifactId>maven-project</artifactId>
45-
<version>2.2.1</version>
38+
<version>3.9.6</version>
4639
</dependency>
4740

4841
<dependency>
4942
<groupId>org.apache.maven</groupId>
5043
<artifactId>maven-core</artifactId>
51-
<version>3.8.3</version>
44+
<version>3.9.6</version>
5245
</dependency>
5346

5447
<dependency>
5548
<groupId>org.apache.maven.plugin-tools</groupId>
5649
<artifactId>maven-plugin-annotations</artifactId>
57-
<version>3.6.1</version>
50+
<version>3.11.0</version>
5851
<scope>provided</scope>
5952
</dependency>
6053

6154
<dependency>
6255
<groupId>org.codehaus.plexus</groupId>
6356
<artifactId>plexus-utils</artifactId>
64-
<version>3.4.1</version>
57+
<version>3.5.1</version>
6558
</dependency>
6659

6760
<dependency>
@@ -85,6 +78,12 @@
8578
<classifier>tests</classifier>
8679
</dependency>
8780

81+
<dependency>
82+
<groupId>org.mockito</groupId>
83+
<artifactId>mockito-junit-jupiter</artifactId>
84+
<scope>test</scope>
85+
</dependency>
86+
8887
<dependency>
8988
<groupId>org.mockito</groupId>
9089
<artifactId>mockito-core</artifactId>
@@ -97,7 +96,7 @@
9796
<plugin>
9897
<groupId>org.apache.maven.plugins</groupId>
9998
<artifactId>maven-plugin-plugin</artifactId>
100-
<version>3.6.1</version>
99+
<version>3.11.0</version>
101100
<configuration>
102101
<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
103102
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
@@ -112,7 +111,6 @@
112111
</execution>
113112
</executions>
114113
</plugin>
115-
116114
</plugins>
117115
</build>
118116
</project>

handlebars-maven-plugin/src/main/java/com/github/jknack/handlebars/maven/I18nJsPlugin.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,7 @@
1212
import java.net.URL;
1313
import java.net.URLClassLoader;
1414
import java.nio.charset.Charset;
15-
import java.util.ArrayList;
16-
import java.util.HashMap;
17-
import java.util.LinkedHashSet;
18-
import java.util.List;
19-
import java.util.Map;
20-
import java.util.ResourceBundle;
21-
import java.util.Set;
15+
import java.util.*;
2216

2317
import org.apache.maven.plugins.annotations.LifecyclePhase;
2418
import org.apache.maven.plugins.annotations.Mojo;
@@ -31,7 +25,6 @@
3125
import com.github.jknack.handlebars.TagType;
3226
import com.github.jknack.handlebars.Template;
3327
import com.github.jknack.handlebars.helper.I18nHelper;
34-
import edu.emory.mathcs.backport.java.util.Collections;
3528

3629
/**
3730
* Convert {@link ResourceBundle} to JavaScript using the I18n.js API.

handlebars-maven-plugin/src/test/java/com/github/jknack/handlebars/maven/PrecompilePluginTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
import static org.junit.jupiter.api.Assertions.assertEquals;
99
import static org.junit.jupiter.api.Assertions.assertTrue;
10-
import static org.mockito.Mockito.mock;
11-
import static org.mockito.Mockito.when;
10+
import static org.mockito.Mockito.*;
1211

1312
import java.io.File;
1413
import java.io.IOException;
@@ -222,7 +221,7 @@ public void partials() throws Exception {
222221

223222
private MavenProject newProject(final String... classpath)
224223
throws DependencyResolutionRequiredException {
225-
MavenProject project = mock(MavenProject.class);
224+
MavenProject project = spy(new MavenProject());
226225
when(project.getRuntimeClasspathElements()).thenReturn(Lists.newArrayList(classpath));
227226
return project;
228227
}

pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,13 @@
146146
<dependency>
147147
<groupId>org.mockito</groupId>
148148
<artifactId>mockito-core</artifactId>
149-
<version>5.11.0</version>
149+
<version>${mockito.version}</version>
150+
</dependency>
151+
152+
<dependency>
153+
<groupId>org.mockito</groupId>
154+
<artifactId>mockito-junit-jupiter</artifactId>
155+
<version>${mockito.version}</version>
150156
</dependency>
151157
</dependencies>
152158
</dependencyManagement>
@@ -425,6 +431,7 @@
425431
<spring.version>6.0.0</spring.version>
426432
<jacoco.version>0.8.11</jacoco.version>
427433
<antlr-version>4.13.1</antlr-version>
434+
<mockito.version>5.11.0</mockito.version>
428435
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssa</maven.build.timestamp.format>
429436
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
430437
<timestamp>${maven.build.timestamp}</timestamp>

0 commit comments

Comments
 (0)