(accumulo) 01/01: Merge branch '2.1'

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 436a6835de165715c930f9d6cebe1cad76d9d578
Merge: 3061ff028d 8dfb4eb713
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Mon Dec 18 19:02:37 2023 -0500

    Merge branch '2.1'

 core/pom.xml                                                      | 4 ++--
 .../java/org/apache/accumulo/core/conf/ClientConfigGenerate.java  | 8 ++++----
 .../java/org/apache/accumulo/core/conf/ConfigurationDocGen.java   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --cc core/pom.xml
index e1a83b0228,7869dddb38..2ba4af4861
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -355,7 -355,7 +355,7 @@@
                <classpathScope>test</classpathScope>
                <arguments>
                  <argument>--generate-markdown</argument>
--                
<argument>${project.build.directory}/generated-docs/server-properties.md</argument>
++                
<argument>${project.build.directory}/generated-docs/server-properties3.md</argument>
                </arguments>
              </configuration>
            </execution>
@@@ -370,7 -370,7 +370,7 @@@
                <classpathScope>test</classpathScope>
                <arguments>
                  <argument>--generate-markdown</argument>
--                
<argument>${project.build.directory}/generated-docs/client-properties.md</argument>
++                
<argument>${project.build.directory}/generated-docs/client-properties3.md</argument>
                </arguments>
              </configuration>
            </execution>
diff --cc 
core/src/main/java/org/apache/accumulo/core/conf/ClientConfigGenerate.java
index d4d01d0786,0cd21758b1..f95688a4ed
--- a/core/src/main/java/org/apache/accumulo/core/conf/ClientConfigGenerate.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ClientConfigGenerate.java
@@@ -29,8 -29,8 +29,8 @@@ import java.util.TreeMap
  import com.google.common.collect.Sets;
  
  /**
-- * Generates client-properties.md for documentation on Accumulo website and
-- * accumulo-client.properties for Accumulo distribution tarball
++ * Generates client properties documentation on Accumulo website and 
accumulo-client.properties for
++ * Accumulo distribution tarball
   */
  public class ClientConfigGenerate {
  
@@@ -86,9 -86,9 +86,9 @@@
      @Override
      void pageHeader() {
        doc.println("---");
-       doc.println("title: Client Properties");
 -      doc.println("title: Client Properties (2.x)");
++      doc.println("title: Client Properties (3.x)");
        doc.println("category: configuration");
--      doc.println("order: 3");
++      doc.println("order: 4");
        doc.println("---\n");
        doc.println("<!-- WARNING: Do not edit this file. It is a generated 
file"
            + " that is copied from Accumulo build (from 
core/target/generated-docs) -->");
diff --cc 
core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
index 163b150eab,51a6e24732..dc5320e93e
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
@@@ -62,9 -62,9 +62,9 @@@ public class ConfigurationDocGen 
  
    void pageHeader() {
      doc.println("---");
-     doc.println("title: Server Properties");
 -    doc.println("title: Server Properties (2.x)");
++    doc.println("title: Server Properties (3.x)");
      doc.println("category: configuration");
-     doc.println("order: 4");
 -    doc.println("order: 5");
++    doc.println("order: 6");
      doc.println("---\n");
      doc.println("<!-- WARNING: Do not edit this file. It is a generated file"
          + " that is copied from Accumulo build (from 
core/target/generated-docs) -->\n");