From 9f42b4767b783d66a8418066b535eccb6b93efed Mon Sep 17 00:00:00 2001 From: "Damian.Ujma@hyland.com" Date: Thu, 28 Jul 2022 12:32:32 +0200 Subject: [PATCH 01/10] ACS-3348 Upgrade to Java 17 (cherry picked from commit 789099dac09584fa2dd764b599d34700d53a9ba8) --- search-services/packaging/src/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/packaging/src/docker/Dockerfile b/search-services/packaging/src/docker/Dockerfile index 4e0785436..f4d0d58c8 100644 --- a/search-services/packaging/src/docker/Dockerfile +++ b/search-services/packaging/src/docker/Dockerfile @@ -1,6 +1,6 @@ # Alfresco Search Services ${project.version} Docker Image -FROM alfresco/alfresco-base-java:11.0.13-centos-7@sha256:c1e399d1bbb5d08e0905f1a9ef915ee7c5ea0c0ede11cc9bd7ca98532a9b27fa +FROM alfresco/alfresco-base-java:jre17-rockylinux8 LABEL creator="Alfresco" maintainer="Alfresco" ENV DIST_DIR /opt/alfresco-search-services From 8aa0150007c83c57626b63d1a0d3141a7c30454c Mon Sep 17 00:00:00 2001 From: "Damian.Ujma@hyland.com" Date: Thu, 28 Jul 2022 13:41:40 +0200 Subject: [PATCH 02/10] ACS-3348 Upgrade jacoco-maven-plugin version to support Java 17 (cherry picked from commit d1daa85dbe9bee2d68d787fb3efc7af8f58e6ec8) --- search-services/alfresco-search/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index ec18e34b3..8a487c190 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -478,6 +478,7 @@ org.jacoco jacoco-maven-plugin + 0.8.8 **/AnnotationWriter.* From 71fa8fd49762d49c6244bce1111989e50229aa9d Mon Sep 17 00:00:00 2001 From: "Damian.Ujma@hyland.com" Date: Fri, 29 Jul 2022 11:46:00 +0200 Subject: [PATCH 03/10] ACS-3348 Remove unrecognized VM options (cherry picked from commit 69c22f5e0bd918089dc97127cd3cc19aa8544974) --- search-services/alfresco-search/pom.xml | 2 +- search-services/packaging/config.properties | 1 + search-services/packaging/pom.xml | 3 +++ search-services/packaging/src/docker/Dockerfile | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index 8a487c190..db6ae99c3 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -478,7 +478,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.8 **/AnnotationWriter.* diff --git a/search-services/packaging/config.properties b/search-services/packaging/config.properties index 24a6a3984..b2def0508 100644 --- a/search-services/packaging/config.properties +++ b/search-services/packaging/config.properties @@ -4,6 +4,7 @@ alfresco.search.logs=SOLR_LOGS_DIR=../../logs\ ${line.separator}LOG4J_PROPS=$SOLR_LOGS_DIR/log4j.properties alfresco.gc.logs=GC_LOG_OPTS="" alfresco.gc.logs.win=REM set "GC_LOG_OPTS= " +alfresco.gc.tune=GC_TUNE="-XX:NewRatio=3 -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=8 -XX:ConcGCThreads=4 -XX:ParallelGCThreads=4 -XX:PretenureSizeThreshold=64m -XX:+ParallelRefProcEnabled -XX:-OmitStackTraceInFastThrow" alfresco.search.logs.win=set SOLR_LOGS_DIR=..\\..\\logs\ ${line.separator}set LOG4J_CONFIG=file:!SOLR_LOGS_DIR!\\log4j.properties alfresco.search.config=# Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\ diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index 1bbe17912..1293051c8 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -214,6 +214,9 @@ + + + diff --git a/search-services/packaging/src/docker/Dockerfile b/search-services/packaging/src/docker/Dockerfile index f4d0d58c8..c5acae104 100644 --- a/search-services/packaging/src/docker/Dockerfile +++ b/search-services/packaging/src/docker/Dockerfile @@ -1,6 +1,6 @@ # Alfresco Search Services ${project.version} Docker Image -FROM alfresco/alfresco-base-java:jre17-rockylinux8 +FROM alfresco/alfresco-base-java:jre17-rockylinux8-202207110835 LABEL creator="Alfresco" maintainer="Alfresco" ENV DIST_DIR /opt/alfresco-search-services From ecb66f09ca42810c059160a5eff2eb8538d213ee Mon Sep 17 00:00:00 2001 From: "Damian.Ujma@hyland.com" Date: Fri, 29 Jul 2022 12:32:31 +0200 Subject: [PATCH 04/10] ACS-3348 Open java.lang for reflective access (cherry picked from commit 518285afaf9a0f1eb76fcf9498dd1864902e58cd) --- e2e-test/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/e2e-test/pom.xml b/e2e-test/pom.xml index 603c8d7cc..2faf7684a 100644 --- a/e2e-test/pom.xml +++ b/e2e-test/pom.xml @@ -32,6 +32,9 @@ ${test.exclude} ${test.include} true + + --add-opens=java.base/java.lang=ALL-UNNAMED + From a6d50cd3eebf046359b750ea651c017dd3545c73 Mon Sep 17 00:00:00 2001 From: "Damian.Ujma@hyland.com" Date: Fri, 29 Jul 2022 14:22:03 +0200 Subject: [PATCH 05/10] ACS-3348 Use G1 instead of CMS (cherry picked from commit 789a62bb7e53267a4f2b6fe0ef42bdb7d85f8fb4) --- search-services/packaging/config.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/packaging/config.properties b/search-services/packaging/config.properties index b2def0508..c8d949147 100644 --- a/search-services/packaging/config.properties +++ b/search-services/packaging/config.properties @@ -4,7 +4,7 @@ alfresco.search.logs=SOLR_LOGS_DIR=../../logs\ ${line.separator}LOG4J_PROPS=$SOLR_LOGS_DIR/log4j.properties alfresco.gc.logs=GC_LOG_OPTS="" alfresco.gc.logs.win=REM set "GC_LOG_OPTS= " -alfresco.gc.tune=GC_TUNE="-XX:NewRatio=3 -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=8 -XX:ConcGCThreads=4 -XX:ParallelGCThreads=4 -XX:PretenureSizeThreshold=64m -XX:+ParallelRefProcEnabled -XX:-OmitStackTraceInFastThrow" +alfresco.gc.tune=GC_TUNE="-XX:+UseG1GC -XX:+PerfDisableSharedMem -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=250 -XX:+UseLargePages -XX:+AlwaysPreTouch -XX:+ExplicitGCInvokesConcurrent" alfresco.search.logs.win=set SOLR_LOGS_DIR=..\\..\\logs\ ${line.separator}set LOG4J_CONFIG=file:!SOLR_LOGS_DIR!\\log4j.properties alfresco.search.config=# Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\ From 323de2e138d9e10b6e88513eea031ab464deecc3 Mon Sep 17 00:00:00 2001 From: "Damian.Ujma@hyland.com" Date: Fri, 29 Jul 2022 16:02:55 +0200 Subject: [PATCH 06/10] ACS-3348 Use G1 instead of CMS (win) (cherry picked from commit a3bf5495182aad5887af6579fd01a6b9459888ec) --- search-services/packaging/config.properties | 1 + search-services/packaging/pom.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/search-services/packaging/config.properties b/search-services/packaging/config.properties index c8d949147..a4c162486 100644 --- a/search-services/packaging/config.properties +++ b/search-services/packaging/config.properties @@ -5,6 +5,7 @@ ${line.separator}LOG4J_PROPS=$SOLR_LOGS_DIR/log4j.properties alfresco.gc.logs=GC_LOG_OPTS="" alfresco.gc.logs.win=REM set "GC_LOG_OPTS= " alfresco.gc.tune=GC_TUNE="-XX:+UseG1GC -XX:+PerfDisableSharedMem -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=250 -XX:+UseLargePages -XX:+AlwaysPreTouch -XX:+ExplicitGCInvokesConcurrent" +alfresco.gc.tune.win=set GC_TUNE=-XX:+UseG1GC -XX:+PerfDisableSharedMem -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=250 -XX:+UseLargePages -XX:+AlwaysPreTouch -XX:+ExplicitGCInvokesConcurrent alfresco.search.logs.win=set SOLR_LOGS_DIR=..\\..\\logs\ ${line.separator}set LOG4J_CONFIG=file:!SOLR_LOGS_DIR!\\log4j.properties alfresco.search.config=# Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\ diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index 1293051c8..8ae960179 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -217,6 +217,9 @@ + + + From 0f36989a6c9c9fe6fb2b7ff160e1ed3cf9b8539e Mon Sep 17 00:00:00 2001 From: Domenico Sibilio Date: Thu, 23 Jun 2022 12:28:41 +0200 Subject: [PATCH 07/10] ACS-3193 Upgrade Mockito to 4.6.1 --- search-services/alfresco-search/pom.xml | 2 +- .../search/impl/lucene/analysis/MLAnalayserTest.java | 8 ++++---- .../highlight/LanguagePrefixedTokenStreamTest.java | 1 - .../java/org/alfresco/solr/tracker/DBIDRouterTest.java | 2 -- .../java/org/alfresco/solr/tracker/ModelTrackerIT.java | 10 ++++------ .../java/org/alfresco/solr/tracker/TrackerJobTest.java | 4 ++-- search-services/alfresco-solrclient-lib/pom.xml | 2 +- 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml index db6ae99c3..874830fbc 100644 --- a/search-services/alfresco-search/pom.xml +++ b/search-services/alfresco-search/pom.xml @@ -253,7 +253,7 @@ org.mockito mockito-core - 3.4.6 + 4.6.1 test diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java index e38000599..6c38214eb 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java @@ -27,8 +27,8 @@ package org.alfresco.repo.search.impl.lucene.analysis; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import java.io.IOException; @@ -50,8 +50,8 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.Mockito; +import org.mockito.junit.MockitoJUnitRunner; /** * Retrofitted tests for the {@link MLAnalayser} class. These diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/schema/highlight/LanguagePrefixedTokenStreamTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/schema/highlight/LanguagePrefixedTokenStreamTest.java index 87968bb54..b4f817729 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/schema/highlight/LanguagePrefixedTokenStreamTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/schema/highlight/LanguagePrefixedTokenStreamTest.java @@ -35,7 +35,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import java.io.IOException; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DBIDRouterTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DBIDRouterTest.java index 1de135a26..fdd765632 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DBIDRouterTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DBIDRouterTest.java @@ -30,8 +30,6 @@ import static java.util.Arrays.stream; import static java.util.stream.IntStream.range; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.when; import static org.alfresco.solr.AlfrescoSolrUtils.randomPositiveInteger; import static org.alfresco.solr.AlfrescoSolrUtils.randomShardCountGreaterThanOne; diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java index 69ec1f7c0..fd0bea182 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java @@ -27,10 +27,8 @@ package org.alfresco.solr.tracker; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -60,8 +58,8 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class ModelTrackerIT diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/TrackerJobTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/TrackerJobTest.java index 0146e5a79..53291b484 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/TrackerJobTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/TrackerJobTest.java @@ -32,8 +32,8 @@ import static org.mockito.Mockito.when; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.quartz.JobDataMap; import org.quartz.JobDetail; import org.quartz.JobExecutionContext; diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index 45314853d..80c5043f8 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -75,7 +75,7 @@ org.mockito mockito-core - 3.8.0 + 4.6.1 test From e0e651322fb87bf22749bd58f8d2539844ac016f Mon Sep 17 00:00:00 2001 From: Domenico Sibilio Date: Thu, 23 Jun 2022 12:43:33 +0200 Subject: [PATCH 08/10] ACS-3193 isNull(Class) has been removed (cherry picked from commit cfb56f33d1e7116eaa5e0661e3a11a506a405929) --- .../java/org/alfresco/solr/tracker/MetadataTrackerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/MetadataTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/MetadataTrackerTest.java index c678160e6..f2bb3c22c 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/MetadataTrackerTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/MetadataTrackerTest.java @@ -127,7 +127,7 @@ public class MetadataTrackerTest // Subsequent calls to getTransactions must return a different set of transactions to avoid an infinite loop when(repositoryClient.getTransactions(anyLong(), anyLong(), anyLong(), anyLong(), anyInt())).thenReturn(txs) .thenReturn(txs).thenReturn(mock(Transactions.class)); - when(repositoryClient.getTransactions(anyLong(), anyLong(), anyLong(), anyLong(), anyInt(), isNull(ShardState.class))).thenReturn(txs) + when(repositoryClient.getTransactions(anyLong(), anyLong(), anyLong(), anyLong(), anyInt(), isNull())).thenReturn(txs) .thenReturn(txs).thenReturn(mock(Transactions.class)); when(repositoryClient.getTransactions(anyLong(), anyLong(), anyLong(), anyLong(), anyInt(), any(ShardState.class))).thenReturn(txs) .thenReturn(txs).thenReturn(mock(Transactions.class)); @@ -157,7 +157,7 @@ public class MetadataTrackerTest List txsList = new ArrayList<>(); when(txs.getTransactions()).thenReturn(txsList); - when(repositoryClient.getTransactions(anyLong(), anyLong(), anyLong(), anyLong(), anyInt(), isNull(ShardState.class))).thenReturn(txs); + when(repositoryClient.getTransactions(anyLong(), anyLong(), anyLong(), anyLong(), anyInt(), isNull())).thenReturn(txs); when(repositoryClient.getTransactions(anyLong(), anyLong(), anyLong(), anyLong(), anyInt(), any(ShardState.class))).thenReturn(txs); when(repositoryClient.getTransactions(anyLong(), anyLong(), anyLong(), anyLong(), anyInt())).thenReturn(txs); From bcebe2440948f4df1a5608cbe606fbc3c1f1c269 Mon Sep 17 00:00:00 2001 From: Domenico Sibilio Date: Thu, 23 Jun 2022 13:05:34 +0200 Subject: [PATCH 09/10] ACS-3193 Update license headers (cherry picked from commit 2c689207800dfe544f16b91fce41fe56be111799) --- .../repo/search/impl/lucene/analysis/MLAnalayserTest.java | 8 ++++---- .../schema/highlight/LanguagePrefixedTokenStreamTest.java | 2 +- .../java/org/alfresco/solr/tracker/DBIDRouterTest.java | 2 +- .../org/alfresco/solr/tracker/MetadataTrackerTest.java | 2 +- .../java/org/alfresco/solr/tracker/ModelTrackerIT.java | 8 ++++---- .../java/org/alfresco/solr/tracker/TrackerJobTest.java | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java index 6c38214eb..941827ada 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/repo/search/impl/lucene/analysis/MLAnalayserTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Search Services * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -27,8 +27,8 @@ package org.alfresco.repo.search.impl.lucene.analysis; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.mockito.ArgumentMatchers.any; +import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import java.io.IOException; @@ -50,7 +50,7 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.Mockito; +import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; /** diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/schema/highlight/LanguagePrefixedTokenStreamTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/schema/highlight/LanguagePrefixedTokenStreamTest.java index b4f817729..afeef92ac 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/schema/highlight/LanguagePrefixedTokenStreamTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/schema/highlight/LanguagePrefixedTokenStreamTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Search Services * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DBIDRouterTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DBIDRouterTest.java index fdd765632..cb353c76a 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DBIDRouterTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DBIDRouterTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Search Services * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/MetadataTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/MetadataTrackerTest.java index f2bb3c22c..7466a2576 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/MetadataTrackerTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/MetadataTrackerTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Search Services * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java index fd0bea182..757b7ed2c 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java @@ -2,7 +2,7 @@ * #%L * Alfresco Search Services * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -27,8 +27,8 @@ package org.alfresco.solr.tracker; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.*; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -58,7 +58,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; +import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/TrackerJobTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/TrackerJobTest.java index 53291b484..af8dfe943 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/TrackerJobTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/TrackerJobTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Search Services * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -32,8 +32,8 @@ import static org.mockito.Mockito.when; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.quartz.JobDataMap; import org.quartz.JobDetail; import org.quartz.JobExecutionContext; From bb784855844beb63faafb50e7e1b1daf46310604 Mon Sep 17 00:00:00 2001 From: "ebihara.yuki" Date: Sat, 22 Aug 2020 14:27:15 +0900 Subject: [PATCH 10/10] Change deprecated class. (cherry picked from commit c994242b49ce20479ed763dd81c68e01455b9bb9) --- .../solr/client/SOLRAPIClientFactoryTest.java | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/search-services/alfresco-solrclient-lib/src/test/java/org/alfresco/solr/client/SOLRAPIClientFactoryTest.java b/search-services/alfresco-solrclient-lib/src/test/java/org/alfresco/solr/client/SOLRAPIClientFactoryTest.java index b10bd10ac..fccc36ed6 100644 --- a/search-services/alfresco-solrclient-lib/src/test/java/org/alfresco/solr/client/SOLRAPIClientFactoryTest.java +++ b/search-services/alfresco-solrclient-lib/src/test/java/org/alfresco/solr/client/SOLRAPIClientFactoryTest.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Search Services - * %% - * 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 - * 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% - */ +/* + * #%L + * Alfresco Search Services + * %% + * 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 + * 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% + */ package org.alfresco.solr.client; @@ -41,7 +41,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class SOLRAPIClientFactoryTest