This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/master by this push: new 1b9c816 ACCUMULO-4703 Use formatter-maven-plugin 2.5.0 1b9c816 is described below commit 1b9c8165aba7ce11a8d629e37b0b65d3c1ccab4a Author: Christopher Tubbs <ctubb...@apache.org> AuthorDate: Fri Oct 27 20:59:24 2017 -0400 ACCUMULO-4703 Use formatter-maven-plugin 2.5.0 Use latest formatter and impsort plugins, which set preqrequisites correctly; also fix previous build breakage on older versions of Maven by separating out minimum requirements to execute the accumulo-maven-plugin (runs with 3.2.5+) from the minimum requirements to build the Accumulo project (builds with 3.0.5+). --- maven-plugin/pom.xml | 2 +- pom.xml | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index dc0a687..628813a 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ <name>Apache Accumulo Maven Plugin</name> <description>An Apache Maven plugin for testing software against a test Apache Accumulo instance.</description> <prerequisites> - <maven>${maven.min-version}</maven> + <maven>${maven.plugin-version}</maven> </prerequisites> <dependencies> <dependency> diff --git a/pom.xml b/pom.xml index 0e5ffd6..dde141b 100644 --- a/pom.xml +++ b/pom.xml @@ -137,8 +137,7 @@ <jetty.version>9.3.21.v20170918</jetty.version> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> - <!-- the maven-release-plugin makes this recommendation, due to plugin bugs --> - <maven.min-version>3.2.5</maven.min-version> + <maven.plugin-version>3.2.5</maven.plugin-version> <!-- surefire/failsafe plugin option --> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> <powermock.version>1.6.5</powermock.version> @@ -471,22 +470,22 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>${maven.min-version}</version> + <version>${maven.plugin-version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>${maven.min-version}</version> + <version>${maven.plugin-version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>${maven.min-version}</version> + <version>${maven.plugin-version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>${maven.min-version}</version> + <version>${maven.plugin-version}</version> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> @@ -919,7 +918,7 @@ <version>[${maven.compiler.target},)</version> </requireJavaVersion> <requireMavenVersion> - <version>[${maven.min-version},)</version> + <version>[3.0.5,)</version> </requireMavenVersion> </rules> </configuration> @@ -945,7 +944,7 @@ <plugin> <groupId>net.revelc.code.formatter</groupId> <artifactId>formatter-maven-plugin</artifactId> - <version>2.1.0.RC1</version> + <version>2.5.0</version> <configuration> <compilerCompliance>${maven.compiler.source}</compilerCompliance> <compilerSource>${maven.compiler.source}</compilerSource> @@ -998,7 +997,7 @@ <plugin> <groupId>net.revelc.code</groupId> <artifactId>impsort-maven-plugin</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> <configuration> <groups>java.,javax.,org.,com.</groups> <excludes> -- To stop receiving notification emails like this one, please contact ['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].