asfgit closed pull request #314: ACCUMULO-4703 Use formatter-maven-plugin
2.1.0.RC1
URL: https://github.com/apache/accumulo/pull/314
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 cf1e50c7fd..8ed8d5b051 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 @@
* 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 0d8782d61b..0e5ffd6765 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 e12f790b3b..be3869b105 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 @@ private String getRootUserName(Opts opts) throws
IOException {
/**
* 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.
*/
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
