Merge remote-tracking branch 'upstream/main' into update_empty_wal_cmds

Dockerfile

@@ -31,4 +31,4 @@ ENV PORT=4000
 EXPOSE $PORT
 
 # Configure the default command to build from the mounted repository.
-CMD bundle exec jekyll serve --force-polling -H $HOST -P $PORT
+CMD bundle exec jekyll serve -H $HOST -P $PORT

Gemfile

@@ -1,4 +1,4 @@
-ruby '>=2.5.1'
+ruby '>=2.7'
 source 'https://rubygems.org'
 gem 'jekyll', '>= 4.2.0'
 gem 'jekyll-redirect-from', '>= 0.16.0'

Gemfile.lock

@@ -1,21 +1,22 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.4)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.15.5)
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
-    google-protobuf (3.23.4-x86_64-linux)
+    google-protobuf (4.26.1-x86_64-linux)
+      rake (>= 13)
     http_parser.rb (0.8.0)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.2)
+    jekyll (4.3.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -42,24 +43,25 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.3)
+    public_suffix (5.0.5)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.6)
-    rouge (4.1.2)
+    rouge (4.2.1)
     safe_yaml (1.0.5)
-    sass-embedded (1.64.1-x86_64-linux-gnu)
-      google-protobuf (~> 3.23)
+    sass-embedded (1.76.0-x86_64-linux-gnu)
+      google-protobuf (>= 3.25, < 5.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
 
 PLATFORMS

README.md

@@ -28,16 +28,15 @@ The source for these tags is at [\_plugins/links.rb](_plugins/links.rb).
 
 ### Updating Property Documentation for Releases
 
-Building Accumulo  generates `server-properties.md` and `client-properties.md`.
+Building Accumulo  generates `server-properties*.md` and `client-properties*.md`.
 To regenerate these, do the following.
 
 ```bash
 ACCUMULO_SITE_CLONE=<accumulo website clone location, with main branch checked out>
 ACCUMULO_CLONE=<accumulo clone location>
 cd "$ACCUMULO_CLONE"
 mvn package -DskipTests
-cp ./core/target/generated-docs/server-properties.md "$ACCUMULO_SITE_CLONE"/_docs-2/configuration
-cp ./core/target/generated-docs/client-properties.md "$ACCUMULO_SITE_CLONE"/_docs-2/configuration
+cp ./core/target/generated-docs/*.md "$ACCUMULO_SITE_CLONE"/_docs-2/configuration/
 ```
 
 ## Local Builds for Testing

_config.yml

@@ -13,7 +13,6 @@ description: > # this means to ignore newlines until "url:"
   The Apache Accumulo™ sorted, distributed key/value store is a robust, scalable,
   high performance data storage and retrieval system.
 url: "https://accumulo.apache.org" # the base hostname & protocol for your site
-exclude: [vendor]
 latest_release: 2.1.2
 javadoc_version: 2.1.2
 num_home_posts: 5

_includes/nav.html

@@ -56,6 +56,7 @@
             <li><a class="dropdown-item" href="https://www.apache.org/security">Security <span class="fa-solid fa-up-right-from-square"></span></a></li>
             <li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks">Thanks <span class="fa-solid fa-up-right-from-square"></span></a></li>
             <li><a class="dropdown-item" href="https://www.apache.org/foundation/policies/conduct">Code of Conduct <span class="fa-solid fa-up-right-from-square"></span></a></li>
+            <li><a class="dropdown-item" href="https://www.apache.org/foundation/policies/privacy.html">Privacy Policy<span class="fa-solid fa-up-right-from-square"></span></a></li>
             <li><a class="dropdown-item" href="https://www.apache.org/events/current-event.html">Current Event <span class="fa-solid fa-up-right-from-square"></span></a></li>
           </ul>
         </li>

_includes/two_image_block.html

@@ -0,0 +1,10 @@
+<!-- creates a styled box with two images side by side -->
+<!-- accepts two URLs relative to the project root and two alt text strings -->
+<div class="p-3 border rounded d-flex">
+    <a href="{{ site.baseurl }}{{ include.image1 }}">
+	<img src="{{ site.baseurl }}{{ include.image1 }}" class="img-fluid rounded" alt="{{ include.alt-text1 }}"/>
+    </a>
+    <a href="{{ site.baseurl }}{{ include.image2 }}">
+        <img src="{{ site.baseurl }}{{ include.image2 }}" class="img-fluid rounded" alt="{{ include.alt-text2 }}"/>
+    </a>
+</div>

_layouts/default.html

@@ -20,18 +20,19 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous">
-<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" rel="stylesheet">
-<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs5/dt-1.13.6/datatables.min.css">
-<link href="{{ site.baseurl }}/css/accumulo.css" rel="stylesheet" type="text/css">
+
+<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/bootstrap/5.3.1/dist/css/bootstrap.min.css">
+<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/fontawesome/fontawesome-free-6.4.2-web/css/all.min.css">
+<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/datatables/bs5/dt-1.13.6/datatables.min.css">
+<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/css/accumulo.css">
 
 <title>{% if page.title_prefix %}{{ page.title_prefix | escape }}{% endif %}{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js" integrity="sha256-2Pmvv0kuTBOenSvLm6bvfBSSHrUJ+3A7x6P5Ebd07/g=" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/v/bs5/dt-1.13.6/datatables.min.js"></script>
+<script type="text/javascript" src="{{ site.baseurl }}/js/jquery/3.7.0/jquery.min.js"></script>
+<script type="text/javascript" src="{{ site.baseurl }}/js/bootstrap/5.3.1/dist/js/bootstrap.bundle.min.js"></script>
+<script type="text/javascript" src="{{ site.baseurl }}/js/datatables/bs5/dt-1.13.6/datatables.min.js"></script>
 <script type="text/javascript" src="https://www.apachecon.com/event-images/snippet.js"></script>
-{% include scripts.html %}
+<script type="text/javascript" src="{{ site.baseurl }}/js/accumulo.js"></script>
 </head>
 <body style="padding-top: 100px">