[maven-resources-plugin] 01/01: Merge pull request #4 from apache/31

[elharo]

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resources-plugin.git

commit d38a8e81f7001e4022bb1f11d0a97f129fce50aa
Merge: d37390b 1e629c4
Author: Elliotte Rusty Harold <elh...@users.noreply.github.com>
AuthorDate: Thu Jul 16 10:43:02 2020 -0400

    Merge pull request #4 from apache/31
    
    [MRESOURCES-261] update to Maven 3.1

 pom.xml                                                               | 4 ++--
 .../java/org/apache/maven/plugins/resources/ResourcesMojoTest.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)