diff --git a/pom.xml b/pom.xml index c1f5cd510..2e05d9a29 100644 --- a/pom.xml +++ b/pom.xml @@ -251,5 +251,10 @@ 1.0.0 provided + + ch.qos.reload4j + reload4j + 1.2.18.3 + diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index bc80122af..8023ec0f5 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -21,6 +21,10 @@ servlet-api javax.servlet + + log4j + log4j + @@ -42,6 +46,10 @@ jdk.tools jdk.tools + + log4j + log4j + @@ -50,6 +58,12 @@ solr-analysis-extras ${solr.version} provided + + + log4j + log4j + + @@ -74,6 +88,10 @@ org.bouncycastle bcprov-jdk15on + + log4j + log4j + @@ -87,6 +105,10 @@ org.simpleframework simple-xml + + log4j + log4j + @@ -105,7 +127,7 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j ${slf4j.version} @@ -232,6 +254,12 @@ solr-test-framework ${solr.version} test + + + log4j + log4j + + com.carrotsearch.randomizedtesting diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index 26c11918d..e19c8a939 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -20,8 +20,14 @@ org.alfresco alfresco-data-model ${dependency.alfresco-data-model.version} + + + log4j + log4j + + - + com.fasterxml.jackson.core jackson-core @@ -66,8 +72,8 @@ org.slf4j - slf4j-log4j12 - 1.7.30 + slf4j-reload4j + 1.7.36 diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt index 27812ef08..b7160b60c 100644 --- a/search-services/packaging/src/main/resources/licenses/notice.txt +++ b/search-services/packaging/src/main/resources/licenses/notice.txt @@ -109,6 +109,7 @@ org.restlet.ext.servlet-2.3.12.jar https://github.com/restlet/restlet-framework- xercesImpl-2.11.0-alfresco-patched-20180402.jar http://www.apache.org/licenses/LICENSE-2.0.txt xml-apis-1.4.01.jar http://www.apache.org/licenses/LICENSE-2.0.txt simple-xml-safe-2.7.1.jar https://github.com/carrotsearch/simplexml-safe/blob/release/2.7.1/LICENSE.txt +reload4j-1.2.18.3.jar http://www.apache.org/licenses/LICENSE-2.0.txt === Creative Commons Public Domain === diff --git a/search-services/pom.xml b/search-services/pom.xml index 8e73c50cb..dc761a974 100644 --- a/search-services/pom.xml +++ b/search-services/pom.xml @@ -14,7 +14,7 @@ pom Alfresco Solr Search parent - 1.7.30 + 1.7.36 3.2.14 community