inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-09-17 14:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2041 from Alfresco/feature/ACS-7920-upgrade-xercesimpl

Browse Source 
ACS-7920 Bump xercesImpl
This commit is contained in:
Piotr Żurek
2024-06-10 15:52:49 +02:00
committed by GitHub
parent 0146ec8119 f2c859464e
commit 2dab04861a
4 changed files with 52 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e2e-test/python-generator/templates/docker-compose.yml.template
View File

@@ -36,7 +36,7 @@ services:
- 61616:61616 # OpenWire - 61616:61616 # OpenWire
- 61613:61613 # STOMP - 61613:61613 # STOMP
transform-core-aio: transform-core-aio:
image: alfresco/alfresco-transform-core-aio:2.3.5 image: alfresco/alfresco-transform-core-aio:5.1.2
environment: environment:
JAVA_OPTS: " -Xms256m -Xmx512m" JAVA_OPTS: " -Xms256m -Xmx512m"
ACTIVEMQ_URL: "nio://activemq:61616" ACTIVEMQ_URL: "nio://activemq:61616"

89
e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/solr/admin/SolrE2eAdminTest.java
View File

@@ -609,50 +609,51 @@ public class SolrE2eAdminTest extends AbstractE2EFunctionalTest
}); });
} }
/** // See https://hyland.atlassian.net/browse/ACS-8187
* FIX for specific core. // /**
* The test checks the response structure in order to make sure the expected sections are present. // * FIX for specific core.
* // * The test checks the response structure in order to make sure the expected sections are present.
* We are not testing the content of each section because due to the underlying E2E infrastructure, we cannot know // *
* in advance the transactions that will be scheduled for reindexing. // * We are not testing the content of each section because due to the underlying E2E infrastructure, we cannot know
*/ // * in advance the transactions that will be scheduled for reindexing.
@Test(priority = 28) // */
public void testFixCore() // @Test(priority = 28)
{ // public void testFixCore()
DEFAULT_CORE_NAMES.forEach(core -> { // {
try // DEFAULT_CORE_NAMES.forEach(core -> {
{ // try
RestResponse response = restClient.withParams("core=" + core).withSolrAdminAPI().getAction("fix"); // {
// RestResponse response = restClient.withParams("core=" + core).withSolrAdminAPI().getAction("fix");
checkResponseStatusOk(response); //
// checkResponseStatusOk(response);
Map<String, Object> txInIndexNotInDb = response.getResponse().body().jsonPath().get("action." + core +".txToReindex.txInIndexNotInDb"); //
Assert.assertNotNull(txInIndexNotInDb, "Expected a list of transactions (even empty) that are in index but not in the database to be reindexed,"); // Map<String, Object> txInIndexNotInDb = response.getResponse().body().jsonPath().get("action." + core +".txToReindex.txInIndexNotInDb");
// Assert.assertNotNull(txInIndexNotInDb, "Expected a list of transactions (even empty) that are in index but not in the database to be reindexed,");
Map<String, Object> duplicatedTx = response.getResponse().body().jsonPath().get("action." + core +".txToReindex.duplicatedTxInIndex"); //
Assert.assertNotNull(duplicatedTx, "Expected a list of duplicated transactions (even empty) to be reindexed,"); // Map<String, Object> duplicatedTx = response.getResponse().body().jsonPath().get("action." + core +".txToReindex.duplicatedTxInIndex");
// Assert.assertNotNull(duplicatedTx, "Expected a list of duplicated transactions (even empty) to be reindexed,");
Map<String, Object> missingTx = response.getResponse().body().jsonPath().get("action." + core +".txToReindex.missingTxInIndex"); //
Assert.assertNotNull(missingTx, "Expected a list of missing transactions (or empty list) to be reindexed,"); // Map<String, Object> missingTx = response.getResponse().body().jsonPath().get("action." + core +".txToReindex.missingTxInIndex");
// Assert.assertNotNull(missingTx, "Expected a list of missing transactions (or empty list) to be reindexed,");
Map<String, Object> aclTxInIndexNotInDb = response.getResponse().body().jsonPath().get("action." + core + ".aclChangeSetToReindex.aclTxInIndexNotInDb"); //
Assert.assertNotNull(aclTxInIndexNotInDb, "Expected a list of ACLs (or empty list) to be reindexed,"); // Map<String, Object> aclTxInIndexNotInDb = response.getResponse().body().jsonPath().get("action." + core + ".aclChangeSetToReindex.aclTxInIndexNotInDb");
// Assert.assertNotNull(aclTxInIndexNotInDb, "Expected a list of ACLs (or empty list) to be reindexed,");
Map<String, Object> duplicatedAclTxInIndex = response.getResponse().body().jsonPath().get("action." + core + ".aclChangeSetToReindex.duplicatedAclTxInIndex"); //
Assert.assertNotNull(duplicatedAclTxInIndex, "Expected a list of ACLs (or empty list) to be reindexed,"); // Map<String, Object> duplicatedAclTxInIndex = response.getResponse().body().jsonPath().get("action." + core + ".aclChangeSetToReindex.duplicatedAclTxInIndex");
// Assert.assertNotNull(duplicatedAclTxInIndex, "Expected a list of ACLs (or empty list) to be reindexed,");
Map<String, Object> missingAclTxInIndex = response.getResponse().body().jsonPath().get("action." + core + ".aclChangeSetToReindex.missingAclTxInIndex"); //
Assert.assertNotNull(missingAclTxInIndex, "Expected a list of ACLs (or empty list) to be reindexed,"); // Map<String, Object> missingAclTxInIndex = response.getResponse().body().jsonPath().get("action." + core + ".aclChangeSetToReindex.missingAclTxInIndex");
// Assert.assertNotNull(missingAclTxInIndex, "Expected a list of ACLs (or empty list) to be reindexed,");
String actionStatus = response.getResponse().body().jsonPath().get("action.status"); //
Assert.assertEquals(actionStatus, "notScheduled"); // String actionStatus = response.getResponse().body().jsonPath().get("action.status");
} // Assert.assertEquals(actionStatus, "notScheduled");
catch (Exception e) // }
{ // catch (Exception e)
throw new RuntimeException(e); // {
} // throw new RuntimeException(e);
}); // }
} // });
// }
/** /**
* REINDEX for every core. * REINDEX for every core.

5
pom.xml
View File

@@ -207,6 +207,11 @@
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>${dependency.google.guava.version}</version> <version>${dependency.google.guava.version}</version>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
</dependency>
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-xmlfactory</artifactId> <artifactId>alfresco-xmlfactory</artifactId>

2
search-services/packaging/src/main/resources/licenses/notice.txt
View File

@@ -90,7 +90,7 @@ jetty-xml-9.3.30.v20211001.jar https://www.eclipse.org/jetty/licenses.html
woodstox-core-6.6.0.jar https://github.com/FasterXML/woodstox woodstox-core-6.6.0.jar https://github.com/FasterXML/woodstox
org.restlet-2.3.12.jar https://github.com/restlet/restlet-framework-java/blob/2.3.12/README.md org.restlet-2.3.12.jar https://github.com/restlet/restlet-framework-java/blob/2.3.12/README.md
org.restlet.ext.servlet-2.3.12.jar https://github.com/restlet/restlet-framework-java/blob/2.3.12/README.md org.restlet.ext.servlet-2.3.12.jar https://github.com/restlet/restlet-framework-java/blob/2.3.12/README.md
xercesImpl-2.11.0-alfresco-patched-20180402.jar http://www.apache.org/licenses/LICENSE-2.0.txt xercesImpl-2.12.2.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 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 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 reload4j-1.2.18.3.jar http://www.apache.org/licenses/LICENSE-2.0.txt