Skip to content

Commit 1ce317c

Browse files
dependabot[bot]slawekjaranowski
dependabot[bot]
and
slawekjaranowski
authored
Bump org.apache.maven.plugins:maven-plugins from 43 to 44 (#516)
* Bump org.apache.maven.plugins:maven-plugins from 43 to 44 Bumps [org.apache.maven.plugins:maven-plugins](https://github.com/apache/maven-parent) from 43 to 44. - [Release notes](https://github.com/apache/maven-parent/releases) - [Commits](https://github.com/apache/maven-parent/commits/v44) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-plugins dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Fix checkstyle in tests --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Slawomir Jaranowski <s.jaranowski@gmail.com>
1 parent 377115a commit 1ce317c

File tree

7 files changed

+35
-32
lines changed

7 files changed

+35
-32
lines changed

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
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>44</version>
2727
<relativePath />
2828
</parent>
2929

@@ -254,6 +254,7 @@ under the License.
254254
<dependency>
255255
<groupId>org.apache.maven.plugin-tools</groupId>
256256
<artifactId>maven-plugin-annotations</artifactId>
257+
<version>${version.maven-plugin-tools}</version>
257258
<scope>provided</scope>
258259
</dependency>
259260
<dependency>

‎src/test/java/org/apache/maven/plugins/dependency/TestCollectMojo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void testCollectTestEnvironment() throws Exception {
7474
*
7575
* @throws Exception if a problem occurs
7676
*/
77-
public void testCollectTestEnvironment_excludeTransitive() throws Exception {
77+
public void testCollectTestEnvironmentExcludeTransitive() throws Exception {
7878
File testPom = new File(getBasedir(), "target/test-classes/unit/collect-test/plugin-config.xml");
7979
CollectDependenciesMojo mojo = (CollectDependenciesMojo) lookupMojo("collect", testPom);
8080

‎src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
import org.apache.maven.project.MavenProject;
3434

3535
public class TestIncludeExcludeUnpackMojo extends AbstractDependencyMojoTestCase {
36-
private final String PACKED_FILE = "test.zip";
36+
private static final String PACKED_FILE = "test.zip";
3737

38-
private final String UNPACKED_FILE_PREFIX = "test";
38+
private static final String UNPACKED_FILE_PREFIX = "test";
3939

40-
private final String UNPACKED_FILE_SUFFIX = ".txt";
40+
private static final String UNPACKED_FILE_SUFFIX = ".txt";
4141

42-
private final String PACKED_FILE_PATH = "target/test-classes/unit/unpack-dependencies-test/" + PACKED_FILE;
42+
private static final String PACKED_FILE_PATH = "target/test-classes/unit/unpack-dependencies-test/" + PACKED_FILE;
4343

4444
private UnpackMojo mojo;
4545

‎src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestIncludeExcludeUnpackDependenciesMojo.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
import org.apache.maven.project.MavenProject;
2929

3030
public class TestIncludeExcludeUnpackDependenciesMojo extends AbstractDependencyMojoTestCase {
31-
private final String PACKED_FILE = "test.zip";
31+
private static final String PACKED_FILE = "test.zip";
3232

33-
private final String UNPACKED_FILE_PREFIX = "test";
33+
private static final String UNPACKED_FILE_PREFIX = "test";
3434

35-
private final String UNPACKED_FILE_SUFFIX = ".txt";
35+
private static final String UNPACKED_FILE_SUFFIX = ".txt";
3636

37-
private final String PACKED_FILE_PATH = "target/test-classes/unit/unpack-dependencies-test/" + PACKED_FILE;
37+
private static final String PACKED_FILE_PATH = "target/test-classes/unit/unpack-dependencies-test/" + PACKED_FILE;
3838

3939
private UnpackDependenciesMojo mojo;
4040

‎src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@
4343

4444
public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase {
4545

46-
private final String UNPACKABLE_FILE = "test.txt";
46+
private static final String UNPACKABLE_FILE = "test.txt";
4747

48-
private final String UNPACKABLE_FILE_PATH = "target/test-classes/unit/unpack-dependencies-test/" + UNPACKABLE_FILE;
48+
private static final String UNPACKABLE_FILE_PATH =
49+
"target/test-classes/unit/unpack-dependencies-test/" + UNPACKABLE_FILE;
4950

5051
UnpackDependenciesMojo mojo;
5152

‎src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@
3636

3737
public class TestUnpackDependenciesMojo2 extends AbstractDependencyMojoTestCase {
3838

39-
private final String UNPACKABLE_FILE = "test.txt";
39+
private static final String UNPACKABLE_FILE = "test.txt";
4040

41-
private final String UNPACKABLE_FILE_PATH = "target/test-classes/unit/unpack-dependencies-test/" + UNPACKABLE_FILE;
41+
private static final String UNPACKABLE_FILE_PATH =
42+
"target/test-classes/unit/unpack-dependencies-test/" + UNPACKABLE_FILE;
4243

4344
private UnpackDependenciesMojo mojo;
4445

‎src/test/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojoTest.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ protected void setUp() throws Exception {
4444
getContainer().addComponent(session, MavenSession.class.getName());
4545
}
4646

47-
String GROUP_EXCLUDE_PREFIX = "skip.this.groupid";
47+
private static final String GROUP_EXCLUDE_PREFIX = "skip.this.groupid";
4848

49-
String ARTIFACT_EXCLUDE_PREFIX = "skip-this-artifact";
49+
private static final String ARTIFACT_EXCLUDE_PREFIX = "skip-this-artifact";
5050

51-
String CLASSIFIER_EXCLUDE_PREFIX = "skipThisClassifier";
51+
private static final String CLASSIFIER_EXCLUDE_PREFIX = "skipThisClassifier";
5252

53-
String DUMMY_ARTIFACT_NAME = "dummy-artifact";
53+
private static final String DUMMY_ARTIFACT_NAME = "dummy-artifact";
5454

55-
String STUB_ARTIFACT_VERSION = "3.14";
55+
private static final String STUB_ARTIFACT_VERSION = "3.14";
5656

57-
String VALID_GROUP = "org.junit.jupiter";
57+
private static final String VALID_GROUP = "org.junit.jupiter";
5858

59-
public void test_excludeGroupIds() throws Exception {
59+
public void testExcludeGroupIds() throws Exception {
6060
File testPom = new File(getBasedir(), "target/test-classes/unit/go-offline-test/exclude-plugin-config.xml");
6161

6262
subject = (GoOfflineMojo) lookupMojo("go-offline", testPom);
@@ -91,7 +91,7 @@ public void test_excludeGroupIds() throws Exception {
9191
assertFalse(artifacts.contains(artifact2));
9292
}
9393

94-
public void test_excludeArtifactIds() throws Exception {
94+
public void testExcludeArtifactIds() throws Exception {
9595
File testPom = new File(getBasedir(), "target/test-classes/unit/go-offline-test/exclude-plugin-config.xml");
9696

9797
subject = (GoOfflineMojo) lookupMojo("go-offline", testPom);
@@ -126,7 +126,7 @@ public void test_excludeArtifactIds() throws Exception {
126126
assertFalse(artifacts.contains(artifact2));
127127
}
128128

129-
public void test_excludeScope() throws Exception {
129+
public void testExcludeScope() throws Exception {
130130
File testPom = new File(getBasedir(), "target/test-classes/unit/go-offline-test/exclude-plugin-config.xml");
131131

132132
subject = (GoOfflineMojo) lookupMojo("go-offline", testPom);
@@ -162,7 +162,7 @@ public void test_excludeScope() throws Exception {
162162
assertFalse(artifacts.contains(artifact2));
163163
}
164164

165-
public void test_excludeTypes() throws Exception {
165+
public void testExcludeTypes() throws Exception {
166166
File testPom = new File(getBasedir(), "target/test-classes/unit/go-offline-test/exclude-plugin-config.xml");
167167

168168
subject = (GoOfflineMojo) lookupMojo("go-offline", testPom);
@@ -208,7 +208,7 @@ public void test_excludeTypes() throws Exception {
208208
* @throws Exception
209209
*/
210210
@Disabled("Requires update to maven-plugin-test-harness to support this test")
211-
public void xtest_excludeClassifiers() throws Exception {
211+
public void xtestExcludeClassifiers() throws Exception {
212212
File testPom = new File(getBasedir(), "target/test-classes/unit/go-offline-test/exclude-plugin-config.xml");
213213

214214
subject = (GoOfflineMojo) lookupMojo("go-offline", testPom);
@@ -245,13 +245,13 @@ public void xtest_excludeClassifiers() throws Exception {
245245
assertTrue(artifacts.contains(artifact3));
246246
}
247247

248-
String GROUP_INCLUDE_PREFIX = "include.this.groupid";
248+
private static final String GROUP_INCLUDE_PREFIX = "include.this.groupid";
249249

250-
String ARTIFACT_INCLUDE_PREFIX = "include-this-artifact";
250+
private static final String ARTIFACT_INCLUDE_PREFIX = "include-this-artifact";
251251

252-
String CLASSIFIER_INCLUDE_PREFIX = "includeThisClassifier";
252+
private static final String CLASSIFIER_INCLUDE_PREFIX = "includeThisClassifier";
253253

254-
public void test_includeGroupIds() throws Exception {
254+
public void testIncludeGroupIds() throws Exception {
255255
File testPom = new File(getBasedir(), "target/test-classes/unit/go-offline-test/include-gid-plugin-config.xml");
256256

257257
subject = (GoOfflineMojo) lookupMojo("go-offline", testPom);
@@ -287,7 +287,7 @@ public void test_includeGroupIds() throws Exception {
287287
assertTrue(artifacts.contains(artifact2));
288288
}
289289

290-
public void test_includeArtifactIds() throws Exception {
290+
public void testIncludeArtifactIds() throws Exception {
291291
File testPom = new File(getBasedir(), "target/test-classes/unit/go-offline-test/include-aid-plugin-config.xml");
292292

293293
subject = (GoOfflineMojo) lookupMojo("go-offline", testPom);
@@ -323,7 +323,7 @@ public void test_includeArtifactIds() throws Exception {
323323
assertTrue(artifacts.contains(artifact2));
324324
}
325325

326-
public void test_includeScope() throws Exception {
326+
public void testIncludeScope() throws Exception {
327327
File testPom =
328328
new File(getBasedir(), "target/test-classes/unit/go-offline-test/include-scope-plugin-config.xml");
329329

@@ -363,7 +363,7 @@ public void test_includeScope() throws Exception {
363363
assertFalse(artifacts.contains(artifact3));
364364
}
365365

366-
public void test_includeTypes() throws Exception {
366+
public void testIncludeTypes() throws Exception {
367367
File testPom =
368368
new File(getBasedir(), "target/test-classes/unit/go-offline-test/include-types-plugin-config.xml");
369369

0 commit comments

Comments
 (0)