[MRRESOURCES-119] Update plugin to 3.x (#6)
Changes:
* parent POM 36
* set proper scopes for maven bits
* update deps
* keep Java7 level
* this gonna be first 3.x release of this plugin
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
new file mode 100644
index 0000000..62709ed
--- /dev/null
+++ b/.github/workflows/maven-verify.yml
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Verify
+
+on:
+ push:
+ pull_request:
+
+jobs:
+ build:
+ name: Verify
+ uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2
+
diff --git a/pom.xml b/pom.xml
index 7a35ef2..d35ec6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,12 +25,12 @@
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>34</version>
+ <version>36</version>
<relativePath />
</parent>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.7.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Remote Resources Plugin</name>
@@ -68,10 +68,8 @@
</distributionManagement>
<properties>
- <mavenVersion>3.2.5</mavenVersion>
<javaVersion>7</javaVersion>
- <mavenFilteringVersion>3.1.1</mavenFilteringVersion>
- <sitePluginVersion>3.3</sitePluginVersion>
+ <mavenVersion>3.2.5</mavenVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>
@@ -81,21 +79,31 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -123,7 +131,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
- <version>${mavenFilteringVersion}</version>
+ <version>3.2.0</version>
</dependency>
<!-- plexus -->
@@ -131,13 +139,19 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-resources</artifactId>
<version>1.1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- other -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -149,19 +163,19 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>3.1.0</version>
+ <version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
- <version>1.7.2</version>
+ <version>1.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -322,6 +336,7 @@
<filtering>true</filtering>
<excludes>
<exclude>custom-filter-delim/src/main/resources/**</exclude>
+ <exclude>**/*.jar</exclude> <!-- maven-filtering chokes on JARs -->
</excludes>
</testResource>
<testResource>
@@ -329,6 +344,7 @@
<filtering>false</filtering>
<includes>
<include>custom-filter-delim/src/main/resources/**</include>
+ <include>**/*.jar</include> <!-- maven-filtering chokes on JARs -->
</includes>
</testResource>
</testResources>
