diff --git a/pom.xml b/pom.xml index 9aa69f5b8..54c2c9b3c 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,13 @@ 1.3 18.20 - 2.17.2 + + 2.18.6 33.1.0-jre 1.26.1 diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index e15027878..254179f6c 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -74,6 +74,11 @@ org.apache.hadoop * + + + org.apache.htrace + htrace-core + jdk.tools jdk.tools @@ -134,6 +139,11 @@ org.apache.hadoop * + + + org.apache.htrace + htrace-core + commons-configuration commons-configuration @@ -198,6 +208,11 @@ org.apache.hadoop * + + + org.apache.htrace + htrace-core + log4j log4j @@ -258,6 +273,11 @@ org.apache.hadoop * + + + org.apache.htrace + htrace-core + org.simpleframework simple-xml @@ -426,6 +446,11 @@ org.apache.hadoop * + + + org.apache.htrace + htrace-core + log4j log4j diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index aca210b66..fcbbd3cf9 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -111,7 +111,8 @@ ${project.build.directory}/solr-libs **/jackson-dataformat-smile-*.jar,**/asm-3.3.1.jar,**/jackson-core-asl-*.jar,**/jackson-mapper-asl-*.jar,**/dom4j-1.6.1.jar, **/annotations-1.0.0.jar,**/spring-context-support-*.jar,**/spring-web-*.jar,**/woodstox-core-asl-4.4.1.jar, **/isoparser-1.1.18.jar, - **/metadata-extractor-2.9.1.jar,**/org.restlet.ext.servlet-2.3.0.jar,**/reload4j-*.jar + **/metadata-extractor-2.9.1.jar,**/org.restlet.ext.servlet-2.3.0.jar,**/reload4j-*.jar, + **/htrace-core-*-incubating.jar @@ -180,6 +181,12 @@ + + + + diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt index 063290267..41e06e6ef 100644 --- a/search-services/packaging/src/main/resources/licenses/notice.txt +++ b/search-services/packaging/src/main/resources/licenses/notice.txt @@ -60,9 +60,9 @@ chemistry-opencmis-server-bindings-1.0.0.jar http://chemistry.apache.org/ failureaccess-1.0.2.jar https://mvnrepository.com/artifact/com.google.guava/failureaccess/1.0.2 listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar https://mvnrepository.com/artifact/com.google.guava/listenablefuture quartz-2.3.2.jar http://quartz-scheduler.org/ -jackson-core-2.17.2.jar https://github.com/FasterXML/jackson -jackson-annotations-2.17.2.jar https://github.com/FasterXML/jackson -jackson-databind-2.17.2.jar https://github.com/FasterXML/jackson +jackson-core-2.18.6.jar https://github.com/FasterXML/jackson +jackson-annotations-2.18.6.jar https://github.com/FasterXML/jackson +jackson-databind-2.18.6.jar https://github.com/FasterXML/jackson commons-httpclient-3.1-HTTPCLIENT-1265.jar http://jakarta.apache.org/commons/ spring-beans-7.0.7.jar http://projects.spring.io/spring-framework/ spring-context-7.0.7.jar http://projects.spring.io/spring-framework/ @@ -167,7 +167,6 @@ eigenbase-properties-1.1.5.jar gmetric4j-1.0.7.jar guava-33.1.0-jre.jar hppc-0.7.1.jar -htrace-core-3.2.0-incubating.jar httpclient-4.5.14.jar httpcore-4.4.1.jar httpmime-4.4.1.jar