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 2021/02/25 07:04:40 UTC
[accumulo] branch main updated: Modernize EE dependencies (#1947)
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
The following commit(s) were added to refs/heads/main by this push:
new 701e179 Modernize EE dependencies (#1947)
701e179 is described below
commit 701e17949465ced573e8773cc737c1a161cf5c46
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Feb 25 02:04:30 2021 -0500
Modernize EE dependencies (#1947)
Update Java EE dependencies to Jakarta EE 9
* Update dependencies in pom.xml
* Update import statements (`javax.*` to `jakarta.*`)
* Update jetty to 11 (very minor edit required in EmbeddedWebServer to
fix a variable's assigned type to match the constructed instance type)
* Update jersey to 3
* Update hibernate-validator to 7
* Use bom for dependency management for jakartaee, jetty, jersey, hk2,
jackson, and jaxb
* Remove unnecessary maven-dependency-plugin warning suppressions in
pom.xml
* Minimize bundled jars, removing any that did not appear to be required
for functionality
* Update minicluster to use the same hostname for the test certificate
as the monitor's advertisement address, to avoid test bugs due to the
Jetty server being unable to determine which certificate to use based
on the SNI information passed (or not passed) from client test code
in tests that use SSL.
Additionally, fix #1898 by updating LICENSE/NOTICE files while updating
dependencies:
* Relocate ellipsis datatables plugin and jquery to subdirectories to
make it easier to reference in LICENSE and associate with distinct
upstream sources for future updates
* Remove unused select2.css
* Review all bundled external resources (js/css) for monitor and update
LICENSE and NOTICE files accordingly
* Review all bundled jars in lib directory of binary tarball and update
LICENSE and NOTICE files accordingly
* Standardize the structure of the LICENSE/NOTICE files to avoid
duplication of external license texts where possible (especially for
EPL-2.0, which is massive) and to use the Maven coordinates from
`component.xml` for easier maintenance
---
LICENSE | 60 +-
assemble/pom.xml | 75 +-
assemble/src/main/assemblies/component.xml | 37 +-
assemble/src/main/resources/LICENSE | 814 +++++++++++----------
assemble/src/main/resources/NOTICE | 41 +-
core/src/main/appended-resources/META-INF/LICENSE | 17 +-
pom.xml | 284 ++-----
server/monitor/pom.xml | 51 +-
.../src/main/appended-resources/META-INF/LICENSE | 51 +-
.../apache/accumulo/monitor/EmbeddedWebServer.java | 2 +-
.../java/org/apache/accumulo/monitor/Monitor.java | 2 +-
.../accumulo/monitor/rest/SummaryInformation.java | 2 +-
.../apache/accumulo/monitor/rest/XMLResource.java | 14 +-
.../rest/bulkImports/BulkImportResource.java | 10 +-
.../monitor/rest/gc/GarbageCollectorResource.java | 10 +-
.../monitor/rest/logs/DeadLoggerInformation.java | 2 +-
.../accumulo/monitor/rest/logs/LogResource.java | 14 +-
.../monitor/rest/manager/ManagerResource.java | 10 +-
.../rest/problems/ProblemDetailInformation.java | 2 +-
.../rest/problems/ProblemSummaryInformation.java | 2 +-
.../monitor/rest/problems/ProblemsResource.java | 20 +-
.../rest/replication/ReplicationResource.java | 10 +-
.../accumulo/monitor/rest/scans/ScansResource.java | 10 +-
.../rest/statistics/StatisticsResource.java | 10 +-
.../monitor/rest/status/StatusResource.java | 10 +-
.../monitor/rest/tables/TableInformation.java | 2 +-
.../monitor/rest/tables/TablesResource.java | 16 +-
.../monitor/rest/trace/TracesResource.java | 22 +-
.../rest/tservers/BadTabletServerInformation.java | 2 +-
.../monitor/rest/tservers/CurrentOperations.java | 2 +-
.../rest/tservers/DeadServerInformation.java | 2 +-
.../tservers/ServerShuttingDownInformation.java | 2 +-
.../rest/tservers/TabletServerInformation.java | 2 +-
.../rest/tservers/TabletServerResource.java | 22 +-
.../monitor/rest/zk/ZookeeperResource.java | 8 +-
.../monitor/util/JaxbAbstractIdSerializer.java | 2 +-
.../org/apache/accumulo/monitor/view/WebViews.java | 24 +-
.../external/{ => datatables/plugins}/ellipsis.js | 0
.../external/{ => jquery}/jquery-3.2.1.js | 0
.../monitor/resources/external/select2.css | 484 ------------
.../apache/accumulo/monitor/templates/default.ftl | 4 +-
.../org/apache/accumulo/monitor/it/WebViewsIT.java | 12 +-
.../accumulo/test/CountNameNodeOpsBulkIT.java | 2 +-
.../test/functional/ConfigurableMacBase.java | 9 +-
.../test/functional/FunctionalTestUtils.java | 12 +
.../accumulo/test/functional/MonitorSslIT.java | 2 +-
.../accumulo/test/functional/ReadWriteIT.java | 2 +-
47 files changed, 814 insertions(+), 1379 deletions(-)
diff --git a/LICENSE b/LICENSE
index 3bf58ee..1ba4f1c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -203,19 +203,16 @@
**********
-APACHE ACCUMULO SUBCOMPONENTS:
+# APACHE ACCUMULO SUBCOMPONENTS
-The Apache Accumulo project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following licenses.
+The Apache Accumulo project contains subcomponents with separate
+copyright notices and license terms. Your use of these is subject
+to the terms and conditions of the following licenses.
-**********
-
-This product includes software from the European Commission project OneLab:
+## Software from the European Commission project OneLab
-* BloomFilter.java
-* DynamicBloomFilter.java
-* Filter.java
+Files:
+* core/src/main/java/org/apache/accumulo/core/bloomfilter/*
Copyright (c) 2005, European Commission project OneLab under contract 034819
(http://www.one-lab.org)
@@ -247,20 +244,24 @@ This product includes software from the European Commission project OneLab:
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-**********
+## JQuery 3.2.1 (https://jquery.com/)
-This product includes JQuery:
+Files:
+* server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/jquery/*
- Copyright 2011, John Resig
- Dual licensed under the MIT or GPL Version 2 licenses.
- http://jquery.org/license
+ jQuery JavaScript Library v3.2.1
+ https://jquery.com/
Includes Sizzle.js
- http://sizzlejs.com/
- Copyright 2011, The Dojo Foundation
- Released under the MIT, BSD, and GPL Licenses.
+ https://sizzlejs.com/
- Distributed under the MIT License:
+ Copyright JS Foundation and other contributors
+ Released under the MIT license
+ https://jquery.org/license
+
+ Date: 2017-03-20T18:59Z
+
+ Text of the MIT License:
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -283,9 +284,10 @@ This product includes JQuery:
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
-**********
+## Flot 4.2.1 (https://github.com/flot/flot)
-This product includes Flot (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
@@ -306,6 +308,20 @@ This product includes Flot (https://github.com/flot/flot):
* Dual licensed under the MIT and GPL licenses.
* http://benalman.com/about/license/
- distributed under the MIT license (see above)
+## Bootstrap v3.3.7 (http://getbootstrap.com)
+
+Files:
+* server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/**/*
+
+ Copyright 2011-2016 Twitter, Inc.
+ Licensed under the MIT license (see above)
+
+## DataTables 1.10.16 (https://datatables.net)
+
+Files:
+* server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/datatables/**/*
+
+ Copyright (c) 2010-2015 SpryMedia Limited
+ Licensed under the MIT license (see above)
**********
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 648036b..45fdfc7 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -59,16 +59,19 @@
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
+ <classifier>jakarta</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
+ <classifier>jakarta</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
+ <classifier>jakarta</classifier>
<optional>true</optional>
</dependency>
<dependency>
@@ -102,8 +105,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
+ <groupId>com.sun.istack</groupId>
+ <artifactId>istack-commons-runtime</artifactId>
<optional>true</optional>
</dependency>
<dependency>
@@ -127,38 +130,43 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
@@ -304,11 +312,6 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
<optional>true</optional>
</dependency>
@@ -343,33 +346,23 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>hk2-api</artifactId>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
- <artifactId>hk2-locator</artifactId>
+ <artifactId>hk2-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
- <artifactId>hk2-utils</artifactId>
+ <artifactId>hk2-locator</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
- <artifactId>osgi-resource-locator</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>aopalliance-repackaged</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>jakarta.inject</artifactId>
+ <artifactId>hk2-utils</artifactId>
<optional>true</optional>
</dependency>
<dependency>
@@ -448,16 +441,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.el</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<optional>true</optional>
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index 8943230..2c738ec 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -29,37 +29,34 @@
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
- <!-- if you update this list, you should also update the assembly
- pom.xml section which executes the maven-dependency-plugin to generate a
- version listing for packaged artifacts -->
<include>${groupId}:${artifactId}-*</include>
<include>com.beust:jcommander</include>
+ <include>com.fasterxml:classmate</include>
<include>com.fasterxml.jackson.core:jackson-annotations</include>
<include>com.fasterxml.jackson.core:jackson-core</include>
<include>com.fasterxml.jackson.core:jackson-databind</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base</include>
- <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider</include>
- <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations</include>
- <include>com.fasterxml:classmate</include>
+ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:jakarta</include>
+ <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:jakarta</include>
+ <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:jakarta</include>
<include>com.github.ben-manes.caffeine:caffeine</include>
<include>com.google.code.gson:gson</include>
<include>com.google.guava:failureaccess</include>
<include>com.google.guava:guava</include>
<include>com.google.protobuf:protobuf-java</include>
<include>com.lmax:disruptor</include>
- <include>com.sun.xml.bind</include>
<include>commons-cli:commons-cli</include>
<include>commons-codec:commons-codec</include>
<include>commons-io:commons-io</include>
<include>commons-logging:commons-logging</include>
- <include>javax.activation:javax.activation-api</include>
- <include>javax.annotation:javax.annotation-api</include>
- <include>javax.el:javax.el-api</include>
- <include>javax.servlet:javax.servlet-api</include>
- <include>javax.validation:validation-api</include>
- <include>javax.ws.rs:javax.ws.rs-api</include>
- <include>javax.xml.bind:jaxb-api</include>
- <include>org.jline:jline</include>
+ <include>com.sun.istack:istack-commons-runtime</include>
+ <include>jakarta.activation:jakarta.activation-api</include>
+ <include>jakarta.annotation:jakarta.annotation-api</include>
+ <include>jakarta.el:jakarta.el-api</include>
+ <include>jakarta.inject:jakarta.inject-api</include>
+ <include>jakarta.servlet:jakarta.servlet-api</include>
+ <include>jakarta.validation:jakarta.validation-api</include>
+ <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
+ <include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>org.apache.commons:commons-collections4</include>
<include>org.apache.commons:commons-configuration2</include>
<include>org.apache.commons:commons-lang3</include>
@@ -76,7 +73,6 @@
<include>org.apache.logging.log4j:log4j-slf4j-impl</include>
<include>org.apache.logging.log4j:log4j-web</include>
<include>org.apache.thrift:libthrift</include>
- <include>org.eclipse.jetty:jetty-continuation</include>
<include>org.eclipse.jetty:jetty-http</include>
<include>org.eclipse.jetty:jetty-io</include>
<include>org.eclipse.jetty:jetty-security</include>
@@ -84,12 +80,10 @@
<include>org.eclipse.jetty:jetty-servlet</include>
<include>org.eclipse.jetty:jetty-util</include>
<include>org.freemarker:freemarker</include>
- <include>org.glassfish.hk2.external:aopalliance-repackaged</include>
- <include>org.glassfish.hk2.external:jakarta.inject</include>
<include>org.glassfish.hk2:hk2-api</include>
<include>org.glassfish.hk2:hk2-locator</include>
<include>org.glassfish.hk2:hk2-utils</include>
- <include>org.glassfish.hk2:osgi-resource-locator</include>
+ <include>org.glassfish:jakarta.el</include>
<include>org.glassfish.jaxb:jaxb-core</include>
<include>org.glassfish.jaxb:jaxb-runtime</include>
<include>org.glassfish.jersey.containers:jersey-container-jetty-http</include>
@@ -105,11 +99,10 @@
<include>org.glassfish.jersey.inject:jersey-hk2</include>
<include>org.glassfish.jersey.media:jersey-media-jaxb</include>
<include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
- <include>org.glassfish.web:el-impl</include>
- <include>org.glassfish.web:javax.el</include>
<include>org.hibernate.validator:hibernate-validator</include>
<include>org.javassist:javassist</include>
<include>org.jboss.logging:jboss-logging</include>
+ <include>org.jline:jline</include>
<include>org.slf4j:slf4j-api</include>
</includes>
</dependencySet>
diff --git a/assemble/src/main/resources/LICENSE b/assemble/src/main/resources/LICENSE
index ccf0806..2db396f 100644
--- a/assemble/src/main/resources/LICENSE
+++ b/assemble/src/main/resources/LICENSE
@@ -203,16 +203,15 @@
**********
-APACHE ACCUMULO SUBCOMPONENTS:
+# APACHE ACCUMULO SUBCOMPONENTS
-The Apache Accumulo project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following licenses.
+The Apache Accumulo project contains subcomponents with separate
+copyright notices and license terms. Your use of these is subject
+to the terms and conditions of the following licenses.
-**********
-
-This product includes software from the European Commission project OneLab:
+## Software from the European Commission project OneLab
+Files:
* BloomFilter.java
* DynamicBloomFilter.java
* Filter.java
@@ -247,20 +246,24 @@ This product includes software from the European Commission project OneLab:
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-**********
+## JQuery (https://jquery.com/)
-This product includes JQuery:
+Files:
+* jquery-*.js
- Copyright 2011, John Resig
- Dual licensed under the MIT or GPL Version 2 licenses.
- http://jquery.org/license
+ jQuery JavaScript Library v3.2.1
+ https://jquery.com/
Includes Sizzle.js
- http://sizzlejs.com/
- Copyright 2011, The Dojo Foundation
- Released under the MIT, BSD, and GPL Licenses.
+ https://sizzlejs.com/
- Distributed under the MIT License:
+ Copyright JS Foundation and other contributors
+ Released under the MIT license
+ https://jquery.org/license
+
+ Date: 2017-03-20T18:59Z
+
+ Text of the MIT License:
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -283,9 +286,7 @@ This product includes JQuery:
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
-**********
-
-This product includes Flot (https://github.com/flot/flot):
+## Flot (https://github.com/flot/flot)
Copyright (c) 2007-2014 IOLA and Ole Laursen
@@ -310,46 +311,35 @@ This product includes Flot (https://github.com/flot/flot):
**********
-This product includes jline:
-
- Copyright (c) 2002-2018, the original author or authors.
- All rights reserved.
-
- https://opensource.org/licenses/BSD-3-Clause
+# BUNDLED DEPENDENCIES
- Redistribution and use in source and binary forms, with or
- without modification, are permitted provided that the following
- conditions are met:
+This distribution of Apache Accumulo bundles several dependencies with separate
+copyright notices and license terms. Your use of these is subject
+to the terms and conditions of the following licenses.
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+## org.apache.commons:commons-math3
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with
- the distribution.
+ Apache Commons Math includes the following code provided to the ASF under the
+ Apache License 2.0:
- Neither the name of JLine nor the names of its contributors
- may be used to endorse or promote products derived from this
- software without specific prior written permission.
+ - The inverse error function implementation in the Erf class is based on CUDA
+ code developed by Mike Giles, Oxford-Man Institute of Quantitative Finance,
+ and published in GPU Computing Gems, volume 2, 2010 (grant received on
+ March 23th 2013)
+ - The LinearConstraint, LinearObjectiveFunction, LinearOptimizer,
+ RelationShip, SimplexSolver and SimplexTableau classes in package
+ org.apache.commons.math3.optimization.linear include software developed by
+ Benjamin McCann (http://www.benmccann.com) and distributed with
+ the following copyright: Copyright 2009 Google Inc. (grant received on
+ March 16th 2009)
+ - The class "org.apache.commons.math3.exception.util.LocalizedFormatsTest" which
+ is an adapted version of "OrekitMessagesTest" test class for the Orekit library
+ - The "org.apache.commons.math3.analysis.interpolation.HermiteInterpolator"
+ has been imported from the Orekit space flight dynamics library.
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
+ ===============================================================================
-**********
-This product includes Apache Commons Math3:
APACHE COMMONS MATH DERIVATIVE WORKS:
@@ -543,6 +533,7 @@ This product includes Apache Commons Math3:
original Fortran sources.
===============================================================================
+
The BracketFinder (package org.apache.commons.math3.optimization.univariate)
and PowellOptimizer (package org.apache.commons.math3.optimization.general)
classes are based on the Python code in module "optimize.py" (version 0.5)
@@ -582,11 +573,12 @@ This product includes Apache Commons Math3:
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===============================================================================
-**********
+## org.jline:jline
-This product includes Protocol Buffers:
+ Copyright (c) 2002-2018, the original author or authors.
+ All rights reserved.
- Copyright 2014, Google Inc. All rights reserved.
+ https://opensource.org/licenses/BSD-3-Clause
Redistribution and use in source and binary forms, with or
without modification, are permitted provided that the following
@@ -595,12 +587,44 @@ This product includes Protocol Buffers:
Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above
+ Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with
+ the distribution.
+
+ Neither the name of JLine nor the names of its contributors
+ may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## com.google.protobuf:protobuf-java
+
+ Copyright 2008 Google Inc. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
-
- Neither the name of Google Inc. nor the names of its
+ * Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
@@ -617,15 +641,13 @@ This product includes Protocol Buffers:
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Code generated by the Protocol Buffer compiler is owned by the owner
- of the input file used when generating it. This code is not
- standalone and requires a support library to be linked with it. This
+ of the input file used when generating it. This code is not
+ standalone and requires a support library to be linked with it. This
support library is itself covered by the above license.
-**********
-
-This product includes slf4j:
+## org.slf4j:slf4j-api
- Copyright (c) 2004-2013 QOS.ch
+ Copyright (c) 2004-2017 QOS.ch
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining
@@ -647,336 +669,352 @@ This product includes slf4j:
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-**********
-
-This product includes javax.servlet-api (http://servlet-spec.java.net):
-
- COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
- 1. Definitions.
-
- 1.1. Contributor. means each individual or entity that creates or
- contributes to the creation of Modifications.
-
- 1.2. Contributor Version. means the combination of the Original Software,
- prior Modifications used by a Contributor (if any), and the Modifications
- made by that particular Contributor.
+## Various dependencies under Eclipse Distribution License - v 1.0
- 1.3. Covered Software. means (a) the Original Software, or (b)
- Modifications, or (c) the combination of files containing Original Software
- with files containing Modifications, in each case including portions thereof.
+* com.sun.istack:istack-commons-runtime
+ Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+* jakarta.activation:jakarta.activation-api
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+* jakarta.xml.bind:jakarta.xml.bind-api
+ Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+* org.glassfish.jaxb:jaxb-core
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+* org.glassfish.jaxb:jaxb-runtime
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
- 1.4. Executable. means the Covered Software in any form other than Source
- Code.
-
- 1.5. Initial Developer. means the individual or entity that first makes
- Original Software available under this License.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
- 1.6. Larger Work. means a work which combines Covered Software or portions
- thereof with code not governed by the terms of this License.
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
- 1.7. License. means this document.
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
- 1.8. Licensable. means having the right to grant, to the maximum extent
- possible, whether at the time of the initial grant or subsequently
- acquired, any and all of the rights conveyed herein.
+ - Neither the name of the Eclipse Foundation, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
- 1.9. Modifications. means the Source Code and Executable form of any of the
- following:
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- A. Any file that results from an addition to, deletion from or
- modification of the contents of a file containing Original Software or
- previous Modifications;
-
- B. Any new file that contains any part of the Original Software or
- previous Modification; or
-
- C. Any new file that is contributed or otherwise made available under
- the terms of this License.
-
- 1.10. Original Software. means the Source Code and Executable form of
- computer software code that is originally released under this License.
-
- 1.11. Patent Claims. means any patent claim(s), now owned or hereafter
- acquired, including without limitation, method, process, and apparatus
- claims, in any patent Licensable by grantor.
-
- 1.12. Source Code. means (a) the common form of computer software code in
- which modifications are made and (b) associated documentation included in
- or with such code.
-
- 1.13. You. (or .Your.) means an individual or a legal entity exercising
- rights under, and complying with all of the terms of, this License. For
- legal entities, .You. includes any entity which controls, is controlled by,
- or is under common control with You. For purposes of this definition,
- .control. means (a) the power, direct or indirect, to cause the direction
- or management of such entity, whether by contract or otherwise, or (b)
- ownership of more than fifty percent (50%) of the outstanding shares or
- beneficial ownership of such entity.
-
- 2. License Grants.
-
- 2.1. The Initial Developer Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and subject to
- third party intellectual property claims, the Initial Developer hereby
- grants You a world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or
- trademark) Licensable by Initial Developer, to use, reproduce,
- modify, display, perform, sublicense and distribute the Original
- Software (or portions thereof), with or without Modifications, and/or
- as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using or selling of
- Original Software, to make, have made, use, practice, sell, and offer
- for sale, and/or otherwise dispose of the Original Software (or
- portions thereof).
-
- (c) The licenses granted in Sections 2.1(a) and (b) are effective on
- the date Initial Developer first distributes or otherwise makes the
- Original Software available to a third party under the terms of this
- License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent license is
- granted: (1) for code that You delete from the Original Software, or
- (2) for infringements caused by: (i) the modification of the Original
- Software, or (ii) the combination of the Original Software with other
- software or devices.
-
- 2.2. Contributor Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and subject to
- third party intellectual property claims, each Contributor hereby grants
- You a world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or
- trademark) Licensable by Contributor to use, reproduce, modify,
- display, perform, sublicense and distribute the Modifications created
- by such Contributor (or portions thereof), either on an unmodified
- basis, with other Modifications, as Covered Software and/or as part of
- a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using, or selling of
- Modifications made by that Contributor either alone and/or in
- combination with its Contributor Version (or portions of such
- combination), to make, use, sell, offer for sale, have made,
- and/or otherwise dispose of: (1) Modifications made by that
- Contributor (or portions thereof); and (2) the combination of
- Modifications made by that Contributor with its Contributor Version
- (or portions of such combination).
-
- (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
- on the date Contributor first distributes or otherwise makes the
- Modifications available to a third party.
-
- (d) Notwithstanding Section 2.2(b) above, no patent license is
- granted: (1) for any code that Contributor has deleted from the
- Contributor Version; (2) for infringements caused by: (i) third party
- modifications of Contributor Version, or (ii) the combination of
- Modifications made by that Contributor with other software (except as
- part of the Contributor Version) or other devices; or (3) under
- Patent Claims infringed by Covered Software in the absence of
- Modifications made by that Contributor.
-
- 3. Distribution Obligations.
-
- 3.1. Availability of Source Code. Any Covered Software that You
- distribute or otherwise make available in Executable form must also be
- made available in Source Code form and that Source Code form must be
- distributed only under the terms of this License. You must include a
- copy of this License with every copy of the Source Code form of the
- Covered Software You distribute or otherwise make available. You must
- inform recipients of any such Covered Software in Executable form as to
- how they can obtain such Covered Software in Source Code form in a
- reasonable manner on or through a medium customarily used for software
- exchange.
-
- 3.2. Modifications. The Modifications that You create or to which You
- contribute are governed by the terms of this License. You represent that
- You believe Your Modifications are Your original creation(s) and/or You
- have sufficient rights to grant the rights conveyed by this License.
-
- 3.3. Required Notices. You must include a notice in each of Your
- Modifications that identifies You as the Contributor of the
- Modification. You may not remove or alter any copyright, patent or
- trademark notices contained within the Covered Software, or any notices
- of licensing or any descriptive text giving attribution to any
- Contributor or the Initial Developer.
-
- 3.4. Application of Additional Terms. You may not offer or impose any
- terms on any Covered Software in Source Code form that alters or
- restricts the applicable version of this License or the recipients.
- rights hereunder. You may choose to offer, and to charge a fee for,
- warranty, support, indemnity or liability obligations to one or more
- recipients of Covered Software. However, you may do so only on Your own
- behalf, and not on behalf of the Initial Developer or any Contributor.
- You must make it absolutely clear that any such warranty, support,
- indemnity or liability obligation is offered by You alone, and You
- hereby agree to indemnify the Initial Developer and every Contributor
- for any liability incurred by the Initial Developer or such Contributor
- as a result of warranty, support, indemnity or liability terms You
- offer.
-
- 3.5. Distribution of Executable Versions. You may distribute the
- Executable form of the Covered Software under the terms of this License
- or under the terms of a license of Your choice, which may contain terms
- different from this License, provided that You are in compliance with
- the terms of this License and that the license for the Executable form
- does not attempt to limit or alter the recipient.s rights in the Source
- Code form from the rights set forth in this License. If You distribute
- the Covered Software in Executable form under a different license, You
- must make it absolutely clear that any terms which differ from this
- License are offered by You alone, not by the Initial Developer or
- Contributor. You hereby agree to indemnify the Initial Developer and
- every Contributor for any liability incurred by the Initial Developer or
- such Contributor as a result of any such terms You offer.
-
- 3.6. Larger Works. You may create a Larger Work by combining Covered
- Software with other code not governed by the terms of this License and
- distribute the Larger Work as a single product. In such a case, You must
- make sure the requirements of this License are fulfilled for the Covered
- Software.
-
- 4. Versions of the License.
-
- 4.1. New Versions. Sun Microsystems, Inc. is the initial license
- steward and may publish revised and/or new versions of this License from
- time to time. Each version will be given a distinguishing version
- number. Except as provided in Section 4.3, no one other than the license
- steward has the right to modify this License.
-
- 4.2. Effect of New Versions. You may always continue to use, distribute
- or otherwise make the Covered Software available under the terms of the
- version of the License under which You originally received the Covered
- Software. If the Initial Developer includes a notice in the Original
- Software prohibiting it from being distributed or otherwise made
- available under any subsequent version of the License, You must
- distribute and make the Covered Software available under the terms of
- the version of the License under which You originally received the
- Covered Software. Otherwise, You may also choose to use, distribute or
- otherwise make the Covered Software available under the terms of any
- subsequent version of the License published by the license steward.
-
- 4.3. Modified Versions. When You are an Initial Developer and You want
- to create a new license for Your Original Software, You may create and
- use a modified version of this License if You: (a) rename the license
- and remove any references to the name of the license steward (except to
- note that the license differs from this License); and (b) otherwise
- make it clear that the license contains terms which differ from this
- License.
-
- 5. DISCLAIMER OF WARRANTY.
-
- COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS,
- WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
- DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
- ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS
- WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU
- (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
- NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
- CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
- SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
- 6. TERMINATION.
-
- 6.1. This License and the rights granted hereunder will terminate
- automatically if You fail to comply with terms herein and fail to cure
- such breach within 30 days of becoming aware of the breach. Provisions
- which, by their nature, must remain in effect beyond the termination of
- this License shall survive.
-
- 6.2. If You assert a patent infringement claim (excluding declaratory
- judgment actions) against Initial Developer or a Contributor (the
- Initial Developer or Contributor against whom You assert such
- claim is referred to as .Participant.) alleging that the
- Participant Software (meaning the Contributor Version where the
- Participant is a Contributor or the Original Software where the
- Participant is the Initial Developer) directly or indirectly
- infringes any patent, then any and all rights granted directly or
- indirectly to You by such Participant, the Initial Developer (if the
- Initial Developer is not the Participant) and all Contributors
- under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
- notice from Participant terminate prospectively and automatically at
- the expiration of such 60 day notice period, unless if within such
- 60 day period You withdraw Your claim with respect to the
- Participant Software against such Participant either unilaterally or
- pursuant to a written agreement with Participant.
-
- 6.3. In the event of termination under Sections 6.1 or 6.2 above, all
- end user licenses that have been validly granted by You or any
- distributor hereunder prior to termination (excluding licenses granted
- to You by any distributor) shall survive termination.
-
- 7. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
- NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
- ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
- SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT,
- SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING,
- WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
- STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
- DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
- POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
- TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S
- NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
- JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
- CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
- YOU.
-
- 8. U.S. GOVERNMENT END USERS.
-
- The Covered Software is a .commercial item,. as that term is defined in 48
- C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as
- that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial
- computer software documentation. as such terms are used in 48 C.F.R. 12.212
- (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
- through 227.7202-4 (June 1995), all U.S. Government End Users acquire
- Covered Software with only those rights set forth herein. This U.S.
- Government Rights clause is in lieu of, and supersedes, any other FAR,
- DFAR, or other clause or provision that addresses Government rights in
- computer software under this License.
-
- 9. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject matter
- hereof. If any provision of this License is held to be unenforceable, such
- provision shall be reformed only to the extent necessary to make it
- enforceable. This License shall be governed by the law of the jurisdiction
- specified in a notice contained within the Original Software (except to the
- extent applicable law, if any, provides otherwise), excluding such
- jurisdiction.s conflict-of-law provisions. Any litigation relating to this
- License shall be subject to the jurisdiction of the courts located in the
- jurisdiction and venue specified in a notice contained within the Original
- Software, with the losing party responsible for costs, including, without
- limitation, court costs and reasonable attorneys. fees and expenses. The
- application of the United Nations Convention on Contracts for the
- International Sale of Goods is expressly excluded. Any law or regulation
- which provides that the language of a contract shall be construed against
- the drafter shall not apply to this License. You agree that You alone are
- responsible for compliance with the United States export administration
- regulations (and the export control laws and regulation of any other countries)
- when You use, distribute or otherwise make available any Covered Software.
-
- 10. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is
- responsible for claims and damages arising, directly or indirectly, out of
- its utilization of rights under this License and You agree to work with
- Initial Developer and Contributors to distribute such responsibility on an
- equitable basis. Nothing herein is intended or shall be deemed to
- constitute any admission of liability.
-
- NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
- LICENSE (CDDL)
-
- The code released under the CDDL shall be governed by the laws of the State
- of California (excluding conflict-of-law provisions). Any litigation
- relating to this License shall be subject to the jurisdiction of the
- Federal Courts of the Northern District of California and the state courts
- of the State of California, with venue lying in Santa Clara County,
- California.
+## Various dependencies under Eclipse Public License - v 2.0
+
+* jakarta.annotation:jakarta.annotation-api
+* jakarta.el:jakarta.el-api
+* jakarta.servlet:jakarta.servlet-api
+* jakarta.ws.rs:jakarta.ws.rs-api
+* org.eclipse.jetty:jetty-http
+* org.eclipse.jetty:jetty-io
+* org.eclipse.jetty:jetty-security
+* org.eclipse.jetty:jetty-server
+* org.eclipse.jetty:jetty-servlet
+* org.eclipse.jetty:jetty-util
+* org.glassfish.hk2:hk2-api
+* org.glassfish.hk2:hk2-locator
+* org.glassfish.hk2:hk2-utils
+* org.glassfish.jersey.containers:jersey-container-jetty-http
+* org.glassfish.jersey.containers:jersey-container-servlet
+* org.glassfish.jersey.containers:jersey-container-servlet-core
+* org.glassfish.jersey.core:jersey-client
+* org.glassfish.jersey.core:jersey-common
+* org.glassfish.jersey.core:jersey-server
+* org.glassfish.jersey.ext:jersey-bean-validation
+* org.glassfish.jersey.ext:jersey-entity-filtering
+* org.glassfish.jersey.ext:jersey-mvc
+* org.glassfish.jersey.ext:jersey-mvc-freemarker
+* org.glassfish.jersey.inject:jersey-hk2
+* org.glassfish.jersey.media:jersey-media-jaxb
+* org.glassfish.jersey.media:jersey-media-json-jackson
+* org.glassfish:jakarta.el
+
+ Eclipse Public License - v 2.0
+
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+ OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+ 1. DEFINITIONS
+
+ "Contribution" means:
+
+ a) in the case of the initial Contributor, the initial content
+ Distributed under this Agreement, and
+
+ b) in the case of each subsequent Contributor:
+ i) changes to the Program, and
+ ii) additions to the Program;
+ where such changes and/or additions to the Program originate from
+ and are Distributed by that particular Contributor. A Contribution
+ "originates" from a Contributor if it was added to the Program by
+ such Contributor itself or anyone acting on such Contributor's behalf.
+ Contributions do not include changes or additions to the Program that
+ are not Modified Works.
+
+ "Contributor" means any person or entity that Distributes the Program.
+
+ "Licensed Patents" mean patent claims licensable by a Contributor which
+ are necessarily infringed by the use or sale of its Contribution alone
+ or when combined with the Program.
+
+ "Program" means the Contributions Distributed in accordance with this
+ Agreement.
+
+ "Recipient" means anyone who receives the Program under this Agreement
+ or any Secondary License (as applicable), including Contributors.
+
+ "Derivative Works" shall mean any work, whether in Source Code or other
+ form, that is based on (or derived from) the Program and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship.
+
+ "Modified Works" shall mean any work in Source Code or other form that
+ results from an addition to, deletion from, or modification of the
+ contents of the Program, including, for purposes of clarity any new file
+ in Source Code form that contains any contents of the Program. Modified
+ Works shall not include works that contain only declarations,
+ interfaces, types, classes, structures, or files of the Program solely
+ in each case in order to link to, bind by name, or subclass the Program
+ or Modified Works thereof.
+
+ "Distribute" means the acts of a) distributing or b) making available
+ in any manner that enables the transfer of a copy.
+
+ "Source Code" means the form of a Program preferred for making
+ modifications, including but not limited to software source code,
+ documentation source, and configuration files.
+
+ "Secondary License" means either the GNU General Public License,
+ Version 2.0, or any later versions of that license, including any
+ exceptions or additional permissions as identified by the initial
+ Contributor.
+
+ 2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free copyright
+ license to reproduce, prepare Derivative Works of, publicly display,
+ publicly perform, Distribute and sublicense the Contribution of such
+ Contributor, if any, and such Derivative Works.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free patent
+ license under Licensed Patents to make, use, sell, offer to sell,
+ import and otherwise transfer the Contribution of such Contributor,
+ if any, in Source Code or other form. This patent license shall
+ apply to the combination of the Contribution and the Program if, at
+ the time the Contribution is added by the Contributor, such addition
+ of the Contribution causes such combination to be covered by the
+ Licensed Patents. The patent license shall not apply to any other
+ combinations which include the Contribution. No hardware per se is
+ licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the
+ licenses to its Contributions set forth herein, no assurances are
+ provided by any Contributor that the Program does not infringe the
+ patent or other intellectual property rights of any other entity.
+ Each Contributor disclaims any liability to Recipient for claims
+ brought by any other entity based on infringement of intellectual
+ property rights or otherwise. As a condition to exercising the
+ rights and licenses granted hereunder, each Recipient hereby
+ assumes sole responsibility to secure any other intellectual
+ property rights needed, if any. For example, if a third party
+ patent license is required to allow Recipient to Distribute the
+ Program, it is Recipient's responsibility to acquire that license
+ before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has
+ sufficient copyright rights in its Contribution, if any, to grant
+ the copyright license set forth in this Agreement.
+
+ e) Notwithstanding the terms of any Secondary License, no
+ Contributor makes additional grants to any Recipient (other than
+ those set forth in this Agreement) as a result of such Recipient's
+ receipt of the Program under the terms of a Secondary License
+ (if permitted under the terms of Section 3).
+
+ 3. REQUIREMENTS
+
+ 3.1 If a Contributor Distributes the Program in any form, then:
+
+ a) the Program must also be made available as Source Code, in
+ accordance with section 3.2, and the Contributor must accompany
+ the Program with a statement that the Source Code for the Program
+ is available under this Agreement, and informs Recipients how to
+ obtain it in a reasonable manner on or through a medium customarily
+ used for software exchange; and
+
+ b) the Contributor may Distribute the Program under a license
+ different than this Agreement, provided that such license:
+ i) effectively disclaims on behalf of all other Contributors all
+ warranties and conditions, express and implied, including
+ warranties or conditions of title and non-infringement, and
+ implied warranties or conditions of merchantability and fitness
+ for a particular purpose;
+
+ ii) effectively excludes on behalf of all other Contributors all
+ liability for damages, including direct, indirect, special,
+ incidental and consequential damages, such as lost profits;
+
+ iii) does not attempt to limit or alter the recipients' rights
+ in the Source Code under section 3.2; and
+
+ iv) requires any subsequent distribution of the Program by any
+ party to be under a license that satisfies the requirements
+ of this section 3.
+
+ 3.2 When the Program is Distributed as Source Code:
+
+ a) it must be made available under this Agreement, or if the
+ Program (i) is combined with other material in a separate file or
+ files made available under a Secondary License, and (ii) the initial
+ Contributor attached to the Source Code the notice described in
+ Exhibit A of this Agreement, then the Program may be made available
+ under the terms of such Secondary Licenses, and
+
+ b) a copy of this Agreement must be included with each copy of
+ the Program.
+
+ 3.3 Contributors may not remove or alter any copyright, patent,
+ trademark, attribution notices, disclaimers of warranty, or limitations
+ of liability ("notices") contained within the Program from any copy of
+ the Program which they Distribute, provided that Contributors may add
+ their own appropriate notices.
+
+ 4. COMMERCIAL DISTRIBUTION
+
+ Commercial distributors of software may accept certain responsibilities
+ with respect to end users, business partners and the like. While this
+ license is intended to facilitate the commercial use of the Program,
+ the Contributor who includes the Program in a commercial product
+ offering should do so in a manner which does not create potential
+ liability for other Contributors. Therefore, if a Contributor includes
+ the Program in a commercial product offering, such Contributor
+ ("Commercial Contributor") hereby agrees to defend and indemnify every
+ other Contributor ("Indemnified Contributor") against any losses,
+ damages and costs (collectively "Losses") arising from claims, lawsuits
+ and other legal actions brought by a third party against the Indemnified
+ Contributor to the extent caused by the acts or omissions of such
+ Commercial Contributor in connection with its distribution of the Program
+ in a commercial product offering. The obligations in this section do not
+ apply to any claims or Losses relating to any actual or alleged
+ intellectual property infringement. In order to qualify, an Indemnified
+ Contributor must: a) promptly notify the Commercial Contributor in
+ writing of such claim, and b) allow the Commercial Contributor to control,
+ and cooperate with the Commercial Contributor in, the defense and any
+ related settlement negotiations. The Indemnified Contributor may
+ participate in any such claim at its own expense.
+
+ For example, a Contributor might include the Program in a commercial
+ product offering, Product X. That Contributor is then a Commercial
+ Contributor. If that Commercial Contributor then makes performance
+ claims, or offers warranties related to Product X, those performance
+ claims and warranties are such Commercial Contributor's responsibility
+ alone. Under this section, the Commercial Contributor would have to
+ defend claims against the other Contributors related to those performance
+ claims and warranties, and if a court requires any other Contributor to
+ pay any damages as a result, the Commercial Contributor must pay
+ those damages.
+
+ 5. NO WARRANTY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+ PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+ BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+ IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+ TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+ PURPOSE. Each Recipient is solely responsible for determining the
+ appropriateness of using and distributing the Program and assumes all
+ risks associated with its exercise of rights under this Agreement,
+ including but not limited to the risks and costs of program errors,
+ compliance with applicable laws, damage to or loss of data, programs
+ or equipment, and unavailability or interruption of operations.
+
+ 6. DISCLAIMER OF LIABILITY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+ PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+ SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+ PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+ EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGES.
+
+ 7. GENERAL
+
+ If any provision of this Agreement is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of
+ the remainder of the terms of this Agreement, and without further
+ action by the parties hereto, such provision shall be reformed to the
+ minimum extent necessary to make such provision valid and enforceable.
+
+ If Recipient institutes patent litigation against any entity
+ (including a cross-claim or counterclaim in a lawsuit) alleging that the
+ Program itself (excluding combinations of the Program with other software
+ or hardware) infringes such Recipient's patent(s), then such Recipient's
+ rights granted under Section 2(b) shall terminate as of the date such
+ litigation is filed.
+
+ All Recipient's rights under this Agreement shall terminate if it
+ fails to comply with any of the material terms or conditions of this
+ Agreement and does not cure such failure in a reasonable period of
+ time after becoming aware of such noncompliance. If all Recipient's
+ rights under this Agreement terminate, Recipient agrees to cease use
+ and distribution of the Program as soon as reasonably practicable.
+ However, Recipient's obligations under this Agreement and any licenses
+ granted by Recipient relating to the Program shall continue and survive.
+
+ Everyone is permitted to copy and distribute copies of this Agreement,
+ but in order to avoid inconsistency the Agreement is copyrighted and
+ may only be modified in the following manner. The Agreement Steward
+ reserves the right to publish new versions (including revisions) of
+ this Agreement from time to time. No one other than the Agreement
+ Steward has the right to modify this Agreement. The Eclipse Foundation
+ is the initial Agreement Steward. The Eclipse Foundation may assign the
+ responsibility to serve as the Agreement Steward to a suitable separate
+ entity. Each new version of the Agreement will be given a distinguishing
+ version number. The Program (including Contributions) may always be
+ Distributed subject to the version of the Agreement under which it was
+ received. In addition, after a new version of the Agreement is published,
+ Contributor may elect to Distribute the Program (including its
+ Contributions) under the new version.
+
+ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+ receives no rights or licenses to the intellectual property of any
+ Contributor under this Agreement, whether expressly, by implication,
+ estoppel or otherwise. All rights in the Program not expressly granted
+ under this Agreement are reserved. Nothing in this Agreement is intended
+ to be enforceable by any entity that is not a Contributor or Recipient.
+ No third-party beneficiary rights are created under this Agreement.
+
+ Exhibit A - Form of Secondary Licenses Notice
+
+ "This Source Code may also be made available under the following
+ Secondary Licenses when the conditions for such availability set forth
+ in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+ version(s), and exceptions or additional permissions here}."
+
+ Simply including a copy of this Agreement, including this Exhibit A
+ is not sufficient to license the Source Code under Secondary Licenses.
+
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to
+ look for such a notice.
+
+ You may add additional accurate notices of copyright ownership.
**********
diff --git a/assemble/src/main/resources/NOTICE b/assemble/src/main/resources/NOTICE
index 6205ab7..c24b680 100644
--- a/assemble/src/main/resources/NOTICE
+++ b/assemble/src/main/resources/NOTICE
@@ -6,25 +6,42 @@ The Apache Software Foundation (http://www.apache.org/).
**********
-This product includes JCommander (https://github.com/cbeust/jcommander),
-Copyright 2010 Cedric Beust cedric@beust.com.
+# BUNDLED DEPENDENCIES
-**********
+This product additionally includes the following
+dependencies, with accompanying notices.
+
+## com.fasterxml:classmate
+
+ Java ClassMate library was originally written by Tatu Saloranta (tatu.saloranta@iki.fi)
+
+ Other developers who have contributed code are:
+
+ * Brian Langel
+
+## commons-codec:commons-codec
-From Apache Commons Math3:
+ src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+ contains test data from http://aspell.net/test/orig/batch0.tab.
+ Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
+
+ ===============================================================================
+
+ The content of package org.apache.commons.codec.language.bm has been translated
+ from the original php source code available at http://stevemorse.org/phoneticinfo.htm
+ with permission from the original authors.
+ Original source copyright:
+ Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
+
+## org.apache.commons:commons-math3
This product includes software developed for Orekit by
CS Systèmes d'Information (http://www.c-s.fr/)
Copyright 2010-2012 CS Systèmes d'Information
-**********
+## org.apache.logging.log4j:log4j-core
-This product includes Jetty (http://eclipse.org/jetty)
-Copyright 1996-2009 Mort Bay Consulting Pty. Ltd.
+ ResolverUtil.java
+ Copyright 2005-2006 Tim Fennell
**********
-
-From log4j-core:
-
- ResolverUtil.java
- Copyright 2005-2006 Tim Fennell
diff --git a/core/src/main/appended-resources/META-INF/LICENSE b/core/src/main/appended-resources/META-INF/LICENSE
index f3478ea..53d4bad 100644
--- a/core/src/main/appended-resources/META-INF/LICENSE
+++ b/core/src/main/appended-resources/META-INF/LICENSE
@@ -1,18 +1,15 @@
**********
-APACHE ACCUMULO SUBCOMPONENTS:
+# APACHE ACCUMULO SUBCOMPONENTS
-The Apache Accumulo project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following licenses.
+The Apache Accumulo project contains subcomponents with separate
+copyright notices and license terms. Your use of these is subject
+to the terms and conditions of the following licenses.
-**********
-
-This product includes software from the European Commission project OneLab:
+## Software from the European Commission project OneLab
-* BloomFilter.java
-* DynamicBloomFilter.java
-* Filter.java
+Files:
+* core/src/main/java/org/apache/accumulo/core/bloomfilter/*
Copyright (c) 2005, European Commission project OneLab under contract 034819
(http://www.one-lab.org)
diff --git a/pom.xml b/pom.xml
index 0eb0c5c..fb790a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,14 +127,10 @@
<failsafe.forkCount>1</failsafe.forkCount>
<failsafe.groups />
<hadoop.version>3.3.0</hadoop.version>
- <hk2.version>2.6.1</hk2.version>
<htrace.hadoop.version>4.1.0-incubating</htrace.hadoop.version>
<htrace.version>3.2.0-incubating</htrace.version>
<it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
- <javax.el.version>3.0.1-b06</javax.el.version>
- <jaxb.version>2.3.0.1</jaxb.version>
- <jersey.version>2.30.1</jersey.version>
- <jetty.version>9.4.35.v20201120</jetty.version>
+ <jackson.version>2.12.1</jackson.version>
<!-- prevent introduction of new compiler warnings -->
<maven.compiler.failOnWarning>true</maven.compiler.failOnWarning>
<maven.compiler.release>11</maven.compiler.release>
@@ -174,6 +170,24 @@
<version>1.5.1</version>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-base</artifactId>
+ <version>${jackson.version}</version>
+ <classifier>jakarta</classifier>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${jackson.version}</version>
+ <classifier>jakarta</classifier>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <version>${jackson.version}</version>
+ <classifier>jakarta</classifier>
+ </dependency>
+ <dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>2.8.1</version>
@@ -220,11 +234,6 @@
<version>3.4.2</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>2.3.0.1</version>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.4</version>
@@ -245,51 +254,6 @@
<version>1.2</version>
</dependency>
<dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>1.3.5</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <version>${javax.el.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>4.0.1</version>
- </dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>2.0.1.Final</version>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.1</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
@@ -542,174 +506,19 @@
<version>4.2</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.30</version>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>hk2-api</artifactId>
- <version>${hk2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>hk2-locator</artifactId>
- <version>${hk2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>hk2-utils</artifactId>
- <version>${hk2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>osgi-resource-locator</artifactId>
- <version>2.5.0-b42</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>aopalliance-repackaged</artifactId>
- <version>${hk2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>jakarta.inject</artifactId>
- <version>${hk2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-jetty-http</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet-core</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-client</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-common</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-server</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-bean-validation</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-entity-filtering</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-mvc</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-mvc-freemarker</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.inject</groupId>
- <artifactId>jersey-hk2</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-jaxb</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework</groupId>
- <artifactId>jersey-test-framework-core</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2.1-b05</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.el</artifactId>
- <version>2.2.6</version>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
+ <version>4.0.1</version>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>6.1.2.Final</version>
+ <version>7.0.1.Final</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
@@ -759,7 +568,14 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
- <version>2.12.1</version>
+ <version>${jackson.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.platform</groupId>
+ <artifactId>jakarta.jakartaee-bom</artifactId>
+ <version>9.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -770,6 +586,34 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-bom</artifactId>
+ <version>11.0.1</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-bom</artifactId>
+ <version>3.0.1</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-bom</artifactId>
+ <version>3.0.0</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey</groupId>
+ <artifactId>jersey-bom</artifactId>
+ <version>3.0.1</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
@@ -1048,7 +892,7 @@
<version>1.5.0</version>
<configuration>
<removeUnused>true</removeUnused>
- <groups>java.,javax.,org.,com.</groups>
+ <groups>java.,javax.,jakarta.,org.,com.</groups>
<excludes>
<exclude>**/thrift/*.java</exclude>
</excludes>
@@ -1083,9 +927,6 @@
<usedUndeclaredDependency>org.apache.hadoop:hadoop-mapreduce-client-core:jar:*</usedUndeclaredDependency>
<usedUndeclaredDependency>org.apache.hadoop:hadoop-auth:jar:*</usedUndeclaredDependency>
<usedUndeclaredDependency>org.apache.httpcomponents:httpcore:jar:*</usedUndeclaredDependency>
- <usedUndeclaredDependency>org.glassfish.jersey.ext:jersey-mvc:jar:*</usedUndeclaredDependency>
- <usedUndeclaredDependency>org.glassfish.jersey.core:jersey-server:jar:*</usedUndeclaredDependency>
- <usedUndeclaredDependency>org.glassfish.jersey.core:jersey-common:jar:*</usedUndeclaredDependency>
<usedUndeclaredDependency>org.powermock:powermock-core:jar:*</usedUndeclaredDependency>
<usedUndeclaredDependency>org.powermock:powermock-reflect:jar:*</usedUndeclaredDependency>
</ignoredUsedUndeclaredDependencies>
@@ -1093,18 +934,15 @@
<!-- auto-service isn't used in every module -->
<unusedDeclaredDependency>com.google.auto.service:auto-service:jar:*</unusedDeclaredDependency>
<!-- unused/declared implementation jars or parent jars that bring in children -->
- <unusedDeclaredDependency>com.sun.xml.bind</unusedDeclaredDependency>
<unusedDeclaredDependency>org.apache.hadoop:hadoop-client:jar:*</unusedDeclaredDependency>
<unusedDeclaredDependency>org.apache.hadoop:hadoop-client-runtime:jar:*</unusedDeclaredDependency>
<unusedDeclaredDependency>org.apache.hadoop:hadoop-minicluster:jar:*</unusedDeclaredDependency>
- <unusedDeclaredDependency>org.glassfish.jersey.containers:jersey-container-jetty-http:jar:*</unusedDeclaredDependency>
<unusedDeclaredDependency>org.glassfish.jersey.ext:jersey-bean-validation:jar:*</unusedDeclaredDependency>
<unusedDeclaredDependency>org.glassfish.jersey.inject:jersey-hk2:jar:*</unusedDeclaredDependency>
+ -
<unusedDeclaredDependency>org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:jar:*</unusedDeclaredDependency>
<unusedDeclaredDependency>org.powermock:powermock-api-easymock:jar:*</unusedDeclaredDependency>
<unusedDeclaredDependency>junit:junit:jar:*</unusedDeclaredDependency>
- <unusedDeclaredDependency>javax.servlet:javax.servlet-api:jar:*</unusedDeclaredDependency>
- <unusedDeclaredDependency>javax.el:javax.el-api:jar:*</unusedDeclaredDependency>
<!-- spotbugs annotations may or may not be used in each module -->
<unusedDeclaredDependency>com.github.spotbugs:spotbugs-annotations:jar:*</unusedDeclaredDependency>
<!-- ignore unused native; analysis isn't possible with tar.gz dependency -->
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 70122c8..499852a 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -45,20 +45,24 @@
<artifactId>gson</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
@@ -117,30 +121,26 @@
<artifactId>hk2-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>jakarta.inject</artifactId>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <artifactId>jersey-container-servlet-core</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-jetty-http</artifactId>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-common</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet-core</artifactId>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-server</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-bean-validation</artifactId>
+ <artifactId>jersey-mvc</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-mvc-freemarker</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.inject</groupId>
- <artifactId>jersey-hk2</artifactId>
- </dependency>
- <dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
</dependency>
@@ -149,13 +149,18 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
+ <groupId>org.glassfish.jersey.ext</groupId>
+ <artifactId>jersey-bean-validation</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.inject</groupId>
+ <artifactId>jersey-hk2</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/server/monitor/src/main/appended-resources/META-INF/LICENSE b/server/monitor/src/main/appended-resources/META-INF/LICENSE
index 6241d2f..bd7ca29 100644
--- a/server/monitor/src/main/appended-resources/META-INF/LICENSE
+++ b/server/monitor/src/main/appended-resources/META-INF/LICENSE
@@ -1,25 +1,29 @@
**********
-APACHE ACCUMULO SUBCOMPONENTS:
+# APACHE ACCUMULO SUBCOMPONENTS
-The Apache Accumulo project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following licenses.
+The Apache Accumulo project contains subcomponents with separate
+copyright notices and license terms. Your use of these is subject
+to the terms and conditions of the following licenses.
-**********
+## JQuery 3.2.1 (https://jquery.com/)
-This product includes JQuery:
+Files:
+* server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/jquery/*
- Copyright 2011, John Resig
- Dual licensed under the MIT or GPL Version 2 licenses.
- http://jquery.org/license
+ jQuery JavaScript Library v3.2.1
+ https://jquery.com/
Includes Sizzle.js
- http://sizzlejs.com/
- Copyright 2011, The Dojo Foundation
- Released under the MIT, BSD, and GPL Licenses.
+ https://sizzlejs.com/
+
+ Copyright JS Foundation and other contributors
+ Released under the MIT license
+ https://jquery.org/license
+
+ Date: 2017-03-20T18:59Z
- Distributed under the MIT License:
+ Text of the MIT License:
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -42,9 +46,10 @@ This product includes JQuery:
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
-**********
+## Flot 4.2.1 (https://github.com/flot/flot)
-This product includes Flot (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
@@ -65,6 +70,20 @@ This product includes Flot (https://github.com/flot/flot):
* Dual licensed under the MIT and GPL licenses.
* http://benalman.com/about/license/
- distributed under the MIT license (see above)
+## Bootstrap v3.3.7 (http://getbootstrap.com)
+
+Files:
+* server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/bootstrap/**/*
+
+ Copyright 2011-2016 Twitter, Inc.
+ Licensed under the MIT license (see above)
+
+## DataTables 1.10.16 (https://datatables.net)
+
+Files:
+* server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/datatables/**/*
+
+ Copyright (c) 2010-2015 SpryMedia Limited
+ Licensed under the MIT license (see above)
**********
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
index b706b50..88107f0 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
@@ -65,7 +65,7 @@ public class EmbeddedWebServer {
HttpConnectionFactory httpFactory = new HttpConnectionFactory();
if (secure) {
LOG.debug("Configuring Jetty to use TLS");
- final SslContextFactory sslContextFactory = new SslContextFactory.Server();
+ final SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
// If the key password is the same as the keystore password, we don't
// have to explicitly set it. Thus, if the user doesn't provide a key
// password, don't set anything.
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 1285d9d..c1053b3 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.clientImpl.ManagerClient;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java
index 05c9f85..2ee3fe8 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java
@@ -21,7 +21,7 @@ package org.apache.accumulo.monitor.rest;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.accumulo.monitor.rest.logs.DeadLoggerList;
import org.apache.accumulo.monitor.rest.manager.ManagerInformation;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java
index 48f1ee5..128c167 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java
@@ -18,13 +18,13 @@
*/
package org.apache.accumulo.monitor.rest;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response.Status;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response.Status;
import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
index 568d432..4f67818 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
@@ -20,11 +20,11 @@ package org.apache.accumulo.monitor.rest.bulkImports;
import java.util.List;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.master.thrift.BulkImportStatus;
import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorResource.java
index 81290b4..50e0ec2 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorResource.java
@@ -18,11 +18,11 @@
*/
package org.apache.accumulo.monitor.rest.gc;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.gc.thrift.GCStatus;
import org.apache.accumulo.monitor.Monitor;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerInformation.java
index b7bd7e3..660ecb2 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerInformation.java
@@ -18,7 +18,7 @@
*/
package org.apache.accumulo.monitor.rest.logs;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAttribute;
/**
* Stores dead logger information
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogResource.java
index 048e18f..3086fed 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogResource.java
@@ -20,13 +20,13 @@ package org.apache.accumulo.monitor.rest.logs;
import java.util.List;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.monitor.Monitor;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/ManagerResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/ManagerResource.java
index fba45f7..eed416f 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/ManagerResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/ManagerResource.java
@@ -24,11 +24,11 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.gc.thrift.GCStatus;
import org.apache.accumulo.core.master.thrift.DeadServer;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java
index 240ad2b..9c60f87 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java
@@ -18,7 +18,7 @@
*/
package org.apache.accumulo.monitor.rest.problems;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.monitor.util.JaxbAbstractIdSerializer;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java
index b1d6664..e69bf35 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java
@@ -18,7 +18,7 @@
*/
package org.apache.accumulo.monitor.rest.problems;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.monitor.util.JaxbAbstractIdSerializer;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemsResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemsResource.java
index b17106d..eca3f4f 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemsResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemsResource.java
@@ -27,16 +27,16 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
-import javax.inject.Inject;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.data.TableId;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
index 2e1e39e..c92c519 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
@@ -27,11 +27,11 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.AccumuloException;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java
index d38ef80..6551487 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java
@@ -20,11 +20,11 @@ package org.apache.accumulo.monitor.rest.scans;
import java.util.Map;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java
index 8e36555..90e2b62 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java
@@ -21,11 +21,11 @@ package org.apache.accumulo.monitor.rest.statistics;
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.gc.thrift.GCStatus;
import org.apache.accumulo.core.util.Pair;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java
index 4f88b56..680ae45 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java
@@ -20,11 +20,11 @@ package org.apache.accumulo.monitor.rest.status;
import java.util.List;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.master.thrift.ManagerMonitorInfo;
import org.apache.accumulo.monitor.Monitor;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
index 050da04..5ffa406 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
@@ -18,7 +18,7 @@
*/
package org.apache.accumulo.monitor.rest.tables;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.master.thrift.TableInfo;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
index 39e6e0d..871b32f 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
@@ -27,14 +27,14 @@ import java.util.SortedMap;
import java.util.TreeMap;
import java.util.TreeSet;
-import javax.inject.Inject;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.data.Range;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java
index 352e804..20d05d8 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java
@@ -31,17 +31,17 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
-import javax.inject.Inject;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/BadTabletServerInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/BadTabletServerInformation.java
index e4e3de2..8abd71e 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/BadTabletServerInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/BadTabletServerInformation.java
@@ -18,7 +18,7 @@
*/
package org.apache.accumulo.monitor.rest.tservers;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAttribute;
/**
* Generates a bad tserver information
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java
index 66b03a0..acc74a0 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java
@@ -18,7 +18,7 @@
*/
package org.apache.accumulo.monitor.rest.tservers;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.monitor.util.JaxbAbstractIdSerializer;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/DeadServerInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/DeadServerInformation.java
index efd1278..397adc7 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/DeadServerInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/DeadServerInformation.java
@@ -18,7 +18,7 @@
*/
package org.apache.accumulo.monitor.rest.tservers;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAttribute;
/**
* Generates a dead tserver information
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerShuttingDownInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerShuttingDownInformation.java
index a747196..021f5e1 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerShuttingDownInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerShuttingDownInformation.java
@@ -18,7 +18,7 @@
*/
package org.apache.accumulo.monitor.rest.tservers;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAttribute;
/**
* Generates a tserver shutting down
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java
index ebc7bdc..974d905 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java
@@ -21,7 +21,7 @@ package org.apache.accumulo.monitor.rest.tservers;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAttribute;
import org.apache.accumulo.core.master.thrift.RecoveryStatus;
import org.apache.accumulo.core.master.thrift.TableInfo;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
index 0cb87b6..99e6ec4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
@@ -24,17 +24,17 @@ import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Inject;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.clientImpl.Tables;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZookeeperResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZookeeperResource.java
index 782a538..0879a6d 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZookeeperResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/zk/ZookeeperResource.java
@@ -18,10 +18,10 @@
*/
package org.apache.accumulo.monitor.rest.zk;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.monitor.ZooKeeperStatus;
import org.apache.accumulo.monitor.ZooKeeperStatus.ZooKeeperState;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/JaxbAbstractIdSerializer.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/JaxbAbstractIdSerializer.java
index 1664522..1ae7ac9 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/JaxbAbstractIdSerializer.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/JaxbAbstractIdSerializer.java
@@ -18,7 +18,7 @@
*/
package org.apache.accumulo.monitor.util;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.accumulo.core.data.AbstractId;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
index c59d0d4..3596a87 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
@@ -31,18 +31,18 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.inject.Inject;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.TableNotFoundException;
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/ellipsis.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/datatables/plugins/ellipsis.js
similarity index 100%
rename from server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/ellipsis.js
rename to server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/datatables/plugins/ellipsis.js
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/jquery-3.2.1.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/jquery/jquery-3.2.1.js
similarity index 100%
rename from server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/jquery-3.2.1.js
rename to server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/jquery/jquery-3.2.1.js
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/select2.css b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/select2.css
deleted file mode 100644
index 447b2b8..0000000
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/external/select2.css
+++ /dev/null
@@ -1,484 +0,0 @@
-.select2-container {
- box-sizing: border-box;
- display: inline-block;
- margin: 0;
- position: relative;
- vertical-align: middle; }
- .select2-container .select2-selection--single {
- box-sizing: border-box;
- cursor: pointer;
- display: block;
- height: 28px;
- user-select: none;
- -webkit-user-select: none; }
- .select2-container .select2-selection--single .select2-selection__rendered {
- display: block;
- padding-left: 8px;
- padding-right: 20px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap; }
- .select2-container .select2-selection--single .select2-selection__clear {
- position: relative; }
- .select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered {
- padding-right: 8px;
- padding-left: 20px; }
- .select2-container .select2-selection--multiple {
- box-sizing: border-box;
- cursor: pointer;
- display: block;
- min-height: 32px;
- user-select: none;
- -webkit-user-select: none; }
- .select2-container .select2-selection--multiple .select2-selection__rendered {
- display: inline-block;
- overflow: hidden;
- padding-left: 8px;
- text-overflow: ellipsis;
- white-space: nowrap; }
- .select2-container .select2-search--inline {
- float: left; }
- .select2-container .select2-search--inline .select2-search__field {
- box-sizing: border-box;
- border: none;
- font-size: 100%;
- margin-top: 5px;
- padding: 0; }
- .select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button {
- -webkit-appearance: none; }
-
-.select2-dropdown {
- background-color: white;
- border: 1px solid #aaa;
- border-radius: 4px;
- box-sizing: border-box;
- display: block;
- position: absolute;
- left: -100000px;
- width: 100%;
- z-index: 1051; }
-
-.select2-results {
- display: block; }
-
-.select2-results__options {
- list-style: none;
- margin: 0;
- padding: 0; }
-
-.select2-results__option {
- padding: 6px;
- user-select: none;
- -webkit-user-select: none; }
- .select2-results__option[aria-selected] {
- cursor: pointer; }
-
-.select2-container--open .select2-dropdown {
- left: 0; }
-
-.select2-container--open .select2-dropdown--above {
- border-bottom: none;
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 0; }
-
-.select2-container--open .select2-dropdown--below {
- border-top: none;
- border-top-left-radius: 0;
- border-top-right-radius: 0; }
-
-.select2-search--dropdown {
- display: block;
- padding: 4px; }
- .select2-search--dropdown .select2-search__field {
- padding: 4px;
- width: 100%;
- box-sizing: border-box; }
- .select2-search--dropdown .select2-search__field::-webkit-search-cancel-button {
- -webkit-appearance: none; }
- .select2-search--dropdown.select2-search--hide {
- display: none; }
-
-.select2-close-mask {
- border: 0;
- margin: 0;
- padding: 0;
- display: block;
- position: fixed;
- left: 0;
- top: 0;
- min-height: 100%;
- min-width: 100%;
- height: auto;
- width: auto;
- opacity: 0;
- z-index: 99;
- background-color: #fff;
- filter: alpha(opacity=0); }
-
-.select2-hidden-accessible {
- border: 0 !important;
- clip: rect(0 0 0 0) !important;
- height: 1px !important;
- margin: -1px !important;
- overflow: hidden !important;
- padding: 0 !important;
- position: absolute !important;
- width: 1px !important; }
-
-.select2-container--default .select2-selection--single {
- background-color: #fff;
- border: 1px solid #aaa;
- border-radius: 4px; }
- .select2-container--default .select2-selection--single .select2-selection__rendered {
- color: #444;
- line-height: 28px; }
- .select2-container--default .select2-selection--single .select2-selection__clear {
- cursor: pointer;
- float: right;
- font-weight: bold; }
- .select2-container--default .select2-selection--single .select2-selection__placeholder {
- color: #999; }
- .select2-container--default .select2-selection--single .select2-selection__arrow {
- height: 26px;
- position: absolute;
- top: 1px;
- right: 1px;
- width: 20px; }
- .select2-container--default .select2-selection--single .select2-selection__arrow b {
- border-color: #888 transparent transparent transparent;
- border-style: solid;
- border-width: 5px 4px 0 4px;
- height: 0;
- left: 50%;
- margin-left: -4px;
- margin-top: -2px;
- position: absolute;
- top: 50%;
- width: 0; }
-
-.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear {
- float: left; }
-
-.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow {
- left: 1px;
- right: auto; }
-
-.select2-container--default.select2-container--disabled .select2-selection--single {
- background-color: #eee;
- cursor: default; }
- .select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear {
- display: none; }
-
-.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b {
- border-color: transparent transparent #888 transparent;
- border-width: 0 4px 5px 4px; }
-
-.select2-container--default .select2-selection--multiple {
- background-color: white;
- border: 1px solid #aaa;
- border-radius: 4px;
- cursor: text; }
- .select2-container--default .select2-selection--multiple .select2-selection__rendered {
- box-sizing: border-box;
- list-style: none;
- margin: 0;
- padding: 0 5px;
- width: 100%; }
- .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
- list-style: none; }
- .select2-container--default .select2-selection--multiple .select2-selection__placeholder {
- color: #999;
- margin-top: 5px;
- float: left; }
- .select2-container--default .select2-selection--multiple .select2-selection__clear {
- cursor: pointer;
- float: right;
- font-weight: bold;
- margin-top: 5px;
- margin-right: 10px; }
- .select2-container--default .select2-selection--multiple .select2-selection__choice {
- background-color: #e4e4e4;
- border: 1px solid #aaa;
- border-radius: 4px;
- cursor: default;
- float: left;
- margin-right: 5px;
- margin-top: 5px;
- padding: 0 5px; }
- .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
- color: #999;
- cursor: pointer;
- display: inline-block;
- font-weight: bold;
- margin-right: 2px; }
- .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover {
- color: #333; }
-
-.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
- float: right; }
-
-.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
- margin-left: 5px;
- margin-right: auto; }
-
-.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
- margin-left: 2px;
- margin-right: auto; }
-
-.select2-container--default.select2-container--focus .select2-selection--multiple {
- border: solid black 1px;
- outline: 0; }
-
-.select2-container--default.select2-container--disabled .select2-selection--multiple {
- background-color: #eee;
- cursor: default; }
-
-.select2-container--default.select2-container--disabled .select2-selection__choice__remove {
- display: none; }
-
-.select2-container--default.select2-container--open.select2-container--above .select2-selection--single, .select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple {
- border-top-left-radius: 0;
- border-top-right-radius: 0; }
-
-.select2-container--default.select2-container--open.select2-container--below .select2-selection--single, .select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple {
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 0; }
-
-.select2-container--default .select2-search--dropdown .select2-search__field {
- border: 1px solid #aaa; }
-
-.select2-container--default .select2-search--inline .select2-search__field {
- background: transparent;
- border: none;
- outline: 0;
- box-shadow: none;
- -webkit-appearance: textfield; }
-
-.select2-container--default .select2-results > .select2-results__options {
- max-height: 200px;
- overflow-y: auto; }
-
-.select2-container--default .select2-results__option[role=group] {
- padding: 0; }
-
-.select2-container--default .select2-results__option[aria-disabled=true] {
- color: #999; }
-
-.select2-container--default .select2-results__option[aria-selected=true] {
- background-color: #ddd; }
-
-.select2-container--default .select2-results__option .select2-results__option {
- padding-left: 1em; }
- .select2-container--default .select2-results__option .select2-results__option .select2-results__group {
- padding-left: 0; }
- .select2-container--default .select2-results__option .select2-results__option .select2-results__option {
- margin-left: -1em;
- padding-left: 2em; }
- .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
- margin-left: -2em;
- padding-left: 3em; }
- .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
- margin-left: -3em;
- padding-left: 4em; }
- .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
- margin-left: -4em;
- padding-left: 5em; }
- .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
- margin-left: -5em;
- padding-left: 6em; }
-
-.select2-container--default .select2-results__option--highlighted[aria-selected] {
- background-color: #5897fb;
- color: white; }
-
-.select2-container--default .select2-results__group {
- cursor: default;
- display: block;
- padding: 6px; }
-
-.select2-container--classic .select2-selection--single {
- background-color: #f7f7f7;
- border: 1px solid #aaa;
- border-radius: 4px;
- outline: 0;
- background-image: -webkit-linear-gradient(top, white 50%, #eeeeee 100%);
- background-image: -o-linear-gradient(top, white 50%, #eeeeee 100%);
- background-image: linear-gradient(to bottom, white 50%, #eeeeee 100%);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); }
- .select2-container--classic .select2-selection--single:focus {
- border: 1px solid #5897fb; }
- .select2-container--classic .select2-selection--single .select2-selection__rendered {
- color: #444;
- line-height: 28px; }
- .select2-container--classic .select2-selection--single .select2-selection__clear {
- cursor: pointer;
- float: right;
- font-weight: bold;
- margin-right: 10px; }
- .select2-container--classic .select2-selection--single .select2-selection__placeholder {
- color: #999; }
- .select2-container--classic .select2-selection--single .select2-selection__arrow {
- background-color: #ddd;
- border: none;
- border-left: 1px solid #aaa;
- border-top-right-radius: 4px;
- border-bottom-right-radius: 4px;
- height: 26px;
- position: absolute;
- top: 1px;
- right: 1px;
- width: 20px;
- background-image: -webkit-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
- background-image: -o-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
- background-image: linear-gradient(to bottom, #eeeeee 50%, #cccccc 100%);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0); }
- .select2-container--classic .select2-selection--single .select2-selection__arrow b {
- border-color: #888 transparent transparent transparent;
- border-style: solid;
- border-width: 5px 4px 0 4px;
- height: 0;
- left: 50%;
- margin-left: -4px;
- margin-top: -2px;
- position: absolute;
- top: 50%;
- width: 0; }
-
-.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear {
- float: left; }
-
-.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow {
- border: none;
- border-right: 1px solid #aaa;
- border-radius: 0;
- border-top-left-radius: 4px;
- border-bottom-left-radius: 4px;
- left: 1px;
- right: auto; }
-
-.select2-container--classic.select2-container--open .select2-selection--single {
- border: 1px solid #5897fb; }
- .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow {
- background: transparent;
- border: none; }
- .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b {
- border-color: transparent transparent #888 transparent;
- border-width: 0 4px 5px 4px; }
-
-.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single {
- border-top: none;
- border-top-left-radius: 0;
- border-top-right-radius: 0;
- background-image: -webkit-linear-gradient(top, white 0%, #eeeeee 50%);
- background-image: -o-linear-gradient(top, white 0%, #eeeeee 50%);
- background-image: linear-gradient(to bottom, white 0%, #eeeeee 50%);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); }
-
-.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single {
- border-bottom: none;
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 0;
- background-image: -webkit-linear-gradient(top, #eeeeee 50%, white 100%);
- background-image: -o-linear-gradient(top, #eeeeee 50%, white 100%);
- background-image: linear-gradient(to bottom, #eeeeee 50%, white 100%);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0); }
-
-.select2-container--classic .select2-selection--multiple {
- background-color: white;
- border: 1px solid #aaa;
- border-radius: 4px;
- cursor: text;
- outline: 0; }
- .select2-container--classic .select2-selection--multiple:focus {
- border: 1px solid #5897fb; }
- .select2-container--classic .select2-selection--multiple .select2-selection__rendered {
- list-style: none;
- margin: 0;
- padding: 0 5px; }
- .select2-container--classic .select2-selection--multiple .select2-selection__clear {
- display: none; }
- .select2-container--classic .select2-selection--multiple .select2-selection__choice {
- background-color: #e4e4e4;
- border: 1px solid #aaa;
- border-radius: 4px;
- cursor: default;
- float: left;
- margin-right: 5px;
- margin-top: 5px;
- padding: 0 5px; }
- .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove {
- color: #888;
- cursor: pointer;
- display: inline-block;
- font-weight: bold;
- margin-right: 2px; }
- .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover {
- color: #555; }
-
-.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
- float: right; }
-
-.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
- margin-left: 5px;
- margin-right: auto; }
-
-.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
- margin-left: 2px;
- margin-right: auto; }
-
-.select2-container--classic.select2-container--open .select2-selection--multiple {
- border: 1px solid #5897fb; }
-
-.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple {
- border-top: none;
- border-top-left-radius: 0;
- border-top-right-radius: 0; }
-
-.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple {
- border-bottom: none;
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 0; }
-
-.select2-container--classic .select2-search--dropdown .select2-search__field {
- border: 1px solid #aaa;
- outline: 0; }
-
-.select2-container--classic .select2-search--inline .select2-search__field {
- outline: 0;
- box-shadow: none; }
-
-.select2-container--classic .select2-dropdown {
- background-color: white;
- border: 1px solid transparent; }
-
-.select2-container--classic .select2-dropdown--above {
- border-bottom: none; }
-
-.select2-container--classic .select2-dropdown--below {
- border-top: none; }
-
-.select2-container--classic .select2-results > .select2-results__options {
- max-height: 200px;
- overflow-y: auto; }
-
-.select2-container--classic .select2-results__option[role=group] {
- padding: 0; }
-
-.select2-container--classic .select2-results__option[aria-disabled=true] {
- color: grey; }
-
-.select2-container--classic .select2-results__option--highlighted[aria-selected] {
- background-color: #3875d7;
- color: white; }
-
-.select2-container--classic .select2-results__group {
- cursor: default;
- display: block;
- padding: 6px; }
-
-.select2-container--classic.select2-container--open .select2-dropdown {
- border-color: #5897fb; }
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl
index cec98f9..1821580 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl
@@ -30,7 +30,7 @@
${val}
</#list>
<#else>
- <script src="/resources/external/jquery-3.2.1.js"></script>
+ <script src="/resources/external/jquery/jquery-3.2.1.js"></script>
<script src="/resources/external/bootstrap/js/bootstrap.js"></script>
<script src="/resources/external/datatables/js/jquery.dataTables.js"></script>
<script src="/resources/external/datatables/js/dataTables.bootstrap.js"></script>
@@ -44,7 +44,7 @@
<script src="/resources/external/flot/jquery.flot.legend.js"></script>
<script src="/resources/external/flot/jquery.flot.time.js"></script>
<script src="/resources/external/flot/jquery.flot.resize.js"></script>
- <script src="/resources/external/ellipsis.js"></script>
+ <script src="/resources/external/datatables/plugins/ellipsis.js"></script>
<link rel="stylesheet" href="/resources/external/bootstrap/css/bootstrap.css" />
<link rel="stylesheet" href="/resources/external/bootstrap/css/bootstrap-theme.css" />
<link rel="stylesheet" href="/resources/external/datatables/css/dataTables.bootstrap.css" />
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/it/WebViewsIT.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/it/WebViewsIT.java
index 543a7a2..9b11c47 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/it/WebViewsIT.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/it/WebViewsIT.java
@@ -30,12 +30,12 @@ import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicReference;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.MessageBodyWriter;
import org.apache.accumulo.core.clientImpl.Tables;
import org.apache.accumulo.core.conf.DefaultConfiguration;
diff --git a/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java b/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java
index 09d8528..2c693a0 100644
--- a/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java
@@ -77,7 +77,7 @@ public class CountNameNodeOpsBulkIT extends ConfigurableMacBase {
String uri = getCluster().getMiniDfs().getHttpUri(0);
URL url = new URL(uri + "/jmx");
log.debug("Fetching web page " + url);
- String jsonString = FunctionalTestUtils.readAll(url.openStream());
+ String jsonString = FunctionalTestUtils.readWebPage(url).body();
Gson gson = new Gson();
Map<?,?> jsonObject = gson.fromJson(jsonString, Map.class);
List<?> beans = (List<?>) jsonObject.get("beans");
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
index 9f74d4e..18bffd6 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
@@ -25,6 +25,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.net.InetAddress;
import java.util.Map;
import java.util.Properties;
@@ -97,11 +98,11 @@ public class ConfigurableMacBase extends AccumuloITBase {
final String rootKeystorePassword = "root_keystore_password",
truststorePassword = "truststore_password";
try {
+ String hostname = InetAddress.getLocalHost().getHostName();
new CertUtils(Property.RPC_SSL_KEYSTORE_TYPE.getDefaultValue(),
- "o=Apache Accumulo,cn=MiniAccumuloCluster", "RSA", 2048, "sha1WithRSAEncryption")
- .createAll(rootKeystoreFile, localKeystoreFile, publicTruststoreFile,
- cfg.getInstanceName(), rootKeystorePassword, cfg.getRootPassword(),
- truststorePassword);
+ "o=Apache Accumulo,cn=" + hostname, "RSA", 2048, "sha1WithRSAEncryption").createAll(
+ rootKeystoreFile, localKeystoreFile, publicTruststoreFile, cfg.getInstanceName(),
+ rootKeystorePassword, cfg.getRootPassword(), truststorePassword);
} catch (Exception e) {
throw new RuntimeException("error creating MAC keystore", e);
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
index 0eeebe0..735c966 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
@@ -24,6 +24,12 @@ import static org.junit.Assert.assertFalse;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map.Entry;
@@ -149,6 +155,12 @@ public class FunctionalTestUtils {
assertFalse(fail.get());
}
+ public static HttpResponse<String> readWebPage(URL url)
+ throws IOException, InterruptedException, URISyntaxException {
+ return HttpClient.newHttpClient().send(HttpRequest.newBuilder(url.toURI()).build(),
+ BodyHandlers.ofString());
+ }
+
public static String readAll(InputStream is) throws IOException {
return IOUtils.toString(is, UTF_8);
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MonitorSslIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MonitorSslIT.java
index b41b8c1..5f6ba72 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MonitorSslIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MonitorSslIT.java
@@ -143,7 +143,7 @@ public class MonitorSslIT extends ConfigurableMacBase {
}
URL url = new URL(monitorLocation);
log.debug("Fetching web page {}", url);
- String result = FunctionalTestUtils.readAll(url.openStream());
+ String result = FunctionalTestUtils.readWebPage(url).body();
assertTrue(result.length() > 100);
assertTrue(result.indexOf("Accumulo Overview") >= 0);
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index c6fedc1..de61d76 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@ -162,7 +162,7 @@ public class ReadWriteIT extends AccumuloClusterHarness {
}
URL url = new URL(monitorLocation);
log.debug("Fetching web page {}", url);
- String result = FunctionalTestUtils.readAll(url.openStream());
+ String result = FunctionalTestUtils.readWebPage(url).body();
assertTrue(result.length() > 100);
log.debug("Stopping accumulo cluster");
ClusterControl control = cluster.getClusterControl();