Skip to content

Commit 726f429

Browse files
slachiewiczslachiewicz
committed
Bump org.apache.maven.plugins:maven-plugins from 43 to 45
Bumps [org.apache.maven.plugins:maven-plugins](https://github.com/apache/maven-parent) from 43 to 45. - [Release notes](https://github.com/apache/maven-parent/releases) - [Commits](https://github.com/apache/maven-parent/commits) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-plugins dependency-version: '45' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
1 parent a747bae commit 726f429

5 files changed

Lines changed: 19 additions & 23 deletions

File tree

‎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>45</version>
2727
</parent>
2828

2929
<artifactId>maven-resources-plugin</artifactId>
@@ -105,6 +105,7 @@ under the License.
105105
<dependency>
106106
<groupId>org.apache.maven.plugin-tools</groupId>
107107
<artifactId>maven-plugin-annotations</artifactId>
108+
<version>${version.maven-plugin-tools}</version>
108109
<scope>provided</scope>
109110
</dependency>
110111
<dependency>

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,9 @@
2424
import org.apache.maven.shared.filtering.PropertyUtils;
2525

2626
public class BasicPropertyUtilsTest extends AbstractPropertyUtilsTest {
27-
protected static final String validationFileName =
28-
"/target/test-classes/unit/propertiesutils-test/basic_validation.properties";
29-
30-
protected static final String propFileName = "/target/test-classes/unit/propertiesutils-test/basic.properties";
3127

3228
protected File getPropertyFile() {
33-
File propFile = new File(getBasedir(), propFileName);
29+
File propFile = new File(getBasedir(), "/target/test-classes/unit/propertiesutils-test/basic.properties");
3430

3531
if (!propFile.exists()) {
3632
propFile = null;
@@ -40,7 +36,8 @@ protected File getPropertyFile() {
4036
}
4137

4238
protected File getValidationFile() {
43-
File validationFile = new File(getBasedir(), validationFileName);
39+
File validationFile =
40+
new File(getBasedir(), "/target/test-classes/unit/propertiesutils-test/basic_validation.properties");
4441

4542
if (!validationFile.exists()) {
4643
validationFile = null;
@@ -54,7 +51,7 @@ protected File getValidationFile() {
5451
*
5552
* @throws Exception
5653
*/
57-
public void testBasicLoadProperty_FF() throws Exception {
54+
public void testBasicLoadPropertyFF() throws Exception {
5855
Properties prop = PropertyUtils.loadPropertyFile(propertyFile, false, false);
5956

6057
assertNotNull(prop);
@@ -66,7 +63,7 @@ public void testBasicLoadProperty_FF() throws Exception {
6663
*
6764
* @throws Exception
6865
*/
69-
public void testBasicLoadProperty_TF() throws Exception {
66+
public void testBasicLoadPropertyTF() throws Exception {
7067
Properties prop = PropertyUtils.loadPropertyFile(propertyFile, true, false);
7168

7269
assertNotNull(prop);
@@ -78,7 +75,7 @@ public void testBasicLoadProperty_TF() throws Exception {
7875
*
7976
* @throws Exception
8077
*/
81-
public void testBasicLoadProperty_TT() throws Exception {
78+
public void testBasicLoadPropertyTT() throws Exception {
8279
Properties prop = PropertyUtils.loadPropertyFile(propertyFile, true, true);
8380

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

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
*/
3333
public class CopyResourcesMojoTest extends AbstractMojoTestCase {
3434

35-
protected static final String defaultPomFilePath = "/target/test-classes/unit/resources-test/plugin-config.xml";
36-
3735
File outputDirectory = new File(getBasedir(), "/target/copyResourcesTests");
3836

3937
protected void setUp() throws Exception {
@@ -46,7 +44,7 @@ protected void setUp() throws Exception {
4644
}
4745

4846
public void testCopyWithoutFiltering() throws Exception {
49-
File testPom = new File(getBasedir(), defaultPomFilePath);
47+
File testPom = new File(getBasedir(), "/target/test-classes/unit/resources-test/plugin-config.xml");
5048
ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
5149

5250
mojo.setOutputDirectory(outputDirectory);

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.codehaus.plexus.util.FileUtils;
3838

3939
public class ResourcesMojoTest extends AbstractMojoTestCase {
40-
protected static final String defaultPomFilePath = "/target/test-classes/unit/resources-test/plugin-config.xml";
40+
private final String defaultPomFilePath = "/target/test-classes/unit/resources-test/plugin-config.xml";
4141

4242
/**
4343
* test mojo lookup, test harness should be working fine
@@ -89,7 +89,7 @@ public void testResourceDirectoryStructure() throws Exception {
8989
/**
9090
* @throws Exception
9191
*/
92-
public void testResourceDirectoryStructure_RelativePath() throws Exception {
92+
public void testResourceDirectoryStructureRelativePath() throws Exception {
9393
File testPom = new File(getBasedir(), defaultPomFilePath);
9494
ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
9595
MavenProjectResourcesStub project = new MavenProjectResourcesStub("resourceDirectoryStructure_RelativePath");
@@ -294,7 +294,7 @@ public void testResourceTargetPath() throws Exception {
294294
/**
295295
* @throws Exception
296296
*/
297-
public void testResourceSystemProperties_Filtering() throws Exception {
297+
public void testResourceSystemPropertiesFiltering() throws Exception {
298298
File testPom = new File(getBasedir(), defaultPomFilePath);
299299
ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
300300
MavenProjectResourcesStub project = new MavenProjectResourcesStub("resourceSystemProperties_Filtering");
@@ -340,7 +340,7 @@ public void testResourceSystemProperties_Filtering() throws Exception {
340340
/**
341341
* @throws Exception
342342
*/
343-
public void testResourceProjectProperties_Filtering() throws Exception {
343+
public void testResourceProjectPropertiesFiltering() throws Exception {
344344
File testPom = new File(getBasedir(), defaultPomFilePath);
345345
ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
346346
MavenProjectResourcesStub project = new MavenProjectResourcesStub("resourceProjectProperties_Filtering");
@@ -371,7 +371,7 @@ public void testResourceProjectProperties_Filtering() throws Exception {
371371
/**
372372
* @throws Exception
373373
*/
374-
public void testProjectProperty_Filtering_PropertyDestination() throws Exception {
374+
public void testProjectPropertyFilteringPropertyDestination() throws Exception {
375375
File testPom = new File(getBasedir(), defaultPomFilePath);
376376
ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
377377
MavenProjectResourcesStub project =
@@ -406,7 +406,7 @@ public void testProjectProperty_Filtering_PropertyDestination() throws Exception
406406
/**
407407
* @throws Exception
408408
*/
409-
public void testPropertyFiles_Filtering() throws Exception {
409+
public void testPropertyFilesFiltering() throws Exception {
410410
File testPom = new File(getBasedir(), defaultPomFilePath);
411411
ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
412412
MavenProjectResourcesStub project = new MavenProjectResourcesStub("resourcePropertyFiles_Filtering");
@@ -439,7 +439,7 @@ public void testPropertyFiles_Filtering() throws Exception {
439439
/**
440440
* @throws Exception
441441
*/
442-
public void testPropertyFiles_Extra() throws Exception {
442+
public void testPropertyFilesExtra() throws Exception {
443443
File testPom = new File(getBasedir(), defaultPomFilePath);
444444
ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
445445
MavenProjectResourcesStub project = new MavenProjectResourcesStub("resourcePropertyFiles_Extra");
@@ -472,7 +472,7 @@ public void testPropertyFiles_Extra() throws Exception {
472472
/**
473473
* @throws Exception
474474
*/
475-
public void testPropertyFiles_MainAndExtra() throws Exception {
475+
public void testPropertyFilesMainAndExtra() throws Exception {
476476
File testPom = new File(getBasedir(), defaultPomFilePath);
477477
ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
478478
MavenProjectResourcesStub project = new MavenProjectResourcesStub("resourcePropertyFiles_MainAndExtra");
@@ -516,7 +516,7 @@ public void testPropertyFiles_MainAndExtra() throws Exception {
516516
*
517517
* @throws Exception
518518
*/
519-
public void testPropertyFiles_Filtering_TokensInFilters() throws Exception {
519+
public void testPropertyFilesFilteringTokensInFilters() throws Exception {
520520
final File testPom = new File(getBasedir(), defaultPomFilePath);
521521
final ResourcesMojo mojo = (ResourcesMojo) lookupMojo("resources", testPom);
522522
final MavenProjectResourcesStub project =

‎src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.codehaus.plexus.util.FileUtils;
2929

3030
public class TestResourcesTest extends AbstractMojoTestCase {
31-
protected static final String defaultPomFilePath = "/target/test-classes/unit/resources-test/plugin-config.xml";
31+
private final String defaultPomFilePath = "/target/test-classes/unit/resources-test/plugin-config.xml";
3232

3333
protected void setUp() throws Exception {
3434
super.setUp();

0 commit comments

Comments
 (0)