From 502427e852ab03cb6a3d611f530ef64618f734c9 Mon Sep 17 00:00:00 2001 From: cezary-witkowski Date: Thu, 28 Aug 2025 11:31:18 +0200 Subject: [PATCH] [ACS-9933] Use only lang3 3.18 in 23.N (#3547) Signed-off-by: cezary-witkowski --- .../org/alfresco/rest/rm/community/util/DockerHelper.java | 2 +- .../rest/rm/community/records/AddRelationshipTests.java | 2 +- .../smoke/DispositionScheduleLinkedRecordsTest.java | 2 +- amps/share-services/pom.xml | 4 ++-- .../org/alfresco/repo/web/scripts/wiki/WikiPageGet.java | 4 ++-- .../org/alfresco/repo/web/scripts/wiki/WikiRestApiTest.java | 6 +++--- .../distribution/src/main/resources/licenses/notice.txt | 3 +-- .../test/java/org/alfresco/cmis/SecondaryTypesTests.java | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- pom.xml | 6 +++--- repository/pom.xml | 5 ----- .../identityservice/IdentityServiceFacadeFactoryBean.java | 2 +- .../AbstractIdentityServiceAuthenticator.java | 2 +- 13 files changed, 18 insertions(+), 24 deletions(-) diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/DockerHelper.java b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/DockerHelper.java index ea7c2710b6..ff4829a0d3 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/DockerHelper.java +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/DockerHelper.java @@ -45,7 +45,7 @@ import com.github.dockerjava.netty.NettyDockerCmdExecFactory; import lombok.Getter; import lombok.Setter; import org.alfresco.utility.Utility; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.SystemUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/AddRelationshipTests.java b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/AddRelationshipTests.java index 71368c2475..658f5f1d8f 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/AddRelationshipTests.java +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/AddRelationshipTests.java @@ -42,7 +42,7 @@ import org.alfresco.rest.v0.RMRolesAndActionsAPI; import org.alfresco.rest.v0.RecordsAPI; import org.alfresco.rest.v0.RecordCategoriesAPI; import org.alfresco.test.AlfrescoTest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.testng.annotations.Test; diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java index cd71890cfc..ee6bdd37f8 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java @@ -44,7 +44,7 @@ import org.alfresco.rest.v0.service.DispositionScheduleService; import org.alfresco.test.AlfrescoTest; import org.alfresco.utility.model.RepoTestModel; import org.alfresco.utility.model.UserModel; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index ef6a153520..7a07a5e321 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -51,8 +51,8 @@ - commons-lang - commons-lang + org.apache.commons + commons-lang3 provided diff --git a/amps/share-services/src/main/java/org/alfresco/repo/web/scripts/wiki/WikiPageGet.java b/amps/share-services/src/main/java/org/alfresco/repo/web/scripts/wiki/WikiPageGet.java index 3c043e74b4..c3f3d95524 100644 --- a/amps/share-services/src/main/java/org/alfresco/repo/web/scripts/wiki/WikiPageGet.java +++ b/amps/share-services/src/main/java/org/alfresco/repo/web/scripts/wiki/WikiPageGet.java @@ -30,7 +30,7 @@ import java.util.regex.Pattern; import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.wiki.WikiPageInfo; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.json.simple.JSONObject; import org.springframework.extensions.webscripts.Cache; import org.springframework.extensions.webscripts.Status; @@ -92,7 +92,7 @@ public class WikiPageGet extends AbstractWikiWebScript { links.add(link); // build the list of available pages - WikiPageInfo wikiPage = wikiService.getWikiPage(site.getShortName(), StringEscapeUtils.unescapeHtml(link)); + WikiPageInfo wikiPage = wikiService.getWikiPage(site.getShortName(), StringEscapeUtils.unescapeHtml4(link)); if (wikiPage != null) { pageTitles.add(wikiPage.getTitle()); diff --git a/amps/share-services/src/test/java/org/alfresco/repo/web/scripts/wiki/WikiRestApiTest.java b/amps/share-services/src/test/java/org/alfresco/repo/web/scripts/wiki/WikiRestApiTest.java index 60733b3dab..d4acdd0360 100644 --- a/amps/share-services/src/test/java/org/alfresco/repo/web/scripts/wiki/WikiRestApiTest.java +++ b/amps/share-services/src/test/java/org/alfresco/repo/web/scripts/wiki/WikiRestApiTest.java @@ -45,7 +45,7 @@ import org.alfresco.service.cmr.wiki.WikiPageInfo; import org.alfresco.service.cmr.wiki.WikiService; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.PropertyMap; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONArray; @@ -996,7 +996,7 @@ public class WikiRestApiTest extends BaseWebScriptTest String link = m.group(1); link += "?title="; WikiPageInfo wikiPage2 = this.wikiService.getWikiPage(SITE_SHORT_NAME_WIKI, link); - WikiPageInfo wikiPage1 = this.wikiService.getWikiPage(SITE_SHORT_NAME_WIKI, StringEscapeUtils.unescapeHtml(link)); + WikiPageInfo wikiPage1 = this.wikiService.getWikiPage(SITE_SHORT_NAME_WIKI, StringEscapeUtils.unescapeHtml4(link)); assertEquals(wikiPage2, wikiPage1); } @@ -1006,4 +1006,4 @@ public class WikiRestApiTest extends BaseWebScriptTest this.wikiService.deleteWikiPage(wikiPageNew); } } -} \ No newline at end of file +} diff --git a/packaging/distribution/src/main/resources/licenses/notice.txt b/packaging/distribution/src/main/resources/licenses/notice.txt index 291b511332..ddb14e97e3 100644 --- a/packaging/distribution/src/main/resources/licenses/notice.txt +++ b/packaging/distribution/src/main/resources/licenses/notice.txt @@ -36,8 +36,7 @@ commons-email http://jakarta.apache.org/commons/ commons-fileupload http://jakarta.apache.org/commons/ commons-httpclient http://jakarta.apache.org/commons/ commons-io http://jakarta.apache.org/commons/ -commons-jxpath http://jakarta.apache.org/commons/ -commons-lang http://jakarta.apache.org/commons/ +commons-jxpath http://jakarta.apache.org/commons/ commons-lang3 http://jakarta.apache.org/commons/ commons-logging http://jakarta.apache.org/commons/ commons-net http://jakarta.apache.org/commons/ diff --git a/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/SecondaryTypesTests.java b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/SecondaryTypesTests.java index 3a7176271d..4c222b01d2 100644 --- a/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/SecondaryTypesTests.java +++ b/packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/SecondaryTypesTests.java @@ -16,7 +16,7 @@ import org.alfresco.utility.testrail.annotation.TestRail; import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException; import org.apache.chemistry.opencmis.commons.exceptions.CmisPermissionDeniedException; import org.apache.chemistry.opencmis.commons.exceptions.CmisUnauthorizedException; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 8ca1e53dc8..4d48277e74 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -17,7 +17,7 @@ UTF-8 master 4.5.6 - 3.17.0 + 3.18.0 8.3.3 17 diff --git a/pom.xml b/pom.xml index d63623b54b..c1a0ab9ddd 100644 --- a/pom.xml +++ b/pom.xml @@ -417,9 +417,9 @@ 1.17.1 - commons-lang - commons-lang - 2.6 + org.apache.commons + commons-lang3 + 3.18.0 commons-io diff --git a/repository/pom.xml b/repository/pom.xml index 0b5731bba3..30396602f3 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -94,7 +94,6 @@ org.apache.commons commons-lang3 - 3.18.0 commons-codec @@ -742,10 +741,6 @@ reflections test - - commons-lang - commons-lang - diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java index 0879296fcf..957ce85a6c 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBean.java @@ -74,7 +74,7 @@ import com.nimbusds.oauth2.sdk.id.Identifier; import com.nimbusds.oauth2.sdk.id.Issuer; import com.nimbusds.openid.connect.sdk.claims.PersonClaims; import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hc.client5.http.classic.HttpClient; diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/authentication/AbstractIdentityServiceAuthenticator.java b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/authentication/AbstractIdentityServiceAuthenticator.java index 616ae6f34e..09fa49a15e 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/authentication/AbstractIdentityServiceAuthenticator.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/authentication/AbstractIdentityServiceAuthenticator.java @@ -42,7 +42,7 @@ import jakarta.servlet.http.HttpServletResponse; import com.nimbusds.oauth2.sdk.Scope; import com.nimbusds.oauth2.sdk.id.Identifier; import com.nimbusds.oauth2.sdk.id.State; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.oauth2.client.registration.ClientRegistration;