Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump org.apache.maven.plugins:maven-plugins from 43 to 44 #516

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump org.apache.maven.plugins:maven-plugins from 43 to 44 #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75c0c6f
Bump org.apache.maven.plugins:maven-plugins from 43 to 44
dependabot[bot] Mar 18, 2025
e726bec
Fix checkstyle in tests
slawekjaranowski Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
<version>43</version>
<version>44</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -254,6 +254,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>${version.maven-plugin-tools}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/apache/maven/plugins/dependency/TestCollectMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void testCollectTestEnvironment() throws Exception {
*
* @throws Exception if a problem occurs
*/
public void testCollectTestEnvironment_excludeTransitive() throws Exception {
public void testCollectTestEnvironmentExcludeTransitive() throws Exception {
File testPom = new File(getBasedir(), "target/test-classes/unit/collect-test/plugin-config.xml");
CollectDependenciesMojo mojo = (CollectDependenciesMojo) lookupMojo("collect", testPom);

Expand Down
8 changes: 4 additions & 4 deletions ...a/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
import org.apache.maven.project.MavenProject;

public class TestIncludeExcludeUnpackMojo extends AbstractDependencyMojoTestCase {
private final String PACKED_FILE = "test.zip";
private static final String PACKED_FILE = "test.zip";

private final String UNPACKED_FILE_PREFIX = "test";
private static final String UNPACKED_FILE_PREFIX = "test";

private final String UNPACKED_FILE_SUFFIX = ".txt";
private static final String UNPACKED_FILE_SUFFIX = ".txt";

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

private UnpackMojo mojo;

Expand Down
8 changes: 4 additions & 4 deletions ...e/maven/plugins/dependency/fromDependencies/TestIncludeExcludeUnpackDependenciesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
import org.apache.maven.project.MavenProject;

public class TestIncludeExcludeUnpackDependenciesMojo extends AbstractDependencyMojoTestCase {
private final String PACKED_FILE = "test.zip";
private static final String PACKED_FILE = "test.zip";

private final String UNPACKED_FILE_PREFIX = "test";
private static final String UNPACKED_FILE_PREFIX = "test";

private final String UNPACKED_FILE_SUFFIX = ".txt";
private static final String UNPACKED_FILE_SUFFIX = ".txt";

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

private UnpackDependenciesMojo mojo;

Expand Down
5 changes: 3 additions & 2 deletions ...java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@

public class TestUnpackDependenciesMojo extends AbstractDependencyMojoTestCase {

private final String UNPACKABLE_FILE = "test.txt";
private static final String UNPACKABLE_FILE = "test.txt";

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

UnpackDependenciesMojo mojo;

Expand Down
5 changes: 3 additions & 2 deletions ...ava/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@

public class TestUnpackDependenciesMojo2 extends AbstractDependencyMojoTestCase {

private final String UNPACKABLE_FILE = "test.txt";
private static final String UNPACKABLE_FILE = "test.txt";

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

private UnpackDependenciesMojo mojo;

Expand Down
36 changes: 18 additions & 18 deletions src/test/java/org/apache/maven/plugins/dependency/resolvers/GoOfflineMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@ protected void setUp() throws Exception {
getContainer().addComponent(session, MavenSession.class.getName());
}

String GROUP_EXCLUDE_PREFIX = "skip.this.groupid";
private static final String GROUP_EXCLUDE_PREFIX = "skip.this.groupid";

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

String CLASSIFIER_EXCLUDE_PREFIX = "skipThisClassifier";
private static final String CLASSIFIER_EXCLUDE_PREFIX = "skipThisClassifier";

String DUMMY_ARTIFACT_NAME = "dummy-artifact";
private static final String DUMMY_ARTIFACT_NAME = "dummy-artifact";

String STUB_ARTIFACT_VERSION = "3.14";
private static final String STUB_ARTIFACT_VERSION = "3.14";

String VALID_GROUP = "org.junit.jupiter";
private static final String VALID_GROUP = "org.junit.jupiter";

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

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

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

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

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

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

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

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

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

String GROUP_INCLUDE_PREFIX = "include.this.groupid";
private static final String GROUP_INCLUDE_PREFIX = "include.this.groupid";

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

String CLASSIFIER_INCLUDE_PREFIX = "includeThisClassifier";
private static final String CLASSIFIER_INCLUDE_PREFIX = "includeThisClassifier";

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

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

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

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

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

Expand Down Expand Up @@ -363,7 +363,7 @@ public void test_includeScope() throws Exception {
assertFalse(artifacts.contains(artifact3));
}

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

Expand Down
Loading