Skip to content

Commit 23ad3e3

Browse files
Bump org.apache.maven.plugins:maven-plugins from 43 to 44 (#109)
* 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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sylwester Lachiewicz <[email protected]>
1 parent beada2e commit 23ad3e3

File tree

5 files changed

+22
-18
lines changed

5 files changed

+22
-18
lines changed

pom.xml

Lines changed: 1 addition & 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

src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434

3535
@MojoTest
3636
public class BasicPropertyUtilsTest extends AbstractPropertyUtilsTest {
37-
protected static final String validationFileName =
37+
protected static final String VALIDATION_FILE_NAME =
3838
"target/test-classes/unit/propertiesutils-test/basic_validation.properties";
3939

40-
protected static final String propFileName = "target/test-classes/unit/propertiesutils-test/basic.properties";
40+
protected static final String PROP_FILE_NAME = "target/test-classes/unit/propertiesutils-test/basic.properties";
4141

4242
protected Path getPropertyFile() {
43-
Path propFile = Paths.get(getBasedir(), propFileName);
43+
Path propFile = Paths.get(getBasedir(), PROP_FILE_NAME);
4444

4545
if (!Files.exists(propFile)) {
4646
propFile = null;
@@ -50,7 +50,7 @@ protected Path getPropertyFile() {
5050
}
5151

5252
protected Path getValidationFile() {
53-
Path validationFile = Paths.get(getBasedir(), validationFileName);
53+
Path validationFile = Paths.get(getBasedir(), VALIDATION_FILE_NAME);
5454

5555
if (!Files.exists(validationFile)) {
5656
validationFile = null;
@@ -65,7 +65,7 @@ protected Path getValidationFile() {
6565
* @throws Exception
6666
*/
6767
@Test
68-
public void testBasicLoadProperty_FF() throws Exception {
68+
public void testBasicLoadPropertyFF() throws Exception {
6969
Properties prop = PropertyUtils.loadPropertyFile(propertyFile, false, false);
7070

7171
assertNotNull(prop);
@@ -78,7 +78,7 @@ public void testBasicLoadProperty_FF() throws Exception {
7878
* @throws Exception
7979
*/
8080
@Test
81-
public void testBasicLoadProperty_TF() throws Exception {
81+
public void testBasicLoadPropertyTF() throws Exception {
8282
Properties prop = PropertyUtils.loadPropertyFile(propertyFile, true, false);
8383

8484
assertNotNull(prop);
@@ -91,7 +91,7 @@ public void testBasicLoadProperty_TF() throws Exception {
9191
* @throws Exception
9292
*/
9393
@Test
94-
public void testBasicLoadProperty_TT() throws Exception {
94+
public void testBasicLoadPropertyTT() throws Exception {
9595
Properties prop = PropertyUtils.loadPropertyFile(propertyFile, true, true);
9696

9797
validationProp.putAll(System.getProperties());

src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
import org.junit.jupiter.api.Test;
3636
import org.junit.jupiter.api.extension.ExtensionContext;
3737

38-
import static org.apache.maven.api.plugin.testing.MojoExtension.*;
38+
import static org.apache.maven.api.plugin.testing.MojoExtension.getBasedir;
39+
import static org.apache.maven.api.plugin.testing.MojoExtension.getPluginBasedir;
3940
import static org.junit.jupiter.api.Assertions.assertTrue;
4041

4142
/**

src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void testResourceDirectoryStructure(ResourcesMojo mojo) throws Exception
102102
@Test
103103
@InjectMojo(goal = "resources", pom = CONFIG_XML)
104104
@Basedir
105-
public void testResourceDirectoryStructure_RelativePath(ResourcesMojo mojo) throws Exception {
105+
public void testResourceDirectoryStructureRelativePath(ResourcesMojo mojo) throws Exception {
106106
assertNotNull(mojo);
107107

108108
MavenProjectResourcesStub project = (MavenProjectResourcesStub) mojo.project;
@@ -297,7 +297,7 @@ public void testResourceTargetPath(ResourcesMojo mojo) throws Exception {
297297
@Test
298298
@InjectMojo(goal = "resources", pom = CONFIG_XML)
299299
@Basedir
300-
public void testResourceSystemProperties_Filtering(ResourcesMojo mojo) throws Exception {
300+
public void testResourceSystemPropertiesFiltering(ResourcesMojo mojo) throws Exception {
301301
assertNotNull(mojo);
302302

303303
MavenProjectResourcesStub project = (MavenProjectResourcesStub) mojo.project;
@@ -338,7 +338,7 @@ public void testResourceSystemProperties_Filtering(ResourcesMojo mojo) throws Ex
338338
@Test
339339
@InjectMojo(goal = "resources", pom = CONFIG_XML)
340340
@Basedir
341-
public void testResourceProjectProperties_Filtering(ResourcesMojo mojo) throws Exception {
341+
public void testResourceProjectPropertiesFiltering(ResourcesMojo mojo) throws Exception {
342342
assertNotNull(mojo);
343343

344344
MavenProjectResourcesStub project = (MavenProjectResourcesStub) mojo.project;
@@ -367,7 +367,7 @@ public void testResourceProjectProperties_Filtering(ResourcesMojo mojo) throws E
367367
@Test
368368
@InjectMojo(goal = "resources", pom = CONFIG_XML)
369369
@Basedir
370-
public void testProjectProperty_Filtering_PropertyDestination(ResourcesMojo mojo) throws Exception {
370+
public void testProjectPropertyFilteringPropertyDestination(ResourcesMojo mojo) throws Exception {
371371
assertNotNull(mojo);
372372

373373
MavenProjectResourcesStub project = (MavenProjectResourcesStub) mojo.project;
@@ -399,7 +399,7 @@ public void testProjectProperty_Filtering_PropertyDestination(ResourcesMojo mojo
399399
@Test
400400
@InjectMojo(goal = "resources", pom = CONFIG_XML)
401401
@Basedir
402-
public void testPropertyFiles_Filtering(ResourcesMojo mojo) throws Exception {
402+
public void testPropertyFilesFiltering(ResourcesMojo mojo) throws Exception {
403403
assertNotNull(mojo);
404404

405405
MavenProjectResourcesStub project = (MavenProjectResourcesStub) mojo.project;
@@ -431,7 +431,7 @@ public void testPropertyFiles_Filtering(ResourcesMojo mojo) throws Exception {
431431
@Test
432432
@InjectMojo(goal = "resources", pom = CONFIG_XML)
433433
@Basedir
434-
public void testPropertyFiles_Extra(ResourcesMojo mojo) throws Exception {
434+
public void testPropertyFilesExtra(ResourcesMojo mojo) throws Exception {
435435
assertNotNull(mojo);
436436

437437
MavenProjectResourcesStub project = (MavenProjectResourcesStub) mojo.project;
@@ -463,7 +463,7 @@ public void testPropertyFiles_Extra(ResourcesMojo mojo) throws Exception {
463463
@Test
464464
@InjectMojo(goal = "resources", pom = CONFIG_XML)
465465
@Basedir
466-
public void testPropertyFiles_MainAndExtra(ResourcesMojo mojo) throws Exception {
466+
public void testPropertyFilesMainAndExtra(ResourcesMojo mojo) throws Exception {
467467
assertNotNull(mojo);
468468

469469
MavenProjectResourcesStub project = (MavenProjectResourcesStub) mojo.project;
@@ -506,7 +506,7 @@ public void testPropertyFiles_MainAndExtra(ResourcesMojo mojo) throws Exception
506506
@Test
507507
@InjectMojo(goal = "resources", pom = CONFIG_XML)
508508
@Basedir
509-
public void testPropertyFiles_Filtering_TokensInFilters(ResourcesMojo mojo) throws Exception {
509+
public void testPropertyFilesFilteringTokensInFilters(ResourcesMojo mojo) throws Exception {
510510
assertNotNull(mojo);
511511

512512
MavenProjectResourcesStub project = (MavenProjectResourcesStub) mojo.project;

src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@
4040
import java.nio.file.Files;
4141
import java.nio.file.Path;
4242
import java.nio.file.Paths;
43-
import java.util.*;
43+
import java.util.ArrayList;
44+
import java.util.Collection;
45+
import java.util.Collections;
46+
import java.util.List;
4447
import java.util.function.Function;
4548

4649
import org.apache.maven.api.model.Build;

0 commit comments

Comments
 (0)