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

Author: DomGarguilo

LICENSE

@@ -284,36 +284,6 @@ Files:
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
 
-## Flot 4.2.6 (https://github.com/flot/flot)
-
-Files:
-* server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/*
-
-    Copyright (c) 2007-2014 IOLA and Ole Laursen
-
-    Available under the MIT License
-    (see server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/LICENSE.txt)
-
-    Flot bundles additional works:
-
-    jquery.flot.pie.js
-        Flot plugin for rendering pie charts.
-
-        Copyright (c) 2007-2014 IOLA and Ole Laursen.
-        Licensed under the MIT license.
-
-        * Created by Brian Medendorp
-        * Updated with contributions from btburnett3, Anthony Aragues and Xavi Ivars
-
-    jquery.flot.resize.js
-    * Inline dependency:
-     * jQuery resize event - v1.1 - 3/14/2010
-     * http://benalman.com/projects/jquery-resize-plugin/
-     *
-     * Copyright (c) 2010 "Cowboy" Ben Alman
-     * Dual licensed under the MIT and GPL licenses.
-     * http://benalman.com/about/license/
-
 ## Bootstrap v5.3.2 (https://getbootstrap.com/)
 
 Files:

assemble/conf/log4j2-service.properties

@@ -67,14 +67,6 @@ appender.audit.policies.size.size=512MB
 appender.audit.strategy.type = DefaultRolloverStrategy
 appender.audit.strategy.max = 10
 
-appender.monitor.type = AccumuloMonitor
-appender.monitor.name = MonitorLog
-appender.monitor.filter.threshold.type = ThresholdFilter
-appender.monitor.filter.threshold.level = warn
-#appender.monitor.async = true
-#appender.monitor.maxThreads = 2
-#appender.monitor.queueSize = 1024
-
 logger.zookeeper.name = org.apache.zookeeper
 logger.zookeeper.level = error
 
@@ -90,5 +82,3 @@ logger.accumulo.level = debug
 rootLogger.level = info
 rootLogger.appenderRef.console.ref = STDERR
 rootLogger.appenderRef.rolling.ref = LogFiles
-rootLogger.appenderRef.monitor.ref = MonitorLog
-

assemble/src/main/resources/LICENSE

@@ -286,35 +286,6 @@ Files:
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
 
-## Flot (https://github.com/flot/flot)
-
-    Copyright (c) 2007-2014 IOLA and Ole Laursen
-
-    Available under the MIT License
-    (see org/apache/accumulo/monitor/resources/external/flot/LICENSE.txt in the accumulo-monitor jar)
-
-    Flot bundles additional works:
-
-    jquery.flot.pie.js
-        Flot plugin for rendering pie charts.
-
-        Copyright (c) 2007-2014 IOLA and Ole Laursen.
-        Licensed under the MIT license.
-
-        * Created by Brian Medendorp
-        * Updated with contributions from btburnett3, Anthony Aragues and Xavi Ivars
-
-    jquery.flot.resize.js
-    * Inline dependency:
-     * jQuery resize event - v1.1 - 3/14/2010
-     * http://benalman.com/projects/jquery-resize-plugin/
-     *
-     * Copyright (c) 2010 "Cowboy" Ben Alman
-     * Dual licensed under the MIT and GPL licenses.
-     * http://benalman.com/about/license/
-
-    distributed under the MIT license (see above)
-
 ## Bootstrap v5.3.2 (https://getbootstrap.com/)
 
 Files:

server/monitor/pom.xml

@@ -35,19 +35,11 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.github.ben-manes.caffeine</groupId>
-      <artifactId>caffeine</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.auto.service</groupId>
       <artifactId>auto-service</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -84,14 +76,6 @@
       <groupId>org.apache.accumulo</groupId>
       <artifactId>accumulo-start</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-web</artifactId>

server/monitor/src/main/appended-resources/META-INF/LICENSE

@@ -46,36 +46,6 @@ Files:
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
 
-## Flot 4.2.6 (https://github.com/flot/flot)
-
-Files:
-* server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/*
-
-    Copyright (c) 2007-2014 IOLA and Ole Laursen
-
-    Available under the MIT License
-    (see server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/flot/LICENSE.txt)
-
-    Flot bundles additional works:
-
-    jquery.flot.pie.js
-        Flot plugin for rendering pie charts.
-
-        Copyright (c) 2007-2014 IOLA and Ole Laursen.
-        Licensed under the MIT license.
-
-        * Created by Brian Medendorp
-        * Updated with contributions from btburnett3, Anthony Aragues and Xavi Ivars
-
-    jquery.flot.resize.js
-    * Inline dependency:
-     * jQuery resize event - v1.1 - 3/14/2010
-     * http://benalman.com/projects/jquery-resize-plugin/
-     *
-     * Copyright (c) 2010 "Cowboy" Ben Alman
-     * Dual licensed under the MIT and GPL licenses.
-     * http://benalman.com/about/license/
-
 ## Bootstrap v5.3.2 (https://getbootstrap.com/)
 
 Files: