From 5ce00773c7b9d919b2d687ed86fe3f8ea49a5735 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2019 00:15:14 +0000 Subject: [PATCH 1/3] Bump alfresco-data-model from 8.46 to 8.48 in /search-services Bumps [alfresco-data-model](https://github.com/Alfresco/alfresco-data-model) from 8.46 to 8.48. - [Release notes](https://github.com/Alfresco/alfresco-data-model/releases) - [Commits](https://github.com/Alfresco/alfresco-data-model/compare/8.46...8.48) Signed-off-by: dependabot-preview[bot] --- search-services/alfresco-solrclient-lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index cac0093a8..208c68140 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -22,7 +22,7 @@ - 8.46 + 8.48 2.10.0.pr1 From 94d02976baf1156051dcaaf5f654beab25cfa5d2 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 27 Aug 2019 15:39:14 +0100 Subject: [PATCH 2/3] SEARCH-1831 Add jaxb-xjc dependency. This was removed from alfresco-core. --- search-services/alfresco-search/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index 67bca4acd..99a0d37ed 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -90,6 +90,12 @@ 1.2.0 + + com.sun.xml.bind + jaxb-xjc + 2.3.2 + + junit From 041da073e390966da44c656ca48bcb8444024300 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 28 Aug 2019 09:50:40 +0100 Subject: [PATCH 3/3] SEARCH-1831 Update notice.txt --- .../packaging/src/main/resources/licenses/notice.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt index 7c83242c4..a24c7f14a 100644 --- a/search-services/packaging/src/main/resources/licenses/notice.txt +++ b/search-services/packaging/src/main/resources/licenses/notice.txt @@ -68,7 +68,7 @@ spring-jcl-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/ spring-jdbc-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/ spring-orm-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/ spring-tx-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-web-5.1.6.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-web-5.1.8.RELEASE.jar http://projects.spring.io/spring-framework/ xercesImpl-2.11.0-alfresco-patched-20180402.jar http://xerces.apache.org/xerces2-j guessencoding-1.4.jar http://docs.codehaus.org/display/GUESSENC/ xml-apis-1.4.01.jar https://github.com/FasterXML/jackson