diff --git a/e2e-test/generator-alfresco-docker-compose/package-lock.json b/e2e-test/generator-alfresco-docker-compose/package-lock.json index 311786755..42080611c 100644 --- a/e2e-test/generator-alfresco-docker-compose/package-lock.json +++ b/e2e-test/generator-alfresco-docker-compose/package-lock.json @@ -1099,9 +1099,9 @@ } }, "node_modules/normalize-package-data/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -1382,9 +1382,9 @@ } }, "node_modules/semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -2701,9 +2701,9 @@ }, "dependencies": { "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" } } }, @@ -2878,9 +2878,9 @@ } }, "semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" } diff --git a/e2e-test/pom.xml b/e2e-test/pom.xml index 88fef308b..f7dfef820 100644 --- a/e2e-test/pom.xml +++ b/e2e-test/pom.xml @@ -10,7 +10,7 @@ Search Analytics E2E Tests Test Project to test Search Service and Analytics Features on a complete setup of Alfresco, Share - 23.1.0.167 + 23.1.0.168 23.1.0.101 4.0.4 3.3.1 diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java index 6043656e7..d40a9c006 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchTest.java @@ -321,4 +321,23 @@ public class SearchTest extends AbstractSearchServicesE2ETest restClient.onResponse().assertThat().body("list.entries.entry[0].name", Matchers.equalToIgnoringCase(specialCharfileName)); } + + /** + * Check if isFavorite field is returned when requested. + */ + @Test + public void searchWithIncludeIsFavorite() + { + SearchRequest query = new SearchRequest(); + RestRequestQueryModel queryReq = new RestRequestQueryModel(); + queryReq.setQuery("alfresco"); + query.setQuery(queryReq); + query.setInclude(List.of("isFavorite")); + + query(query); + restClient.assertStatusCodeIs(HttpStatus.OK); + + // isFavorite field is included in the response + restClient.onResponse().assertThat().body("list.entries.entry[0].isFavorite", Matchers.notNullValue()); + } } diff --git a/pom.xml b/pom.xml index 68129dd44..8cc8a504f 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 2.15.2 - 31.1-jre + 32.1.1-jre 1.23.0 3.12.0 2.6 @@ -71,7 +71,7 @@ 1.1.4c 1.2.0 - 4.0.2 + 4.0.3 1.32.0 1.7.36 @@ -83,7 +83,7 @@ 5.4.0 2.8.1 1.1.0 - 3.19.6 + 3.23.4 2.8.0 3.1.10 diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt index fe00629ea..b84f33744 100644 --- a/search-services/packaging/src/main/resources/licenses/notice.txt +++ b/search-services/packaging/src/main/resources/licenses/notice.txt @@ -27,11 +27,11 @@ xpp3-1.1.4c.jar http://www.extreme.indiana.edu/dist/java-repository/xpp3/license json-20220320.jar https://github.com/stleary/JSON-java === Apache 2.0 === -error_prone_annotations-2.11.0.jar https://github.com/google/error-prone +error_prone_annotations-2.18.0.jar https://github.com/google/error-prone jsr305-3.0.2.jar https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305/1.3.9 geronimo-jta_1.1_spec-1.1.1.jar https://mvnrepository.com/artifact/org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1 proj4j-1.1.5.jar https://github.com/locationtech/proj4j -j2objc-annotations-1.3.jar https://github.com/google/j2objc +j2objc-annotations-2.8.jar https://github.com/google/j2objc json-path-2.8.0.jar https://github.com/json-path/JsonPath json-simple-1.1.1.jar https://github.com/fangyidong/json-simple apiguardian-api-1.1.2.jar https://github.com/apiguardian-team/apiguardian @@ -100,8 +100,8 @@ gson-2.8.9.jar https://github.com/google/gson/blob/gson-parent-2.8.9/LICENSE === CDDL 1.1 === -jaxb-core-4.0.2.jar http://jaxb.java.net/ -jaxb-xjc-4.0.2.jar http://jaxb.java.net/ +jaxb-core-4.0.3.jar http://jaxb.java.net/ +jaxb-xjc-4.0.3.jar http://jaxb.java.net/ === Eclipse Distribution License 1.0 (BSD) === @@ -129,7 +129,7 @@ jibx-run-1.3.3.jar http://jibx.sourceforge.net/ dom4j-2.1.3.jar https://github.com/dom4j/dom4j/blob/master/LICENSE === MIT === -checker-qual-3.12.0.jar https://checkerframework.org/ +checker-qual-3.33.0.jar https://checkerframework.org/ === Part of Apache Solr (Licenses listed separately) === antlr4-runtime-4.5.1-1.jar @@ -165,6 +165,7 @@ janino-3.1.10.jar curvesapi-1.04.jar eigenbase-properties-1.1.5.jar gmetric4j-1.0.7.jar +guava-32.1.1-jre.jar guava-31.1-jre.jar hppc-0.7.1.jar htrace-core-3.2.0-incubating.jar @@ -214,7 +215,7 @@ morfologik-fsa-2.1.1.jar morfologik-polish-2.1.1.jar morfologik-stemming-2.1.1.jar noggit-0.6.jar -protobuf-java-3.19.6.jar +protobuf-java-3.23.4.jar rome-1.5.1.jar slf4j-api-1.7.7.jar slf4j-log4j12-1.7.7.jar