Skip to content

Commit f0e45e0

Browse files
authored
Update parent POM to 45 (#284)
And related fixes: * POM add missing deps * move to Maven 3 p-u, drop p-x * test: checkstyle fixes
1 parent cb1236c commit f0e45e0

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

pgp-keys-map.list

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@ org.apache.maven.shared:maven-invoker = 0x84789D24DF77A32433CE1F079EB80E92EB2135
3030
org.apache.maven.shared:maven-shared-utils = 0x84789D24DF77A32433CE1F079EB80E92EB2135B1
3131
org.codehaus.plexus:plexus-classworlds = 0xB91AB7D2121DC6B0A61AA182D7742D58455ECC7C
3232
org.codehaus.plexus:plexus-component-annotations = 0xFA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A
33-
org.codehaus.plexus:plexus-utils = 0x84789D24DF77A32433CE1F079EB80E92EB2135B1
34-
org.codehaus.plexus:plexus-xml = 0x84789D24DF77A32433CE1F079EB80E92EB2135B1
33+
org.codehaus.plexus:plexus-utils = 0x32118CF76C9EC5D918E54967CA80D1F0EB6CA4BA

pom.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ under the License.
2323
<parent>
2424
<groupId>org.apache.maven.plugins</groupId>
2525
<artifactId>maven-plugins</artifactId>
26-
<version>43</version>
26+
<version>45</version>
2727
<relativePath />
2828
</parent>
2929

@@ -133,15 +133,13 @@ under the License.
133133
<dependency>
134134
<groupId>org.apache.maven.plugin-tools</groupId>
135135
<artifactId>maven-plugin-annotations</artifactId>
136+
<version>${version.maven-plugin-tools}</version>
136137
<scope>provided</scope>
137138
</dependency>
138139
<dependency>
139140
<groupId>org.codehaus.plexus</groupId>
140141
<artifactId>plexus-utils</artifactId>
141-
</dependency>
142-
<dependency>
143-
<groupId>org.codehaus.plexus</groupId>
144-
<artifactId>plexus-xml</artifactId>
142+
<version>3.6.0</version>
145143
</dependency>
146144
<dependency>
147145
<groupId>org.bouncycastle</groupId>
@@ -243,7 +241,6 @@ under the License.
243241
<plugin>
244242
<groupId>org.apache.maven.plugins</groupId>
245243
<artifactId>maven-invoker-plugin</artifactId>
246-
<version>3.9.0</version>
247244
</plugin>
248245
<plugin>
249246
<groupId>org.simplify4u.plugins</groupId>

src/test/java/org/apache/maven/plugins/gpg/it/BcSignArtifactIT.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
import org.junit.jupiter.params.ParameterizedTest;
2727
import org.junit.jupiter.params.provider.MethodSource;
2828

29-
import static org.junit.jupiter.api.Assertions.*;
29+
import static org.junit.jupiter.api.Assertions.assertEquals;
30+
import static org.junit.jupiter.api.Assertions.assertNotNull;
31+
import static org.junit.jupiter.api.Assertions.assertTrue;
3032

3133
public class BcSignArtifactIT extends ITSupport {
3234
public static Collection<Object[]> data() {

src/test/java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public static BuildResult executeRequest(
8080

8181
final File buildLog =
8282
new File(request.getBaseDirectory(request.getPomFile().getParentFile()), "build.log");
83-
try (final PrintStream buildLogStream = new PrintStream(buildLog)) {
83+
try (PrintStream buildLogStream = new PrintStream(buildLog)) {
8484
final InvocationOutputHandler buildLogOutputHandler = new PrintStreamHandler(buildLogStream, false);
8585
final InvokerLogger logger = new PrintStreamLogger(buildLogStream, InvokerLogger.DEBUG);
8686

0 commit comments

Comments
 (0)