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 2017/10/23 22:23:23 UTC
[accumulo] branch master updated: ACCUMULO-4703 Use
formatter-maven-plugin 2.1.0.RC1
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 41ec3e2 ACCUMULO-4703 Use formatter-maven-plugin 2.1.0.RC1
41ec3e2 is described below
commit 41ec3e2a248e22037e200edfcae65c08eafab687
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Mon Oct 23 16:55:15 2017 -0400
ACCUMULO-4703 Use formatter-maven-plugin 2.1.0.RC1
Upgrade to newest formatter, so javadocs are properly formatted.
---
.../accumulo/iteratortest/IteratorTestOutput.java | 17 +++++++++++------
pom.xml | 7 ++++++-
.../org/apache/accumulo/server/init/Initialize.java | 5 ++---
3 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestOutput.java b/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestOutput.java
index cf1e50c..8ed8d5b 100644
--- a/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestOutput.java
+++ b/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestOutput.java
@@ -35,15 +35,20 @@ public class IteratorTestOutput {
* An outcome about what happened during a test case.
*/
public enum TestOutcome {
+
/**
* The IteratorTestCase proactively passed.
*/
- PASSED, /**
- * The IteratorTestCase proactively failed.
- */
- FAILED, /**
- * The IteratorTestCase completed, but the pass/fail should be determined by the other context.
- */
+ PASSED,
+
+ /**
+ * The IteratorTestCase proactively failed.
+ */
+ FAILED,
+
+ /**
+ * The IteratorTestCase completed, but the pass/fail should be determined by the other context.
+ */
COMPLETED
}
diff --git a/pom.xml b/pom.xml
index 0d8782d..0e5ffd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -945,7 +945,7 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.1.0.RC1</version>
<configuration>
<compilerCompliance>${maven.compiler.source}</compilerCompliance>
<compilerSource>${maven.compiler.source}</compilerSource>
@@ -956,6 +956,11 @@
</excludes>
<lineEnding>LF</lineEnding>
<overrideConfigCompilerVersion>true</overrideConfigCompilerVersion>
+ <skipJsFormatting>true</skipJsFormatting>
+ <skipHtmlFormatting>true</skipHtmlFormatting>
+ <skipXmlFormatting>true</skipXmlFormatting>
+ <skipJsonFormatting>true</skipJsonFormatting>
+ <skipCssFormatting>true</skipCssFormatting>
</configuration>
<dependencies>
<dependency>
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index e12f790..be3869b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -647,9 +647,8 @@ public class Initialize implements KeywordExecutable {
/**
* Create warning message related to initial password, if appropriate.
*
- * ACCUMULO-2907 Remove unnecessary security warning from console message unless its actually appropriate.
- * The warning message should only be displayed when the value of <code>instance.security.authenticator</code>
- * differs between the SiteConfiguration and the DefaultConfiguration values.
+ * ACCUMULO-2907 Remove unnecessary security warning from console message unless its actually appropriate. The warning message should only be displayed when
+ * the value of <code>instance.security.authenticator</code> differs between the SiteConfiguration and the DefaultConfiguration values.
*
* @return String containing warning portion of console message.
*/
--
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <co...@accumulo.apache.org>'].