From a2424a784a3af46e16ed2be11f10f732dfcf99d2 Mon Sep 17 00:00:00 2001 From: mstrankowski Date: Tue, 11 Jun 2024 20:52:44 +0200 Subject: [PATCH 1/6] ACS-7921: Add a default property value for solr.shardsWhitelist to the test - this should apply the setting to all HandlerFactories --- .../org/alfresco/solr/SolrITInitializer.java | 70 +++++++++++++------ 1 file changed, 48 insertions(+), 22 deletions(-) diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java index 24d744f00..0f8b6f78b 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java @@ -4,21 +4,21 @@ * %% * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is * provided under the following open source license terms: - * + * * Alfresco is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * Alfresco is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public License * along with Alfresco. If not, see . * #L% @@ -100,6 +100,8 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 protected static final int DEFAULT_CONNECTION_TIMEOUT1 = DEFAULT_CONNECTION_TIMEOUT; protected static final int CLIENT_SO_TIMEOUT = 90000; protected final static int INDEX_TIMEOUT = 100000; + protected static final String JETTY_CONTEXT = "/solr"; + protected static final String SHARD_NAME_PREFIX = "shard"; private static AtomicInteger nodeCnt; protected static boolean useExplicitNodeNames; @@ -107,16 +109,17 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 public static Properties DEFAULT_CORE_PROPS = new Properties(); protected static Map jettyContainers; + protected static int jettyPort; protected static Map solrCollectionNameToStandaloneClient; protected static List solrShards; protected static List clientShards; protected static String shards; protected static String[] shardsArr; protected static File testDir; - + //Standalone Tests protected static SolrCore defaultCore; - + protected static final String id = "id"; @@ -135,11 +138,11 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 { DEFAULT_CORE_PROPS.setProperty("alfresco.commitInterval", "1000"); DEFAULT_CORE_PROPS.setProperty("alfresco.newSearcherInterval", "2000"); - + System.setProperty("alfresco.test", "true"); System.setProperty("solr.tests.maxIndexingThreads", "10"); System.setProperty("solr.tests.ramBufferSizeMB", "1024"); - + testDir = new File(System.getProperty("user.dir") + "/target/jettys"); } @@ -150,20 +153,24 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 { testClassName = testClassName + "_" + System.currentTimeMillis(); + if (numShards > 0) { + jettyPort = getNextAvailablePort(); + } solrcoreProperties = addExplicitShardingProperty(solrcoreProperties); clientShards = new ArrayList<>(); solrShards = new ArrayList<>(); solrCollectionNameToStandaloneClient = new HashMap<>(); jettyContainers = new HashMap<>(); - + nodeCnt = new AtomicInteger(0); //currentTestName = testClassName; String[] coreNames = new String[]{DEFAULT_TEST_CORENAME}; - + distribSetUp(testClassName); + distribShardsSetUp(numShards); RandomSupplier.RandVal.uniqueValues = new HashSet<>(); // reset random values @@ -189,7 +196,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 public static void initSingleSolrServer(String testClassName, Properties solrcoreProperties) throws Throwable { initSolrServers(0,testClassName,solrcoreProperties); - + JettySolrRunner jsr = jettyContainers.get(testClassName); CoreContainer coreContainer = jsr.getCoreContainer(); AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler(); @@ -229,7 +236,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 LOGGER.error("Failed to shutdown test properly ", e); } } - + /** * Subclasses can override this to change a test's solr home (default is in * test-files) @@ -238,15 +245,34 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 { return System.getProperty("user.dir") + "/target/test-classes/test-files"; } - + public static void distribSetUp(String serverName) { SolrTestCaseJ4.resetExceptionIgnores(); // ignore anything with - // ignore_exception in it + // ignore_exception in it System.setProperty("solr.test.sys.prop1", "propone"); System.setProperty("solr.test.sys.prop2", "proptwo"); System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockDirectoryFactory"); System.setProperty("solr.log.dir", testDir.toPath().resolve(serverName).toString()); + + } + + /** + * Needed to test fix for CVE-2017-3164 + * @param numShards + */ + private static void distribShardsSetUp(int numShards){ + if (numShards <= 0) { + return; + } + + StringBuilder shardWhitelistBuilder = new StringBuilder(); + for (int i = 0; i < numShards; i++) + { + shardWhitelistBuilder.append("127.0.0.1:").append(jettyPort).append(JETTY_CONTEXT).append("/" + SHARD_NAME_PREFIX + i).append(','); + } + shardWhitelistBuilder.deleteCharAt(shardWhitelistBuilder.length() - 1); + System.setProperty("solr.shardsWhitelist", shardWhitelistBuilder.toString()); } public static void distribTearDown() @@ -276,7 +302,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 { Path jettySolrHome = testDir.toPath().resolve(jettyKey); seedSolrHome(jettySolrHome); - return createJetty(jettySolrHome.toFile(), null, null, false, 0, getSchemaFile(), basicAuth); + return createJetty(jettySolrHome.toFile(), null, null, false, jettyPort, getSchemaFile(), basicAuth); } } @@ -365,7 +391,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 Properties props = new Properties(); props.putAll(additionalProperties); - final String shardname = "shard" + i; + final String shardname = SHARD_NAME_PREFIX + i; props.put("shard.instance", Integer.toString(i)); props.put("shard.count", Integer.toString(numShards)); @@ -469,10 +495,10 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 if(basicAuth) { LOGGER.info("###### adding basic auth ######"); - config = JettyConfig.builder().setContext("/solr").setPort(port).withFilter(BasicAuthFilter.class, "/sql/*").stopAtShutdown(true).withSSLConfig(sslConfig).build(); + config = JettyConfig.builder().setContext(JETTY_CONTEXT).setPort(port).withFilter(BasicAuthFilter.class, "/sql/*").stopAtShutdown(true).withSSLConfig(sslConfig).build(); } else { LOGGER.info("###### no basic auth ######"); - config = JettyConfig.builder().setContext("/solr").setPort(port).stopAtShutdown(true).withSSLConfig(sslConfig).build(); + config = JettyConfig.builder().setContext(JETTY_CONTEXT).setPort(port).stopAtShutdown(true).withSSLConfig(sslConfig).build(); } return new JettySolrRunner(solrHome.getAbsolutePath(), props, config); @@ -514,7 +540,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 protected static String buildUrl(int port) { - return buildUrl(port, "/solr"); + return buildUrl(port, JETTY_CONTEXT); } protected static String getSolrXml() @@ -577,7 +603,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 } public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) - throws IOException, ServletException + throws IOException, ServletException { //Parse the basic auth filter String auth = ((HttpServletRequest)request).getHeader("Authorization"); From df627dd61c0564180b0a85af7e8aa9721c8e4b1d Mon Sep 17 00:00:00 2001 From: mstrankowski Date: Tue, 11 Jun 2024 21:01:36 +0200 Subject: [PATCH 2/6] Revert "ACS-7921: Add a default property value for solr.shardsWhitelist to the test - this should apply the setting to all HandlerFactories" This reverts commit 3e07921ce78fe3c9fe15cbede6fc249a4f245a56. --- .../org/alfresco/solr/SolrITInitializer.java | 70 ++++++------------- 1 file changed, 22 insertions(+), 48 deletions(-) diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java index 0f8b6f78b..24d744f00 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java @@ -4,21 +4,21 @@ * %% * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is * provided under the following open source license terms: - * + * * Alfresco is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * Alfresco is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public License * along with Alfresco. If not, see . * #L% @@ -100,8 +100,6 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 protected static final int DEFAULT_CONNECTION_TIMEOUT1 = DEFAULT_CONNECTION_TIMEOUT; protected static final int CLIENT_SO_TIMEOUT = 90000; protected final static int INDEX_TIMEOUT = 100000; - protected static final String JETTY_CONTEXT = "/solr"; - protected static final String SHARD_NAME_PREFIX = "shard"; private static AtomicInteger nodeCnt; protected static boolean useExplicitNodeNames; @@ -109,17 +107,16 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 public static Properties DEFAULT_CORE_PROPS = new Properties(); protected static Map jettyContainers; - protected static int jettyPort; protected static Map solrCollectionNameToStandaloneClient; protected static List solrShards; protected static List clientShards; protected static String shards; protected static String[] shardsArr; protected static File testDir; - + //Standalone Tests protected static SolrCore defaultCore; - + protected static final String id = "id"; @@ -138,11 +135,11 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 { DEFAULT_CORE_PROPS.setProperty("alfresco.commitInterval", "1000"); DEFAULT_CORE_PROPS.setProperty("alfresco.newSearcherInterval", "2000"); - + System.setProperty("alfresco.test", "true"); System.setProperty("solr.tests.maxIndexingThreads", "10"); System.setProperty("solr.tests.ramBufferSizeMB", "1024"); - + testDir = new File(System.getProperty("user.dir") + "/target/jettys"); } @@ -153,24 +150,20 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 { testClassName = testClassName + "_" + System.currentTimeMillis(); - if (numShards > 0) { - jettyPort = getNextAvailablePort(); - } solrcoreProperties = addExplicitShardingProperty(solrcoreProperties); clientShards = new ArrayList<>(); solrShards = new ArrayList<>(); solrCollectionNameToStandaloneClient = new HashMap<>(); jettyContainers = new HashMap<>(); - + nodeCnt = new AtomicInteger(0); //currentTestName = testClassName; String[] coreNames = new String[]{DEFAULT_TEST_CORENAME}; - + distribSetUp(testClassName); - distribShardsSetUp(numShards); RandomSupplier.RandVal.uniqueValues = new HashSet<>(); // reset random values @@ -196,7 +189,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 public static void initSingleSolrServer(String testClassName, Properties solrcoreProperties) throws Throwable { initSolrServers(0,testClassName,solrcoreProperties); - + JettySolrRunner jsr = jettyContainers.get(testClassName); CoreContainer coreContainer = jsr.getCoreContainer(); AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler(); @@ -236,7 +229,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 LOGGER.error("Failed to shutdown test properly ", e); } } - + /** * Subclasses can override this to change a test's solr home (default is in * test-files) @@ -245,34 +238,15 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 { return System.getProperty("user.dir") + "/target/test-classes/test-files"; } - + public static void distribSetUp(String serverName) { SolrTestCaseJ4.resetExceptionIgnores(); // ignore anything with - // ignore_exception in it + // ignore_exception in it System.setProperty("solr.test.sys.prop1", "propone"); System.setProperty("solr.test.sys.prop2", "proptwo"); System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockDirectoryFactory"); System.setProperty("solr.log.dir", testDir.toPath().resolve(serverName).toString()); - - } - - /** - * Needed to test fix for CVE-2017-3164 - * @param numShards - */ - private static void distribShardsSetUp(int numShards){ - if (numShards <= 0) { - return; - } - - StringBuilder shardWhitelistBuilder = new StringBuilder(); - for (int i = 0; i < numShards; i++) - { - shardWhitelistBuilder.append("127.0.0.1:").append(jettyPort).append(JETTY_CONTEXT).append("/" + SHARD_NAME_PREFIX + i).append(','); - } - shardWhitelistBuilder.deleteCharAt(shardWhitelistBuilder.length() - 1); - System.setProperty("solr.shardsWhitelist", shardWhitelistBuilder.toString()); } public static void distribTearDown() @@ -302,7 +276,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 { Path jettySolrHome = testDir.toPath().resolve(jettyKey); seedSolrHome(jettySolrHome); - return createJetty(jettySolrHome.toFile(), null, null, false, jettyPort, getSchemaFile(), basicAuth); + return createJetty(jettySolrHome.toFile(), null, null, false, 0, getSchemaFile(), basicAuth); } } @@ -391,7 +365,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 Properties props = new Properties(); props.putAll(additionalProperties); - final String shardname = SHARD_NAME_PREFIX + i; + final String shardname = "shard" + i; props.put("shard.instance", Integer.toString(i)); props.put("shard.count", Integer.toString(numShards)); @@ -495,10 +469,10 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 if(basicAuth) { LOGGER.info("###### adding basic auth ######"); - config = JettyConfig.builder().setContext(JETTY_CONTEXT).setPort(port).withFilter(BasicAuthFilter.class, "/sql/*").stopAtShutdown(true).withSSLConfig(sslConfig).build(); + config = JettyConfig.builder().setContext("/solr").setPort(port).withFilter(BasicAuthFilter.class, "/sql/*").stopAtShutdown(true).withSSLConfig(sslConfig).build(); } else { LOGGER.info("###### no basic auth ######"); - config = JettyConfig.builder().setContext(JETTY_CONTEXT).setPort(port).stopAtShutdown(true).withSSLConfig(sslConfig).build(); + config = JettyConfig.builder().setContext("/solr").setPort(port).stopAtShutdown(true).withSSLConfig(sslConfig).build(); } return new JettySolrRunner(solrHome.getAbsolutePath(), props, config); @@ -540,7 +514,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 protected static String buildUrl(int port) { - return buildUrl(port, JETTY_CONTEXT); + return buildUrl(port, "/solr"); } protected static String getSolrXml() @@ -603,7 +577,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 } public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) - throws IOException, ServletException + throws IOException, ServletException { //Parse the basic auth filter String auth = ((HttpServletRequest)request).getHeader("Authorization"); From 1430053bbf801e627e334c9670c5e02684cb0f26 Mon Sep 17 00:00:00 2001 From: mstrankowski Date: Tue, 11 Jun 2024 21:08:14 +0200 Subject: [PATCH 3/6] Re-add changes to avoid whitespace chaos in PR --- .../org/alfresco/solr/SolrITInitializer.java | 37 ++++++++++++++++--- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java index 24d744f00..cb5d6e750 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java @@ -100,6 +100,8 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 protected static final int DEFAULT_CONNECTION_TIMEOUT1 = DEFAULT_CONNECTION_TIMEOUT; protected static final int CLIENT_SO_TIMEOUT = 90000; protected final static int INDEX_TIMEOUT = 100000; + protected static final String JETTY_CONTEXT = "/solr"; + protected static final String SHARD_NAME_PREFIX = "shard"; private static AtomicInteger nodeCnt; protected static boolean useExplicitNodeNames; @@ -107,6 +109,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 public static Properties DEFAULT_CORE_PROPS = new Properties(); protected static Map jettyContainers; + protected static int jettyPort; protected static Map solrCollectionNameToStandaloneClient; protected static List solrShards; protected static List clientShards; @@ -150,6 +153,9 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 { testClassName = testClassName + "_" + System.currentTimeMillis(); + if (numShards > 0) { + jettyPort = getNextAvailablePort(); + } solrcoreProperties = addExplicitShardingProperty(solrcoreProperties); clientShards = new ArrayList<>(); @@ -164,6 +170,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 String[] coreNames = new String[]{DEFAULT_TEST_CORENAME}; distribSetUp(testClassName); + distribShardsSetUp(numShards); RandomSupplier.RandVal.uniqueValues = new HashSet<>(); // reset random values @@ -249,6 +256,24 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 System.setProperty("solr.log.dir", testDir.toPath().resolve(serverName).toString()); } + /** + * Needed to test fix for CVE-2017-3164 + * @param numShards + */ + private static void distribShardsSetUp(int numShards){ + if (numShards <= 0) { + return; + } + + StringBuilder shardWhitelistBuilder = new StringBuilder(); + for (int i = 0; i < numShards; i++) + { + shardWhitelistBuilder.append("127.0.0.1:").append(jettyPort).append(JETTY_CONTEXT).append("/" + SHARD_NAME_PREFIX + i).append(','); + } + shardWhitelistBuilder.deleteCharAt(shardWhitelistBuilder.length() - 1); + System.setProperty("solr.shardsWhitelist", shardWhitelistBuilder.toString()); + } + public static void distribTearDown() { System.clearProperty("solr.directoryFactory"); @@ -276,7 +301,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 { Path jettySolrHome = testDir.toPath().resolve(jettyKey); seedSolrHome(jettySolrHome); - return createJetty(jettySolrHome.toFile(), null, null, false, 0, getSchemaFile(), basicAuth); + return createJetty(jettySolrHome.toFile(), null, null, false, jettyPort, getSchemaFile(), basicAuth); } } @@ -365,7 +390,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 Properties props = new Properties(); props.putAll(additionalProperties); - final String shardname = "shard" + i; + final String shardname = SHARD_NAME_PREFIX + i; props.put("shard.instance", Integer.toString(i)); props.put("shard.count", Integer.toString(numShards)); @@ -396,7 +421,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 for (int i = 0; i < numShards; i++) { if (sb.length() > 0) sb.append(','); - final String shardname = "shard" + i; + final String shardname = SHARD_NAME_PREFIX + i; String shardStr = buildUrl(solr.getLocalPort()) + "/" + shardname; LOGGER.info(shardStr); SolrClient clientShard = createNewSolrClient(shardStr); @@ -469,10 +494,10 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 if(basicAuth) { LOGGER.info("###### adding basic auth ######"); - config = JettyConfig.builder().setContext("/solr").setPort(port).withFilter(BasicAuthFilter.class, "/sql/*").stopAtShutdown(true).withSSLConfig(sslConfig).build(); + config = JettyConfig.builder().setContext(JETTY_CONTEXT).setPort(port).withFilter(BasicAuthFilter.class, "/sql/*").stopAtShutdown(true).withSSLConfig(sslConfig).build(); } else { LOGGER.info("###### no basic auth ######"); - config = JettyConfig.builder().setContext("/solr").setPort(port).stopAtShutdown(true).withSSLConfig(sslConfig).build(); + config = JettyConfig.builder().setContext(JETTY_CONTEXT).setPort(port).stopAtShutdown(true).withSSLConfig(sslConfig).build(); } return new JettySolrRunner(solrHome.getAbsolutePath(), props, config); @@ -514,7 +539,7 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 protected static String buildUrl(int port) { - return buildUrl(port, "/solr"); + return buildUrl(port, JETTY_CONTEXT); } protected static String getSolrXml() From b64ac112de6daab3b870e52fb829174c9912592a Mon Sep 17 00:00:00 2001 From: mstrankowski Date: Thu, 13 Jun 2024 12:28:54 +0200 Subject: [PATCH 4/6] Solr-fork version update containing fix to shardsWhitelists --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 54d34a630..322036a8b 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 11 6.6.5 - ${solr.base.version}-patched.16 + ${solr.base.version}-patched.17 From f2556f63a048e7c49de8b310152d749d5d979457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Fri, 14 Jun 2024 09:33:56 +0200 Subject: [PATCH 5/6] ACS-7921 Use latest solr --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 322036a8b..9df65ced5 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 11 6.6.5 - ${solr.base.version}-patched.17 + ${solr.base.version}-patched.18 From a21ea2f22ccb9c36d2480cb54f307201fe8bcf56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Fri, 14 Jun 2024 10:01:56 +0200 Subject: [PATCH 6/6] ACS-7921 Use latest solr --- .../src/main/resources/licenses/notice.txt | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt index 8d7c44b58..344b0bd83 100644 --- a/search-services/packaging/src/main/resources/licenses/notice.txt +++ b/search-services/packaging/src/main/resources/licenses/notice.txt @@ -183,28 +183,28 @@ jsonic-1.2.7.jar jul-to-slf4j-1.7.7.jar juniversalchardet-1.0.3.jar langdetect-1.1-20120112.jar -lucene-analyzers-common-6.6.5-patched.16.jar -lucene-analyzers-icu-6.6.5-patched.16.jar -lucene-analyzers-kuromoji-6.6.5-patched.16.jar -lucene-analyzers-morfologik-6.6.5-patched.16.jar -lucene-analyzers-phonetic-6.6.5-patched.16.jar -lucene-analyzers-smartcn-6.6.5-patched.16.jar -lucene-analyzers-stempel-6.6.5-patched.16.jar -lucene-backward-codecs-6.6.5-patched.16.jar -lucene-classification-6.6.5-patched.16.jar -lucene-codecs-6.6.5-patched.16.jar -lucene-core-6.6.5-patched.16.jar -lucene-expressions-6.6.5-patched.16.jar -lucene-grouping-6.6.5-patched.16.jar -lucene-highlighter-6.6.5-patched.16.jar -lucene-join-6.6.5-patched.16.jar -lucene-memory-6.6.5-patched.16.jar -lucene-misc-6.6.5-patched.16.jar -lucene-queries-6.6.5-patched.16.jar -lucene-queryparser-6.6.5-patched.16.jar -lucene-sandbox-6.6.5-patched.16.jar -lucene-spatial-extras-6.6.5-patched.16.jar -lucene-suggest-6.6.5-patched.16.jar +lucene-analyzers-common-6.6.5-patched.18.jar +lucene-analyzers-icu-6.6.5-patched.18.jar +lucene-analyzers-kuromoji-6.6.5-patched.18.jar +lucene-analyzers-morfologik-6.6.5-patched.18.jar +lucene-analyzers-phonetic-6.6.5-patched.18.jar +lucene-analyzers-smartcn-6.6.5-patched.18.jar +lucene-analyzers-stempel-6.6.5-patched.18.jar +lucene-backward-codecs-6.6.5-patched.18.jar +lucene-classification-6.6.5-patched.18.jar +lucene-codecs-6.6.5-patched.18.jar +lucene-core-6.6.5-patched.18.jar +lucene-expressions-6.6.5-patched.18.jar +lucene-grouping-6.6.5-patched.18.jar +lucene-highlighter-6.6.5-patched.18.jar +lucene-join-6.6.5-patched.18.jar +lucene-memory-6.6.5-patched.18.jar +lucene-misc-6.6.5-patched.18.jar +lucene-queries-6.6.5-patched.18.jar +lucene-queryparser-6.6.5-patched.18.jar +lucene-sandbox-6.6.5-patched.18.jar +lucene-spatial-extras-6.6.5-patched.18.jar +lucene-suggest-6.6.5-patched.18.jar metrics-core-3.2.2.jar metrics-ganglia-3.2.2.jar metrics-graphite-3.2.2.jar @@ -218,11 +218,11 @@ protobuf-java-3.23.4.jar rome-1.5.1.jar slf4j-api-1.7.7.jar slf4j-log4j12-1.7.7.jar -solr-analysis-extras-6.6.5-patched.16.jar -solr-clustering-6.6.5-patched.16.jar -solr-core-6.6.5-patched.16.jar -solr-langid-6.6.5-patched.16.jar -solr-solrj-6.6.5-patched.16.jar +solr-analysis-extras-6.6.5-patched.18.jar +solr-clustering-6.6.5-patched.18.jar +solr-core-6.6.5-patched.18.jar +solr-langid-6.6.5-patched.18.jar +solr-solrj-6.6.5-patched.18.jar spatial4j-0.6.jar start.jar stax2-api-3.1.4.jar