You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2020/02/28 22:18:39 UTC
[accumulo-maven-plugin] branch master updated: Prepare
accumulo2-maven-plugin for Accumulo 2.1
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-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 4e5abf6 Prepare accumulo2-maven-plugin for Accumulo 2.1
4e5abf6 is described below
commit 4e5abf6e1d8f7bc6b701e9875cfc3ae0f1bc403e
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Fri Feb 28 17:18:14 2020 -0500
Prepare accumulo2-maven-plugin for Accumulo 2.1
---
pom.xml | 393 ++++++++++++---------
src/it/plugin-test/pom.xml | 106 +-----
.../src/test/resources/log4j2-test.properties | 13 +-
3 files changed, 243 insertions(+), 269 deletions(-)
diff --git a/pom.xml b/pom.xml
index 10e8945..bcbdef4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
</parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo2-maven-plugin</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Accumulo Maven Plugin for Accumulo2</name>
<description>An Apache Maven plugin for testing software against a test Apache Accumulo instance.</description>
@@ -89,14 +89,14 @@
<url>https://travis-ci.org/apache/accumulo-maven-plugin</url>
</ciManagement>
<properties>
- <accumulo.version>2.0.0</accumulo.version>
+ <accumulo.version>2.1.0-SNAPSHOT</accumulo.version>
<eclipseFormatterStyle>contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle>
<!-- extra release args for testing -->
<extraReleaseArguments />
<it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
- <maven.compiler.release>8</maven.compiler.release>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
<mavenPluginToolsVersion>3.6.0</mavenPluginToolsVersion>
<mavenVersion>3.6.3</mavenVersion>
<sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
@@ -164,6 +164,190 @@
<version>2.7</version>
</plugin>
<plugin>
+ <groupId>com.github.ekryd.sortpom</groupId>
+ <artifactId>sortpom-maven-plugin</artifactId>
+ <version>2.10.0</version>
+ <configuration>
+ <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
+ <createBackupFile>false</createBackupFile>
+ <lineSeparator>\n</lineSeparator>
+ <expandEmptyElements>false</expandEmptyElements>
+ <nrOfIndentSpace>2</nrOfIndentSpace>
+ <sortDependencies>scope,groupId,artifactId</sortDependencies>
+ <sortProperties>true</sortProperties>
+ <verifyFail>Stop</verifyFail>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.github.koraktor</groupId>
+ <artifactId>mavanagaiata</artifactId>
+ <version>0.9.4</version>
+ <configuration>
+ <skipNoGit>true</skipNoGit>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>3.1.12.1</version>
+ <configuration>
+ <xmlOutput>true</xmlOutput>
+ <effort>Max</effort>
+ <failOnError>true</failOnError>
+ <includeTests>true</includeTests>
+ <maxRank>20</maxRank>
+ <plugins>
+ <plugin>
+ <groupId>com.overstock.findbugs</groupId>
+ <artifactId>library-detectors</artifactId>
+ <version>1.2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>com.h3xstream.findsecbugs</groupId>
+ <artifactId>findsecbugs-plugin</artifactId>
+ <version>1.8.0</version>
+ </plugin>
+ </plugins>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>net.revelc.code</groupId>
+ <artifactId>impsort-maven-plugin</artifactId>
+ <version>1.3.0</version>
+ <configuration>
+ <removeUnused>true</removeUnused>
+ <groups>java.,javax.,org.,com.</groups>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>net.revelc.code.formatter</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ <version>2.10.0</version>
+ <configuration>
+ <configFile>${eclipseFormatterStyle}</configFile>
+ <compilerCompliance>${maven.compiler.source}</compilerCompliance>
+ <compilerSource>${maven.compiler.source}</compilerSource>
+ <compilerTargetPlatform>${maven.compiler.target}</compilerTargetPlatform>
+ <lineEnding>LF</lineEnding>
+ <overrideConfigCompilerVersion>true</overrideConfigCompilerVersion>
+ <skipJsFormatting>true</skipJsFormatting>
+ <skipHtmlFormatting>true</skipHtmlFormatting>
+ <skipXmlFormatting>true</skipXmlFormatting>
+ <skipJsonFormatting>true</skipJsonFormatting>
+ <skipCssFormatting>true</skipCssFormatting>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <checkstyleRules>
+ <module name="Checker">
+ <property name="charset" value="UTF-8" />
+ <property name="severity" value="warning" />
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="FileTabCharacter">
+ <property name="eachLine" value="true" />
+ </module>
+ <module name="LineLength">
+ <property name="max" value="100" />
+ <property name="ignorePattern" value="^[ ]*[*].*@(link|see) |Map.* = new .*Map|org[.]apache[.]accumulo[.]|a href=|http://|https://|ftp://" />
+ </module>
+ <module name="TreeWalker">
+ <module name="OneTopLevelClass" />
+ <module name="RegexpSinglelineJava">
+ <property name="format" value="\s+$" />
+ <property name="message" value="Line has trailing whitespace." />
+ </module>
+ <module name="RegexpSinglelineJava">
+ <property name="format" value="[@]see\s+[{][@]link" />
+ <property name="message" value="Javadoc @see does not need @link: pick one or the other." />
+ </module>
+ <module name="RegexpSinglelineJava">
+ <property name="format" value="jline[.]internal[.]Preconditions" />
+ <property name="message" value="Please use Guava Preconditions not JLine" />
+ </module>
+ <module name="RegexpSinglelineJava">
+ <property name="format" value="org[.]apache[.]commons[.]math[.]" />
+ <property name="message" value="Use commons-math3 (org.apache.commons.math3.*)" />
+ </module>
+ <module name="RegexpSinglelineJava">
+ <property name="format" value="junit[.]framework[.]TestCase" />
+ <property name="message" value="Use JUnit4+ @Test annotation instead of TestCase" />
+ </module>
+ <module name="RegexpSinglelineJava">
+ <property name="format" value="import org[.]junit[.]Assert;" />
+ <property name="message" value="Use static imports for Assert.* methods for consistency" />
+ </module>
+ <module name="OuterTypeFilename" />
+ <module name="AvoidStarImport" />
+ <module name="UnusedImports">
+ <property name="processJavadoc" value="true" />
+ </module>
+ <module name="NoLineWrap" />
+ <module name="LeftCurly" />
+ <module name="RightCurly">
+ <property name="option" value="alone" />
+ <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT" />
+ </module>
+ <module name="SeparatorWrap">
+ <property name="tokens" value="DOT" />
+ <property name="option" value="nl" />
+ </module>
+ <module name="SeparatorWrap">
+ <property name="tokens" value="COMMA" />
+ <property name="option" value="EOL" />
+ </module>
+ <module name="PackageName">
+ <property name="format" value="^[a-z]+(\.[a-z][a-zA-Z0-9]*)*$" />
+ </module>
+ <module name="MethodTypeParameterName">
+ <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)" />
+ </module>
+ <module name="MethodParamPad" />
+ <module name="OperatorWrap">
+ <property name="option" value="NL" />
+ <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, QUESTION, SL, SR, STAR " />
+ </module>
+ <module name="AnnotationLocation">
+ <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF" />
+ </module>
+ <module name="AnnotationLocation">
+ <property name="tokens" value="VARIABLE_DEF" />
+ <property name="allowSamelineMultipleAnnotations" value="true" />
+ </module>
+ <module name="NonEmptyAtclauseDescription" />
+ <module name="JavadocTagContinuationIndentation" />
+ <module name="JavadocMethod">
+ <property name="allowMissingParamTags" value="true" />
+ <property name="allowMissingReturnTag" value="true" />
+ <property name="allowedAnnotations" value="Override,Test,BeforeClass,AfterClass,Before,After" />
+ </module>
+ <module name="SingleLineJavadoc" />
+ <module name="MissingOverrideCheck" />
+ <module name="AnnotationLocation" />
+ <!--check that only Accumulo public APIs are imported-->
+ <module name="ImportControl">
+ <property name="file" value="contrib/import-control.xml" />
+ </module>
+ </module>
+ </module>
+ </checkstyleRules>
+ <violationSeverity>warning</violationSeverity>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <excludes>**/HelpMojo.java</excludes>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>8.29</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
@@ -181,9 +365,21 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <dependencies>
+ <dependency>
+ <!-- needed for Java 11 until maven-dependency-plugin 3.1.2 is released -->
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-dependency-analyzer</artifactId>
+ <version>1.11.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <!-- newer version than in apache-21.pom -->
- <version>3.1.2</version>
+ <version>3.2.0</version>
<configuration>
<archive>
<manifestEntries>
@@ -196,7 +392,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <!-- newer version than in apache-21.pom -->
<version>3.1.1</version>
<configuration>
<quiet>true</quiet>
@@ -206,9 +401,13 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>3.6.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <!-- newer version than in apache-21.pom -->
- <version>2.5.3</version>
+ <version>3.0.0-M1</version>
<configuration>
<arguments>-P !autoformat ${extraReleaseArguments}</arguments>
<goals>clean deploy</goals>
@@ -223,12 +422,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <!-- newer version than in apache-21.pom -->
<version>3.8.2</version>
<configuration>
<skipDeploy>true</skipDeploy>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.gaul</groupId>
+ <artifactId>modernizer-maven-plugin</artifactId>
+ <version>1.8.0</version>
+ <configuration>
+ <javaVersion>${maven.compiler.target}</javaVersion>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -236,17 +442,6 @@
<!-- verify before compile; should be sorted already -->
<groupId>com.github.ekryd.sortpom</groupId>
<artifactId>sortpom-maven-plugin</artifactId>
- <version>2.10.0</version>
- <configuration>
- <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
- <createBackupFile>false</createBackupFile>
- <lineSeparator>\n</lineSeparator>
- <expandEmptyElements>false</expandEmptyElements>
- <nrOfIndentSpace>2</nrOfIndentSpace>
- <sortDependencies>scope,groupId,artifactId</sortDependencies>
- <sortProperties>true</sortProperties>
- <verifyFail>Stop</verifyFail>
- </configuration>
<executions>
<execution>
<id>verify-sorted-pom</id>
@@ -260,10 +455,6 @@
<plugin>
<groupId>com.github.koraktor</groupId>
<artifactId>mavanagaiata</artifactId>
- <version>0.9.4</version>
- <configuration>
- <skipNoGit>true</skipNoGit>
- </configuration>
<executions>
<execution>
<id>git-commit</id>
@@ -277,26 +468,6 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>3.1.12.1</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <effort>Max</effort>
- <failOnError>true</failOnError>
- <includeTests>true</includeTests>
- <maxRank>20</maxRank>
- <plugins>
- <plugin>
- <groupId>com.overstock.findbugs</groupId>
- <artifactId>library-detectors</artifactId>
- <version>1.2.0</version>
- </plugin>
- <plugin>
- <groupId>com.h3xstream.findsecbugs</groupId>
- <artifactId>findsecbugs-plugin</artifactId>
- <version>1.8.0</version>
- </plugin>
- </plugins>
- </configuration>
<executions>
<execution>
<id>run-spotbugs</id>
@@ -309,112 +480,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.0</version>
- <configuration>
- <checkstyleRules>
- <module name="Checker">
- <property name="charset" value="UTF-8" />
- <property name="severity" value="warning" />
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <module name="FileTabCharacter">
- <property name="eachLine" value="true" />
- </module>
- <module name="LineLength">
- <property name="max" value="100" />
- <property name="ignorePattern" value="^[ ]*[*].*@(link|see) |Map.* = new .*Map|org[.]apache[.]accumulo[.]|a href=|http://|https://|ftp://" />
- </module>
- <module name="TreeWalker">
- <module name="OneTopLevelClass" />
- <module name="RegexpSinglelineJava">
- <property name="format" value="\s+$" />
- <property name="message" value="Line has trailing whitespace." />
- </module>
- <module name="RegexpSinglelineJava">
- <property name="format" value="[@]see\s+[{][@]link" />
- <property name="message" value="Javadoc @see does not need @link: pick one or the other." />
- </module>
- <module name="RegexpSinglelineJava">
- <property name="format" value="jline[.]internal[.]Preconditions" />
- <property name="message" value="Please use Guava Preconditions not JLine" />
- </module>
- <module name="RegexpSinglelineJava">
- <property name="format" value="org[.]apache[.]commons[.]math[.]" />
- <property name="message" value="Use commons-math3 (org.apache.commons.math3.*)" />
- </module>
- <module name="RegexpSinglelineJava">
- <property name="format" value="junit[.]framework[.]TestCase" />
- <property name="message" value="Use JUnit4+ @Test annotation instead of TestCase" />
- </module>
- <module name="RegexpSinglelineJava">
- <property name="format" value="import org[.]junit[.]Assert;" />
- <property name="message" value="Use static imports for Assert.* methods for consistency" />
- </module>
- <module name="OuterTypeFilename" />
- <module name="AvoidStarImport" />
- <module name="UnusedImports">
- <property name="processJavadoc" value="true" />
- </module>
- <module name="NoLineWrap" />
- <module name="LeftCurly" />
- <module name="RightCurly">
- <property name="option" value="alone" />
- <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT" />
- </module>
- <module name="SeparatorWrap">
- <property name="tokens" value="DOT" />
- <property name="option" value="nl" />
- </module>
- <module name="SeparatorWrap">
- <property name="tokens" value="COMMA" />
- <property name="option" value="EOL" />
- </module>
- <module name="PackageName">
- <property name="format" value="^[a-z]+(\.[a-z][a-zA-Z0-9]*)*$" />
- </module>
- <module name="MethodTypeParameterName">
- <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)" />
- </module>
- <module name="MethodParamPad" />
- <module name="OperatorWrap">
- <property name="option" value="NL" />
- <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, QUESTION, SL, SR, STAR " />
- </module>
- <module name="AnnotationLocation">
- <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF" />
- </module>
- <module name="AnnotationLocation">
- <property name="tokens" value="VARIABLE_DEF" />
- <property name="allowSamelineMultipleAnnotations" value="true" />
- </module>
- <module name="NonEmptyAtclauseDescription" />
- <module name="JavadocTagContinuationIndentation" />
- <module name="JavadocMethod">
- <property name="allowMissingParamTags" value="true" />
- <property name="allowMissingReturnTag" value="true" />
- <property name="allowedAnnotations" value="Override,Test,BeforeClass,AfterClass,Before,After" />
- </module>
- <module name="SingleLineJavadoc" />
- <module name="MissingOverrideCheck" />
- <module name="AnnotationLocation" />
- <!--check that only Accumulo public APIs are imported-->
- <module name="ImportControl">
- <property name="file" value="contrib/import-control.xml" />
- </module>
- </module>
- </module>
- </checkstyleRules>
- <violationSeverity>warning</violationSeverity>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <excludes>**/HelpMojo.java</excludes>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>8.29</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>check-style</id>
@@ -453,7 +518,6 @@
<configuration>
<rules>
<requireMavenVersion>
- <!-- org.apache.felix:maven-bundle-plugin declares that it needs 3.5.0 -->
<version>[3.5.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
@@ -522,10 +586,6 @@
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
- <version>1.8.0</version>
- <configuration>
- <javaVersion>${maven.compiler.target}</javaVersion>
- </configuration>
<executions>
<execution>
<id>modernizer</id>
@@ -576,20 +636,6 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
- <version>2.10.0</version>
- <configuration>
- <configFile>${eclipseFormatterStyle}</configFile>
- <compilerCompliance>${maven.compiler.source}</compilerCompliance>
- <compilerSource>${maven.compiler.source}</compilerSource>
- <compilerTargetPlatform>${maven.compiler.target}</compilerTargetPlatform>
- <lineEnding>LF</lineEnding>
- <overrideConfigCompilerVersion>true</overrideConfigCompilerVersion>
- <skipJsFormatting>true</skipJsFormatting>
- <skipHtmlFormatting>true</skipHtmlFormatting>
- <skipXmlFormatting>true</skipXmlFormatting>
- <skipJsonFormatting>true</skipJsonFormatting>
- <skipCssFormatting>true</skipCssFormatting>
- </configuration>
<executions>
<execution>
<id>format-java-source</id>
@@ -602,11 +648,6 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
- <version>1.3.0</version>
- <configuration>
- <removeUnused>true</removeUnused>
- <groups>java.,javax.,org.,com.</groups>
- </configuration>
<executions>
<execution>
<id>sort-imports</id>
diff --git a/src/it/plugin-test/pom.xml b/src/it/plugin-test/pom.xml
index 8dab11d..ee4d915 100644
--- a/src/it/plugin-test/pom.xml
+++ b/src/it/plugin-test/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>23</version>
</parent>
<groupId>@project.groupId@</groupId>
@@ -30,118 +30,47 @@
<description>A simple IT verifying the basic use case.</description>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-bom</artifactId>
+ <type>pom</type>
+ <version>2.13.0</version>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-minicluster</artifactId>
<version>@accumulo.version@</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>4.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.9</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- <version>3.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.4.14</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <!-- needed for zookeeper jmx support, which can't be disabled in 3.4 -->
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.30</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
- <version>2.13.0</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.13.0</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.13.0</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.13.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <version>3.1.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -187,9 +116,6 @@
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
- <configuration>
- <excludedGroups combine.self="override" />
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/src/it/plugin-test/src/test/resources/log4j2-test.properties b/src/it/plugin-test/src/test/resources/log4j2-test.properties
index f8ca122..ebd908c 100644
--- a/src/it/plugin-test/src/test/resources/log4j2-test.properties
+++ b/src/it/plugin-test/src/test/resources/log4j2-test.properties
@@ -17,9 +17,6 @@
# under the License.
#
-## Log4j2 file that configures logging for all Accumulo services
-## The system properties referenced below are configured by accumulo-env.sh
-
status = info
dest = err
name = Accumulo2MavenPluginLoggingProperties
@@ -30,6 +27,16 @@ appender.console.target = SYSTEM_OUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%c{2}] %-5p: %m%n
+logger.zk1.name = org.apache.zookeeper
+logger.zk1.level = info
+logger.zk2.name = org.apache.zookeeper.ClientCnxn
+logger.zk2.level = fatal
+logger.zk3.name = org.apache.zookeeper.ZooKeeper
+logger.zk3.level = warn
+
+logger.converters.name = org.apache.commons.beanutils.converters
+logger.converters.level = info
+
rootLogger.level = debug
rootLogger.appenderRef.console.ref = STDOUT