From 40015025cd1c5f60365dace7c3dfd8b779d52731 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 16 May 2023 14:04:25 +0800 Subject: [PATCH 01/24] LPS-150272 Performance, avoid get token in the loop --- .../check/LibraryVulnerabilitiesCheck.java | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java index bfc4688df4e345..c00b75f3990d5c 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java @@ -95,6 +95,12 @@ protected String doProcess( return content; } + _getGithubAccessToken(sourceFormatterArgs); + + if (Validator.isNull(_githubAccessToken)) { + return content; + } + if (fileName.endsWith(".gradle")) { _checkGradleLibraryVulnerabilities(fileName, absolutePath, content); } @@ -428,24 +434,6 @@ private void _checkVulnerabilities( if (!_cachedVulnerableVersionMap.containsKey( securityAdvisoryEcosystemEnum + ":" + packageName)) { - SourceProcessor sourceProcessor = getSourceProcessor(); - - SourceFormatterArgs sourceFormatterArgs = - sourceProcessor.getSourceFormatterArgs(); - - if (sourceFormatterArgs.isUseCiGithubAccessToken() || - _isGenerateVulnerableLibrariesCacheFile()) { - - _githubAccessToken = _getCiGithubAccessToken(); - } - else { - _githubAccessToken = _getLocalGithubAccessToken(); - } - - if (Validator.isNull(_githubAccessToken)) { - return; - } - _generateVulnerableVersionMap( packageName, securityAdvisoryEcosystemEnum, getAttributeValues(_SEVERITIES_KEY, absolutePath)); @@ -546,6 +534,24 @@ private String _getCiGithubAccessToken() throws Exception { return properties.getProperty("github.access.token"); } + private synchronized void _getGithubAccessToken( + SourceFormatterArgs sourceFormatterArgs) + throws Exception { + + if (Validator.isNotNull(_githubAccessToken)) { + return; + } + + if (sourceFormatterArgs.isUseCiGithubAccessToken() || + _isGenerateVulnerableLibrariesCacheFile()) { + + _githubAccessToken = _getCiGithubAccessToken(); + } + else { + _githubAccessToken = _getLocalGithubAccessToken(); + } + } + private String _getLocalGithubAccessToken() throws Exception { File file = getPortalDir(); From 52de2d7bfee69aa0fcc87941df2217fa0fe878d1 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 16 May 2023 14:08:32 +0800 Subject: [PATCH 02/24] LPS-150272 Simply --- .../source/formatter/check/LibraryVulnerabilitiesCheck.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java index c00b75f3990d5c..9fd9e7b2dbc2f0 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java @@ -146,11 +146,7 @@ private void _checkGradleLibraryVulnerabilities( gradleDependencies.addAll(gradleBuildFile.getBuildScriptDependencies()); - Iterator iterator = gradleDependencies.iterator(); - - while (iterator.hasNext()) { - GradleDependency gradleDependency = iterator.next(); - + for (GradleDependency gradleDependency : gradleDependencies) { String gradleDependencyGroup = gradleDependency.getGroup(); String gradleDependencyName = gradleDependency.getName(); String gradleDependencyVersion = gradleDependency.getVersion(); From 93d640b9aa8f196018bc9cda865cc2093bf0b9ac Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 16 May 2023 16:30:27 +0800 Subject: [PATCH 03/24] LPS-150272 Do not throw exception --- .../check/LibraryVulnerabilitiesCheck.java | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java index 9fd9e7b2dbc2f0..859578933660b3 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java @@ -32,8 +32,6 @@ import com.liferay.source.formatter.util.GradleDependency; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.OutputStream; import java.io.StringReader; @@ -509,7 +507,7 @@ private synchronized String _getCachedKnownVulnerabilities() return _cachedKnownVulnerabilities; } - private String _getCiGithubAccessToken() throws Exception { + private String _getCiGithubAccessToken() { Properties properties = new Properties(); try { @@ -559,26 +557,20 @@ private String _getLocalGithubAccessToken() throws Exception { file.getAbsolutePath(), _BUILD_PROPERTIES_FILE_NAME); if (!buildPropertiesFile.exists()) { - throw new FileNotFoundException( - StringBundler.concat( - _BUILD_PROPERTIES_FILE_NAME, - " does not exist, place your github access token in ", - "'github.access.token' in ", file.getCanonicalPath(), "/", - _BUILD_PROPERTIES_FILE_NAME)); + return null; } Properties properties = new Properties(); - properties.load(new FileInputStream(buildPropertiesFile)); + properties.load(Files.newInputStream(buildPropertiesFile.toPath())); return properties.getProperty("github.access.token"); } private List _getSecurityVulnerabilityNodes( - String packageName, String cursor, - SecurityAdvisoryEcosystemEnum securityAdvisoryEcosystemEnum, - List severities, String githubToken) - throws Exception { + String packageName, String cursor, + SecurityAdvisoryEcosystemEnum securityAdvisoryEcosystemEnum, + List severities, String githubToken) { HttpClientBuilder httpClientBuilder = HttpClientBuilder.create(); @@ -617,10 +609,7 @@ private List _getSecurityVulnerabilityNodes( StatusLine statusLine = closeableHttpResponse.getStatusLine(); if (statusLine.getStatusCode() != HttpStatus.SC_OK) { - throw new Exception( - "Unable to access GitHub GraphQL API, check " + - "'github.asscess.token' in " + - _BUILD_PROPERTIES_FILE_NAME); + return Collections.emptyList(); } JSONObject jsonObject = new JSONObjectImpl( @@ -690,6 +679,9 @@ private List _getSecurityVulnerabilityNodes( return securityVulnerabilityNodes; } } + catch (Exception exception) { + _log.error(exception); + } return Collections.emptyList(); } From 34edbee33de4a66ff1b8adfa702b40f0c01e6f93 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Wed, 17 May 2023 11:58:31 +0800 Subject: [PATCH 04/24] Revert "Temp disable LibraryVulnerabilitiesCheck.enabled. A bad network call stops the whole release process" This reverts commit 76e14687d5092de177692df3ad37f333c879a511. --- source-formatter.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source-formatter.properties b/source-formatter.properties index 2c721310f5d203..c3c9c3c43840df 100644 --- a/source-formatter.properties +++ b/source-formatter.properties @@ -758,7 +758,7 @@ source.check.LanguageKeysCheck.portalLanguagePropertiesFileName=\ modules/apps/portal-language/portal-language-lang/src/main/resources/content/Language.properties - source.check.LibraryVulnerabilitiesCheck.enabled=false + source.check.LibraryVulnerabilitiesCheck.enabled=true # # Input a list of comma delimited severities that are allowed to call From 540720239dcecbee4f5481632b1ae314b0019e32 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Wed, 17 May 2023 16:07:24 +0800 Subject: [PATCH 05/24] LPS-150272 Check cache is necessary --- .../check/LibraryVulnerabilitiesCheck.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java index 859578933660b3..f4ab746bf279fb 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/LibraryVulnerabilitiesCheck.java @@ -93,11 +93,7 @@ protected String doProcess( return content; } - _getGithubAccessToken(sourceFormatterArgs); - - if (Validator.isNull(_githubAccessToken)) { - return content; - } + _githubAccessToken = _getGithubAccessToken(sourceFormatterArgs); if (fileName.endsWith(".gradle")) { _checkGradleLibraryVulnerabilities(fileName, absolutePath, content); @@ -425,6 +421,10 @@ private void _checkVulnerabilities( } } + if (Validator.isNull(_githubAccessToken)) { + return; + } + if (!_cachedVulnerableVersionMap.containsKey( securityAdvisoryEcosystemEnum + ":" + packageName)) { @@ -528,12 +528,12 @@ private String _getCiGithubAccessToken() { return properties.getProperty("github.access.token"); } - private synchronized void _getGithubAccessToken( + private synchronized String _getGithubAccessToken( SourceFormatterArgs sourceFormatterArgs) throws Exception { if (Validator.isNotNull(_githubAccessToken)) { - return; + return _githubAccessToken; } if (sourceFormatterArgs.isUseCiGithubAccessToken() || @@ -544,6 +544,8 @@ private synchronized void _getGithubAccessToken( else { _githubAccessToken = _getLocalGithubAccessToken(); } + + return _githubAccessToken; } private String _getLocalGithubAccessToken() throws Exception { From f8bb8911909ba2e49a803540dd3c26a96c0595c9 Mon Sep 17 00:00:00 2001 From: Alan Huang Date: Fri, 19 May 2023 10:47:13 +0800 Subject: [PATCH 06/24] LPS-150272 Regen Maven plugin descriptors --- .../com.liferay/com.liferay.source.formatter/plugin-help.xml | 2 +- .../src/main/resources/META-INF/maven/plugin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/util/source-formatter/src/main/resources/META-INF/maven/com.liferay/com.liferay.source.formatter/plugin-help.xml b/modules/util/source-formatter/src/main/resources/META-INF/maven/com.liferay/com.liferay.source.formatter/plugin-help.xml index 1e1c3c2253b510..c240b33c2fc337 100644 --- a/modules/util/source-formatter/src/main/resources/META-INF/maven/com.liferay/com.liferay.source.formatter/plugin-help.xml +++ b/modules/util/source-formatter/src/main/resources/META-INF/maven/com.liferay/com.liferay.source.formatter/plugin-help.xml @@ -7,7 +7,7 @@ com.liferay com.liferay.source.formatter - 1.0.1310 + 1.0.1311 source-formatter diff --git a/modules/util/source-formatter/src/main/resources/META-INF/maven/plugin.xml b/modules/util/source-formatter/src/main/resources/META-INF/maven/plugin.xml index 5d7a191bd7f4ac..906e7b64e36342 100644 --- a/modules/util/source-formatter/src/main/resources/META-INF/maven/plugin.xml +++ b/modules/util/source-formatter/src/main/resources/META-INF/maven/plugin.xml @@ -7,7 +7,7 @@ com.liferay com.liferay.source.formatter - 1.0.1310 + 1.0.1311 source-formatter false true From 3ac290222d417c69559729b2b49a1d154696cc52 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Fri, 19 May 2023 11:53:49 +0100 Subject: [PATCH 07/24] LPS-150272 prep next --- .../util/source-formatter/artifact.properties | 12 ++++++------ modules/etl/talend/pom.xml | 2 +- .../gradle-plugins-source-formatter/README.markdown | 2 +- .../sdk/gradle-plugins-source-formatter/build.gradle | 2 +- .../plugins/dependencies/portal-tools.properties | 2 +- modules/util/source-formatter/bnd.bnd | 2 +- modules/util/source-formatter/samples/pom.xml | 2 +- .../com.liferay.source.formatter/ivy.xml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/.releng/util/source-formatter/artifact.properties b/modules/.releng/util/source-formatter/artifact.properties index 07c2d0803583f9..faddb4501ec7b0 100644 --- a/modules/.releng/util/source-formatter/artifact.properties +++ b/modules/.releng/util/source-formatter/artifact.properties @@ -1,6 +1,6 @@ -artifact.git.id=eb2aec42a7d43ee393bc56b149517e7b0c96e558 -artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1310/com.liferay.source.formatter-1.0.1310-sources-commercial.jar -artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1310/com.liferay.source.formatter-1.0.1310-sources.jar -artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1310/com.liferay.source.formatter-1.0.1310.tar -artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1310/com.liferay.source.formatter-1.0.1310.jar -artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1310/com.liferay.source.formatter-1.0.1310.zip \ No newline at end of file +artifact.git.id=f8bb8911909ba2e49a803540dd3c26a96c0595c9 +artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1311/com.liferay.source.formatter-1.0.1311-sources-commercial.jar +artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1311/com.liferay.source.formatter-1.0.1311-sources.jar +artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1311/com.liferay.source.formatter-1.0.1311.tar +artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1311/com.liferay.source.formatter-1.0.1311.jar +artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1311/com.liferay.source.formatter-1.0.1311.zip \ No newline at end of file diff --git a/modules/etl/talend/pom.xml b/modules/etl/talend/pom.xml index e9c363f375a835..03f4dbd6ee3a66 100644 --- a/modules/etl/talend/pom.xml +++ b/modules/etl/talend/pom.xml @@ -111,7 +111,7 @@ com.liferay com.liferay.source.formatter - 1.0.1310 + 1.0.1311 diff --git a/modules/sdk/gradle-plugins-source-formatter/README.markdown b/modules/sdk/gradle-plugins-source-formatter/README.markdown index 459e808f843878..f70771c47f8e08 100644 --- a/modules/sdk/gradle-plugins-source-formatter/README.markdown +++ b/modules/sdk/gradle-plugins-source-formatter/README.markdown @@ -126,7 +126,7 @@ manually adding a dependency to the `sourceFormatter` configuration: ```gradle dependencies { - sourceFormatter group: "com.liferay", name: "com.liferay.source.formatter", version: "1.0.1310" + sourceFormatter group: "com.liferay", name: "com.liferay.source.formatter", version: "1.0.1311" } ``` diff --git a/modules/sdk/gradle-plugins-source-formatter/build.gradle b/modules/sdk/gradle-plugins-source-formatter/build.gradle index c6cd3a68276758..33c464acfd5c6a 100644 --- a/modules/sdk/gradle-plugins-source-formatter/build.gradle +++ b/modules/sdk/gradle-plugins-source-formatter/build.gradle @@ -21,7 +21,7 @@ dependencies { compile group: "com.liferay", name: "com.liferay.gradle.util", version: "1.0.47" compileOnly fileTree(builtBy: [rootProject.tasks.getByName("extractGradleApi" + gradleVersion.replace(".", ""))], dir: new File(rootProject.buildDir, "gradle-${gradleVersion}")) - compileOnly group: "com.liferay", name: "com.liferay.source.formatter", version: "1.0.1310" + compileOnly group: "com.liferay", name: "com.liferay.source.formatter", version: "1.0.1311" } gradleTest { diff --git a/modules/sdk/gradle-plugins/src/main/resources/com/liferay/gradle/plugins/dependencies/portal-tools.properties b/modules/sdk/gradle-plugins/src/main/resources/com/liferay/gradle/plugins/dependencies/portal-tools.properties index 2bbabc9a4c80b3..734d8b45af3385 100644 --- a/modules/sdk/gradle-plugins/src/main/resources/com/liferay/gradle/plugins/dependencies/portal-tools.properties +++ b/modules/sdk/gradle-plugins/src/main/resources/com/liferay/gradle/plugins/dependencies/portal-tools.properties @@ -10,6 +10,6 @@ com.liferay.portal.tools.rest.builder=1.0.306 com.liferay.portal.tools.service.builder=1.0.451 com.liferay.portal.tools.upgrade.table.builder=1.0.11 com.liferay.portal.tools.wsdd.builder=1.0.15 -com.liferay.source.formatter=1.0.1310 +com.liferay.source.formatter=1.0.1311 com.liferay.tld.formatter=1.0.7 com.liferay.whip=1.0.3 \ No newline at end of file diff --git a/modules/util/source-formatter/bnd.bnd b/modules/util/source-formatter/bnd.bnd index b791082ab40f2c..48f687f7e1f433 100644 --- a/modules/util/source-formatter/bnd.bnd +++ b/modules/util/source-formatter/bnd.bnd @@ -1,6 +1,6 @@ Bundle-Name: Liferay Source Formatter Bundle-SymbolicName: com.liferay.source.formatter -Bundle-Version: 1.0.1311 +Bundle-Version: 1.0.1312 Import-Package:\ !javax.portlet,\ \ diff --git a/modules/util/source-formatter/samples/pom.xml b/modules/util/source-formatter/samples/pom.xml index 4310fd4671ee00..c103a92139a406 100644 --- a/modules/util/source-formatter/samples/pom.xml +++ b/modules/util/source-formatter/samples/pom.xml @@ -16,7 +16,7 @@ com.liferay com.liferay.source.formatter - 1.0.1310 + 1.0.1311 src/main diff --git a/tools/sdk/dependencies/com.liferay.source.formatter/ivy.xml b/tools/sdk/dependencies/com.liferay.source.formatter/ivy.xml index eb0cb414aaea46..37c6e5a9cf4af9 100644 --- a/tools/sdk/dependencies/com.liferay.source.formatter/ivy.xml +++ b/tools/sdk/dependencies/com.liferay.source.formatter/ivy.xml @@ -11,6 +11,6 @@ - + \ No newline at end of file From f3d41bb658ec8dc5d67ad37cd38acef925d77c26 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Fri, 19 May 2023 03:59:12 -0700 Subject: [PATCH 08/24] LPS-150272 prep next --- .../gradle-plugins-source-formatter/artifact.properties | 8 ++++---- .../util/source-formatter-standalone/artifact.properties | 8 ++++---- .../sdk/gradle-plugins-source-formatter/README.markdown | 2 +- modules/sdk/gradle-plugins-source-formatter/bnd.bnd | 2 +- modules/sdk/gradle-plugins-workspace/build.gradle | 2 +- modules/sdk/gradle-plugins/build.gradle | 2 +- modules/util/source-formatter-standalone/bnd.bnd | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/.releng/sdk/gradle-plugins-source-formatter/artifact.properties b/modules/.releng/sdk/gradle-plugins-source-formatter/artifact.properties index e74ee106e0dbcb..7743c1fb1d577e 100644 --- a/modules/.releng/sdk/gradle-plugins-source-formatter/artifact.properties +++ b/modules/.releng/sdk/gradle-plugins-source-formatter/artifact.properties @@ -1,4 +1,4 @@ -artifact.git.id=eb2aec42a7d43ee393bc56b149517e7b0c96e558 -artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.23/com.liferay.gradle.plugins.source.formatter-5.2.23-javadoc.jar -artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.23/com.liferay.gradle.plugins.source.formatter-5.2.23-sources.jar -artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.23/com.liferay.gradle.plugins.source.formatter-5.2.23.jar \ No newline at end of file +artifact.git.id=3ac290222d417c69559729b2b49a1d154696cc52 +artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.24/com.liferay.gradle.plugins.source.formatter-5.2.24-javadoc.jar +artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.24/com.liferay.gradle.plugins.source.formatter-5.2.24-sources.jar +artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.2.24/com.liferay.gradle.plugins.source.formatter-5.2.24.jar \ No newline at end of file diff --git a/modules/.releng/util/source-formatter-standalone/artifact.properties b/modules/.releng/util/source-formatter-standalone/artifact.properties index 913f741449aff9..daf61844812dc4 100644 --- a/modules/.releng/util/source-formatter-standalone/artifact.properties +++ b/modules/.releng/util/source-formatter-standalone/artifact.properties @@ -1,4 +1,4 @@ -artifact.git.id=eb2aec42a7d43ee393bc56b149517e7b0c96e558 -artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter.standalone/1.0.22/com.liferay.source.formatter.standalone-1.0.22.tar -artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter.standalone/1.0.22/com.liferay.source.formatter.standalone-1.0.22.jar -artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter.standalone/1.0.22/com.liferay.source.formatter.standalone-1.0.22.zip \ No newline at end of file +artifact.git.id=3ac290222d417c69559729b2b49a1d154696cc52 +artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter.standalone/1.0.23/com.liferay.source.formatter.standalone-1.0.23.tar +artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter.standalone/1.0.23/com.liferay.source.formatter.standalone-1.0.23.jar +artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter.standalone/1.0.23/com.liferay.source.formatter.standalone-1.0.23.zip \ No newline at end of file diff --git a/modules/sdk/gradle-plugins-source-formatter/README.markdown b/modules/sdk/gradle-plugins-source-formatter/README.markdown index f70771c47f8e08..3833809c00cc07 100644 --- a/modules/sdk/gradle-plugins-source-formatter/README.markdown +++ b/modules/sdk/gradle-plugins-source-formatter/README.markdown @@ -13,7 +13,7 @@ To use the plugin, include it in your build script: ```gradle buildscript { dependencies { - classpath group: "com.liferay", name: "com.liferay.gradle.plugins.source.formatter", version: "5.2.23" + classpath group: "com.liferay", name: "com.liferay.gradle.plugins.source.formatter", version: "5.2.24" } repositories { diff --git a/modules/sdk/gradle-plugins-source-formatter/bnd.bnd b/modules/sdk/gradle-plugins-source-formatter/bnd.bnd index 5bdc6d1c4447af..feb755763deed7 100644 --- a/modules/sdk/gradle-plugins-source-formatter/bnd.bnd +++ b/modules/sdk/gradle-plugins-source-formatter/bnd.bnd @@ -1,6 +1,6 @@ Bundle-Description: The Source Formatter Gradle plugin lets you format project files using the Liferay Source Formatter tool. Bundle-Name: Liferay Gradle Plugins Source Formatter Bundle-SymbolicName: com.liferay.gradle.plugins.source.formatter -Bundle-Version: 5.2.24 +Bundle-Version: 5.2.25 Export-Package: com.liferay.gradle.plugins.source.formatter -includeresource: @com.liferay.source.formatter-*.jar!/com/liferay/source/formatter/SourceFormatterArgs.class \ No newline at end of file diff --git a/modules/sdk/gradle-plugins-workspace/build.gradle b/modules/sdk/gradle-plugins-workspace/build.gradle index d2eb5fd34c3649..7a988234653a2d 100644 --- a/modules/sdk/gradle-plugins-workspace/build.gradle +++ b/modules/sdk/gradle-plugins-workspace/build.gradle @@ -138,7 +138,7 @@ dependencies { compile(group: "com.liferay", name: "com.liferay.gradle.plugins.poshi.runner", version: "3.0.68") { exclude group: "biz.aQute.bnd", module: "biz.aQute.bnd" } - compile group: "com.liferay", name: "com.liferay.gradle.plugins.source.formatter", version: "5.2.23" + compile group: "com.liferay", name: "com.liferay.gradle.plugins.source.formatter", version: "5.2.24" compile group: "com.liferay", name: "com.liferay.gradle.plugins.target.platform", version: "3.0.10" compile(group: "com.liferay", name: "com.liferay.gradle.plugins.theme.builder", version: "2.0.23") { exclude group: "biz.aQute.bnd", module: "biz.aQute.bnd" diff --git a/modules/sdk/gradle-plugins/build.gradle b/modules/sdk/gradle-plugins/build.gradle index 646a665bee6a26..40590e07f6a553 100644 --- a/modules/sdk/gradle-plugins/build.gradle +++ b/modules/sdk/gradle-plugins/build.gradle @@ -52,7 +52,7 @@ dependencies { compile group: "com.liferay", name: "com.liferay.gradle.plugins.python", version: "1.0.1" compile group: "com.liferay", name: "com.liferay.gradle.plugins.rest.builder", version: "1.1.183" compile group: "com.liferay", name: "com.liferay.gradle.plugins.service.builder", version: "4.0.123" - compile group: "com.liferay", name: "com.liferay.gradle.plugins.source.formatter", version: "5.2.23" + compile group: "com.liferay", name: "com.liferay.gradle.plugins.source.formatter", version: "5.2.24" compile group: "com.liferay", name: "com.liferay.gradle.plugins.test.integration", version: "4.0.0" compile group: "com.liferay", name: "com.liferay.gradle.plugins.tld.formatter", version: "1.0.13" compile group: "com.liferay", name: "com.liferay.gradle.plugins.tlddoc.builder", version: "2.0.0" diff --git a/modules/util/source-formatter-standalone/bnd.bnd b/modules/util/source-formatter-standalone/bnd.bnd index f8b664050bde06..a9b21d05087fe3 100644 --- a/modules/util/source-formatter-standalone/bnd.bnd +++ b/modules/util/source-formatter-standalone/bnd.bnd @@ -1,4 +1,4 @@ Bundle-Name: Liferay Source Formatter Standalone Bundle-SymbolicName: com.liferay.source.formatter.standalone -Bundle-Version: 1.0.23 +Bundle-Version: 1.0.24 Main-Class: com.liferay.source.formatter.SourceFormatter \ No newline at end of file From a26e8d90bf5efc51b7268b5f867496a3032d2782 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Fri, 19 May 2023 04:01:44 -0700 Subject: [PATCH 09/24] LPS-150272 prep next --- .../sdk/gradle-plugins-defaults/artifact.properties | 10 +++++----- modules/.releng/sdk/gradle-plugins/artifact.properties | 10 +++++----- modules/build-buildscript.gradle | 2 +- modules/sdk/gradle-plugins-defaults/bnd.bnd | 2 +- modules/sdk/gradle-plugins-defaults/build.gradle | 2 +- .../src/gradleTest/resolveMissing/build.gradle | 2 +- .../src/gradleTest/resolveMulti/build.gradle | 2 +- .../src/gradleTest/resolveMultiExclude/build.gradle | 2 +- .../src/gradleTest/resolveSingle/build.gradle | 2 +- .../targetPlatformDefaultDependencies/build.gradle | 2 +- .../src/gradleTest/targetPlatformTheme/build.gradle | 2 +- modules/sdk/gradle-plugins-workspace/build.gradle | 2 +- modules/sdk/gradle-plugins/bnd.bnd | 2 +- portal-web/build-test.gradle | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/.releng/sdk/gradle-plugins-defaults/artifact.properties b/modules/.releng/sdk/gradle-plugins-defaults/artifact.properties index b4bbb2b80496ba..cd80ea10885c37 100644 --- a/modules/.releng/sdk/gradle-plugins-defaults/artifact.properties +++ b/modules/.releng/sdk/gradle-plugins-defaults/artifact.properties @@ -1,5 +1,5 @@ -artifact.git.id=0b1abceccb85ba5f51bf108d9e5d1001920509f8 -artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/8.1.9/com.liferay.gradle.plugins.defaults-8.1.9-javadoc.jar -artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/8.1.9/com.liferay.gradle.plugins.defaults-8.1.9-sources-commercial.jar -artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/8.1.9/com.liferay.gradle.plugins.defaults-8.1.9-sources.jar -artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/8.1.9/com.liferay.gradle.plugins.defaults-8.1.9.jar \ No newline at end of file +artifact.git.id=f3d41bb658ec8dc5d67ad37cd38acef925d77c26 +artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/8.1.10/com.liferay.gradle.plugins.defaults-8.1.10-javadoc.jar +artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/8.1.10/com.liferay.gradle.plugins.defaults-8.1.10-sources-commercial.jar +artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/8.1.10/com.liferay.gradle.plugins.defaults-8.1.10-sources.jar +artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/8.1.10/com.liferay.gradle.plugins.defaults-8.1.10.jar \ No newline at end of file diff --git a/modules/.releng/sdk/gradle-plugins/artifact.properties b/modules/.releng/sdk/gradle-plugins/artifact.properties index d7185c703e450f..c282ba74748319 100644 --- a/modules/.releng/sdk/gradle-plugins/artifact.properties +++ b/modules/.releng/sdk/gradle-plugins/artifact.properties @@ -1,5 +1,5 @@ -artifact.git.id=0b1abceccb85ba5f51bf108d9e5d1001920509f8 -artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.130/com.liferay.gradle.plugins-14.0.130-javadoc.jar -artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.130/com.liferay.gradle.plugins-14.0.130-sources-commercial.jar -artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.130/com.liferay.gradle.plugins-14.0.130-sources.jar -artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.130/com.liferay.gradle.plugins-14.0.130.jar \ No newline at end of file +artifact.git.id=f3d41bb658ec8dc5d67ad37cd38acef925d77c26 +artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.131/com.liferay.gradle.plugins-14.0.131-javadoc.jar +artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.131/com.liferay.gradle.plugins-14.0.131-sources-commercial.jar +artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.131/com.liferay.gradle.plugins-14.0.131-sources.jar +artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.131/com.liferay.gradle.plugins-14.0.131.jar \ No newline at end of file diff --git a/modules/build-buildscript.gradle b/modules/build-buildscript.gradle index 04fa24bd90720e..7fb5fbebf47aa0 100644 --- a/modules/build-buildscript.gradle +++ b/modules/build-buildscript.gradle @@ -1,5 +1,5 @@ dependencies { - classpath group: "com.liferay", name: "com.liferay.gradle.plugins.defaults", version: "8.1.9" + classpath group: "com.liferay", name: "com.liferay.gradle.plugins.defaults", version: "8.1.10" classpath group: "com.liferay", name: "com.liferay.gradle.plugins.maven.plugin.builder", version: "2.0.0" classpath group: "de.undercouch", name: "gradle-download-task", version: "3.3.0" classpath group: "gradle.plugin.org.ysb33r.gradle", name: "gradletest", version: "2.0" diff --git a/modules/sdk/gradle-plugins-defaults/bnd.bnd b/modules/sdk/gradle-plugins-defaults/bnd.bnd index 3d674054df9e84..126027b9594474 100644 --- a/modules/sdk/gradle-plugins-defaults/bnd.bnd +++ b/modules/sdk/gradle-plugins-defaults/bnd.bnd @@ -1,6 +1,6 @@ Bundle-Name: Liferay Gradle Plugins Defaults Bundle-SymbolicName: com.liferay.gradle.plugins.defaults -Bundle-Version: 8.1.10 +Bundle-Version: 8.1.11 Export-Package:\ com.liferay.gradle.plugins.defaults,\ com.liferay.gradle.plugins.defaults.extensions,\ diff --git a/modules/sdk/gradle-plugins-defaults/build.gradle b/modules/sdk/gradle-plugins-defaults/build.gradle index cbbf257b62cea6..ef912efcaaedcb 100644 --- a/modules/sdk/gradle-plugins-defaults/build.gradle +++ b/modules/sdk/gradle-plugins-defaults/build.gradle @@ -18,7 +18,7 @@ copyGradleTestDependencies { dependencies { compile group: "com.github.jk1", name: "gradle-license-report", version: "1.8" compile group: "com.gradle.publish", name: "plugin-publish-plugin", version: "0.11.0" - compile group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.130" + compile group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.131" compile group: "com.liferay", name: "com.liferay.gradle.plugins.app.javadoc.builder", version: "1.2.4" compile group: "com.liferay", name: "com.liferay.gradle.plugins.baseline", version: "7.0.0" compile group: "com.liferay", name: "com.liferay.gradle.plugins.cache", version: "1.0.18" diff --git a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveMissing/build.gradle b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveMissing/build.gradle index c765dfc4e25e88..8708314e1f4235 100644 --- a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveMissing/build.gradle +++ b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveMissing/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath(group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.130") { + classpath(group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.131") { exclude group: "biz.aQute.bnd", module: "biz.aQute.bnd" exclude group: "com.liferay", module: "com.liferay.gradle.util" } diff --git a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveMulti/build.gradle b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveMulti/build.gradle index 8f6dc47de1729a..118622ce1906c6 100644 --- a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveMulti/build.gradle +++ b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveMulti/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath(group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.130") { + classpath(group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.131") { exclude group: "com.liferay", module: "com.liferay.gradle.util" } } diff --git a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveMultiExclude/build.gradle b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveMultiExclude/build.gradle index 9a98d35163471d..13118001ce73d7 100644 --- a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveMultiExclude/build.gradle +++ b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveMultiExclude/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.130" + classpath group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.131" } repositories { diff --git a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveSingle/build.gradle b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveSingle/build.gradle index 28a654c7d9f827..cbe1135aa39ad2 100644 --- a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveSingle/build.gradle +++ b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/resolveSingle/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath(group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.130") { + classpath(group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.131") { exclude group: "biz.aQute.bnd", module: "biz.aQute.bnd" exclude group: "biz.aQute.bnd", module: "biz.aQute.bndlib" exclude group: "biz.aQute.bnd", module: "biz.aQute.gradle" diff --git a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformDefaultDependencies/build.gradle b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformDefaultDependencies/build.gradle index 3af9c05d3dd92f..304396cadb036b 100644 --- a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformDefaultDependencies/build.gradle +++ b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformDefaultDependencies/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath(group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.130") { + classpath(group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.131") { exclude group: "biz.aQute.bnd", module: "biz.aQute.bnd" exclude group: "com.liferay", module: "com.liferay.gradle.util" } diff --git a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformTheme/build.gradle b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformTheme/build.gradle index 986aa976b2fbd4..ed8adfa6feab9b 100644 --- a/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformTheme/build.gradle +++ b/modules/sdk/gradle-plugins-target-platform/src/gradleTest/targetPlatformTheme/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath(group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.130") { + classpath(group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.131") { exclude group: "biz.aQute.bnd", module: "biz.aQute.bnd" } classpath group: "com.liferay", name: "com.liferay.gradle.plugins.theme.builder", version: "2.0.23" diff --git a/modules/sdk/gradle-plugins-workspace/build.gradle b/modules/sdk/gradle-plugins-workspace/build.gradle index 7a988234653a2d..d9ed4108e22b41 100644 --- a/modules/sdk/gradle-plugins-workspace/build.gradle +++ b/modules/sdk/gradle-plugins-workspace/build.gradle @@ -129,7 +129,7 @@ dependencies { compile group: "com.github.docker-java", name: "docker-java", version: "3.2.8" compile group: 'com.google.code.gson', name: 'gson', version: '2.9.0' compile group: "com.liferay", name: "com.liferay.ant.bnd", version: "3.2.9" - compile(group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.130") { + compile(group: "com.liferay", name: "com.liferay.gradle.plugins", version: "14.0.131") { exclude group: "biz.aQute.bnd", module: "biz.aQute.bnd" } compile(group: "com.liferay", name: "com.liferay.gradle.plugins.css.builder", version: "5.0.7") { diff --git a/modules/sdk/gradle-plugins/bnd.bnd b/modules/sdk/gradle-plugins/bnd.bnd index afcf3f3415bd02..65c5b2fe8d242a 100644 --- a/modules/sdk/gradle-plugins/bnd.bnd +++ b/modules/sdk/gradle-plugins/bnd.bnd @@ -1,6 +1,6 @@ Bundle-Name: Liferay Gradle Plugins Bundle-SymbolicName: com.liferay.gradle.plugins -Bundle-Version: 14.0.131 +Bundle-Version: 14.0.132 Export-Package:\ com.liferay.gradle.plugins,\ com.liferay.gradle.plugins.extensions,\ diff --git a/portal-web/build-test.gradle b/portal-web/build-test.gradle index a2ecd9af6ca595..d3aa86504905f7 100644 --- a/portal-web/build-test.gradle +++ b/portal-web/build-test.gradle @@ -9,7 +9,7 @@ import org.gradle.util.GUtil buildscript { dependencies { - classpath group: "com.liferay", name: "com.liferay.gradle.plugins.defaults", version: "8.1.9" + classpath group: "com.liferay", name: "com.liferay.gradle.plugins.defaults", version: "8.1.10" classpath group: "com.liferay", name: "com.liferay.gradle.plugins.maven.plugin.builder", version: "1.2.3" classpath group: "de.undercouch", name: "gradle-download-task", version: "3.3.0" classpath group: "gradle.plugin.org.ysb33r.gradle", name: "gradletest", version: "1.1" From 6cf4cbba8ed52431efc63a7657a1776cda4b422e Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Fri, 19 May 2023 11:59:02 +0100 Subject: [PATCH 10/24] LPS-171159 Bump up because of 7.3.x, see 9ab69968 --- .../dxp/apps/search-experiences/search-experiences-api/bnd.bnd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/dxp/apps/search-experiences/search-experiences-api/bnd.bnd b/modules/dxp/apps/search-experiences/search-experiences-api/bnd.bnd index c08a17cd18e951..1443fb932f4528 100644 --- a/modules/dxp/apps/search-experiences/search-experiences-api/bnd.bnd +++ b/modules/dxp/apps/search-experiences/search-experiences-api/bnd.bnd @@ -1,6 +1,6 @@ Bundle-Name: Liferay Search Experiences API Bundle-SymbolicName: com.liferay.search.experiences.api -Bundle-Version: 24.2.1 +Bundle-Version: 26.0.0 Export-Package:\ com.liferay.search.experiences.blueprint.exception,\ com.liferay.search.experiences.blueprint.parameter,\ From 4c176e695e4fb248e23a9ab2c51d183ada73c608 Mon Sep 17 00:00:00 2001 From: Zsolt Balogh Date: Fri, 19 May 2023 12:52:28 +0200 Subject: [PATCH 11/24] LPS-182230 Provide information about the release tool --- release.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/release.properties b/release.properties index 0d610b9d867f99..39d134e829dc7c 100644 --- a/release.properties +++ b/release.properties @@ -131,6 +131,13 @@ lp.source.dir=${project.dir}/../source +## +## Release Tool +## + + release.tool.dir=ext/7.4.x + release.tool.sha=master + ## ## Sonatype ## From 51da935652195b338df10245352228b02a4ab5ca Mon Sep 17 00:00:00 2001 From: mikellorza Date: Tue, 16 May 2023 09:58:14 +0200 Subject: [PATCH 12/24] LPS-181172 Add configuration --- modules/apps/site/site-api/bnd.bnd | 1 + modules/apps/site/site-api/build.gradle | 3 ++ .../MenuAccessConfiguration.java | 40 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfiguration.java diff --git a/modules/apps/site/site-api/bnd.bnd b/modules/apps/site/site-api/bnd.bnd index e7564f2519b90c..091b47701a875a 100644 --- a/modules/apps/site/site-api/bnd.bnd +++ b/modules/apps/site/site-api/bnd.bnd @@ -2,6 +2,7 @@ Bundle-Name: Liferay Site API Bundle-SymbolicName: com.liferay.site.api Bundle-Version: 16.4.1 Export-Package:\ + com.liferay.site.configuration,\ com.liferay.site.constants,\ com.liferay.site.display.context,\ com.liferay.site.exception,\ diff --git a/modules/apps/site/site-api/build.gradle b/modules/apps/site/site-api/build.gradle index c8e369da9b40d5..b18f68dd837718 100644 --- a/modules/apps/site/site-api/build.gradle +++ b/modules/apps/site/site-api/build.gradle @@ -1,13 +1,16 @@ dependencies { + compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2" compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default" compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default" compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1" compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2" compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0" + compileOnly group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0" compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0" compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0" compileOnly project(":apps:application-list:application-list-api") compileOnly project(":apps:depot:depot-api") + compileOnly project(":apps:static:portal-configuration:portal-configuration-metatype-api") compileOnly project(":core:petra:petra-function") compileOnly project(":core:petra:petra-sql-dsl-api") } \ No newline at end of file diff --git a/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfiguration.java b/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfiguration.java new file mode 100644 index 00000000000000..275ad6d9f5ea38 --- /dev/null +++ b/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfiguration.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2000-present Liferay, Inc. All rights reserved. + * + * This library 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 2.1 of the License, or (at your option) + * any later version. + * + * This library 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. + */ + +package com.liferay.site.configuration; + +import aQute.bnd.annotation.metatype.Meta; + +import com.liferay.portal.configuration.metatype.annotations.ExtendedObjectClassDefinition; + +/** + * @author Mikel Lorza + */ +@ExtendedObjectClassDefinition( + category = "site-configuration", generateUI = false, + scope = ExtendedObjectClassDefinition.Scope.GROUP +) +@Meta.OCD( + id = "com.liferay.site.configuration.MenuAccessConfiguration", + localization = "content/Language" +) +public interface MenuAccessConfiguration { + + @Meta.AD(deflt = "false", required = false) + public boolean showControlMenuByRole(); + + @Meta.AD(deflt = "", required = false) + public String[] roleIdsCanAccessControlMenu(); + +} \ No newline at end of file From 339a3036b20140449293d7f069fa0f9567560e68 Mon Sep 17 00:00:00 2001 From: mikellorza Date: Tue, 16 May 2023 10:38:30 +0200 Subject: [PATCH 13/24] LPS-181172 Add manager to manage configuration values --- .../MenuAccessConfigurationManager.java | 30 +++++++++++ .../MenuAccessConfigurationManagerImpl.java | 54 +++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfigurationManager.java create mode 100644 modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/MenuAccessConfigurationManagerImpl.java diff --git a/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfigurationManager.java b/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfigurationManager.java new file mode 100644 index 00000000000000..bc2aad7162c4e7 --- /dev/null +++ b/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfigurationManager.java @@ -0,0 +1,30 @@ +/** + * Copyright (c) 2000-present Liferay, Inc. All rights reserved. + * + * This library 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 2.1 of the License, or (at your option) + * any later version. + * + * This library 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. + */ + +package com.liferay.site.configuration; + +import org.osgi.annotation.versioning.ProviderType; + +/** + * @author Mikel Lorza + */ +@ProviderType +public interface MenuAccessConfigurationManager { + + public String[] getRoleIdsCanAccessControlMenu(long groupId) + throws Exception; + + public boolean isShowControlMenuByRole(long groupId) throws Exception; + +} \ No newline at end of file diff --git a/modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/MenuAccessConfigurationManagerImpl.java b/modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/MenuAccessConfigurationManagerImpl.java new file mode 100644 index 00000000000000..5980b501cf241f --- /dev/null +++ b/modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/MenuAccessConfigurationManagerImpl.java @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2000-present Liferay, Inc. All rights reserved. + * + * This library 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 2.1 of the License, or (at your option) + * any later version. + * + * This library 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. + */ + +package com.liferay.site.internal.configuration; + +import com.liferay.portal.kernel.module.configuration.ConfigurationProvider; +import com.liferay.site.configuration.MenuAccessConfiguration; +import com.liferay.site.configuration.MenuAccessConfigurationManager; + +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Reference; + +/** + * @author Mikel Lorza + */ +@Component(service = MenuAccessConfigurationManager.class) +public class MenuAccessConfigurationManagerImpl + implements MenuAccessConfigurationManager { + + @Override + public String[] getRoleIdsCanAccessControlMenu(long groupId) + throws Exception { + + MenuAccessConfiguration menuAccessConfiguration = + _configurationProvider.getGroupConfiguration( + MenuAccessConfiguration.class, groupId); + + return menuAccessConfiguration.roleIdsCanAccessControlMenu(); + } + + @Override + public boolean isShowControlMenuByRole(long groupId) throws Exception { + MenuAccessConfiguration menuAccessConfiguration = + _configurationProvider.getGroupConfiguration( + MenuAccessConfiguration.class, groupId); + + return menuAccessConfiguration.showControlMenuByRole(); + } + + @Reference + private ConfigurationProvider _configurationProvider; + +} \ No newline at end of file From 2a43b7b50e1a00baf5b43d723f8217ebfc5a0bd3 Mon Sep 17 00:00:00 2001 From: mikellorza Date: Tue, 16 May 2023 11:15:27 +0200 Subject: [PATCH 14/24] LPS-181172 Hide new configuration using FF LPS-176136 --- ...cessConfigurationVisibilityController.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 modules/apps/site/site-admin-web/src/main/java/com/liferay/site/admin/web/internal/portal/settings/configuration/admin/display/MenuAccessConfigurationVisibilityController.java diff --git a/modules/apps/site/site-admin-web/src/main/java/com/liferay/site/admin/web/internal/portal/settings/configuration/admin/display/MenuAccessConfigurationVisibilityController.java b/modules/apps/site/site-admin-web/src/main/java/com/liferay/site/admin/web/internal/portal/settings/configuration/admin/display/MenuAccessConfigurationVisibilityController.java new file mode 100644 index 00000000000000..22c48914008fd0 --- /dev/null +++ b/modules/apps/site/site-admin-web/src/main/java/com/liferay/site/admin/web/internal/portal/settings/configuration/admin/display/MenuAccessConfigurationVisibilityController.java @@ -0,0 +1,46 @@ +/** + * Copyright (c) 2000-present Liferay, Inc. All rights reserved. + * + * This library 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 2.1 of the License, or (at your option) + * any later version. + * + * This library 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. + */ + +package com.liferay.site.admin.web.internal.portal.settings.configuration.admin.display; + +import com.liferay.configuration.admin.display.ConfigurationVisibilityController; +import com.liferay.portal.configuration.metatype.annotations.ExtendedObjectClassDefinition; +import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil; + +import java.io.Serializable; + +import org.osgi.service.component.annotations.Component; + +/** + * @author Mikel Lorza + */ +@Component( + property = "configuration.pid=com.liferay.site.configuration.MenuAccessConfiguration", + service = ConfigurationVisibilityController.class +) +public class MenuAccessConfigurationVisibilityController + implements ConfigurationVisibilityController { + + @Override + public boolean isVisible( + ExtendedObjectClassDefinition.Scope scope, Serializable scopePK) { + + if (FeatureFlagManagerUtil.isEnabled("LPS-176136")) { + return true; + } + + return false; + } + +} \ No newline at end of file From dcc281de8b6d27b1df91846f55ebe2881557ea63 Mon Sep 17 00:00:00 2001 From: mikellorza Date: Tue, 16 May 2023 11:16:56 +0200 Subject: [PATCH 15/24] LPS-181172 SF --- .../resources/com/liferay/site/configuration/packageinfo | 1 + portal-impl/src/portal.properties | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 modules/apps/site/site-api/src/main/resources/com/liferay/site/configuration/packageinfo diff --git a/modules/apps/site/site-api/src/main/resources/com/liferay/site/configuration/packageinfo b/modules/apps/site/site-api/src/main/resources/com/liferay/site/configuration/packageinfo new file mode 100644 index 00000000000000..e2525561ab2e7b --- /dev/null +++ b/modules/apps/site/site-api/src/main/resources/com/liferay/site/configuration/packageinfo @@ -0,0 +1 @@ +version 1.0.0 \ No newline at end of file diff --git a/portal-impl/src/portal.properties b/portal-impl/src/portal.properties index 80612a8e3dceae..830d817226db3f 100644 --- a/portal-impl/src/portal.properties +++ b/portal-impl/src/portal.properties @@ -6564,6 +6564,11 @@ # feature.flag.LPS-176083=false + # + # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER7__NUMBER6__NUMBER1__NUMBER3__NUMBER6_ + # + feature.flag.LPS-176136=false + # # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER7__NUMBER7__NUMBER6__NUMBER6__NUMBER4_ # From b3692a0a0a840172bf737426f404d39a26ef2b02 Mon Sep 17 00:00:00 2001 From: mikellorza Date: Fri, 19 May 2023 11:22:59 +0200 Subject: [PATCH 16/24] LPS-181172 Move classes to manager package --- .../{ => manager}/MenuAccessConfigurationManager.java | 5 +---- .../{ => manager}/MenuAccessConfigurationManagerImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) rename modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/{ => manager}/MenuAccessConfigurationManager.java (88%) rename modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/{ => manager}/MenuAccessConfigurationManagerImpl.java (92%) diff --git a/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfigurationManager.java b/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/manager/MenuAccessConfigurationManager.java similarity index 88% rename from modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfigurationManager.java rename to modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/manager/MenuAccessConfigurationManager.java index bc2aad7162c4e7..b2d01ed6c22b3d 100644 --- a/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfigurationManager.java +++ b/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/manager/MenuAccessConfigurationManager.java @@ -12,14 +12,11 @@ * details. */ -package com.liferay.site.configuration; - -import org.osgi.annotation.versioning.ProviderType; +package com.liferay.site.configuration.manager; /** * @author Mikel Lorza */ -@ProviderType public interface MenuAccessConfigurationManager { public String[] getRoleIdsCanAccessControlMenu(long groupId) diff --git a/modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/MenuAccessConfigurationManagerImpl.java b/modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/manager/MenuAccessConfigurationManagerImpl.java similarity index 92% rename from modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/MenuAccessConfigurationManagerImpl.java rename to modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/manager/MenuAccessConfigurationManagerImpl.java index 5980b501cf241f..77a5ff58f5aa22 100644 --- a/modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/MenuAccessConfigurationManagerImpl.java +++ b/modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/manager/MenuAccessConfigurationManagerImpl.java @@ -12,11 +12,11 @@ * details. */ -package com.liferay.site.internal.configuration; +package com.liferay.site.internal.configuration.manager; import com.liferay.portal.kernel.module.configuration.ConfigurationProvider; import com.liferay.site.configuration.MenuAccessConfiguration; -import com.liferay.site.configuration.MenuAccessConfigurationManager; +import com.liferay.site.configuration.manager.MenuAccessConfigurationManager; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; From 1f798e2f0d643ed08fdd100521893f968eeb4a47 Mon Sep 17 00:00:00 2001 From: mikellorza Date: Fri, 19 May 2023 11:29:19 +0200 Subject: [PATCH 17/24] LPS-181172 Rename method roleIdsCanAccessControlMenu to accessToControlMenuRoleIds using roleIds as suffix following pattern used in siteRoles and samlRole --- .../liferay/site/configuration/MenuAccessConfiguration.java | 2 +- .../configuration/manager/MenuAccessConfigurationManager.java | 2 +- .../manager/MenuAccessConfigurationManagerImpl.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfiguration.java b/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfiguration.java index 275ad6d9f5ea38..a6207a9fcb07c9 100644 --- a/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfiguration.java +++ b/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/MenuAccessConfiguration.java @@ -35,6 +35,6 @@ public interface MenuAccessConfiguration { public boolean showControlMenuByRole(); @Meta.AD(deflt = "", required = false) - public String[] roleIdsCanAccessControlMenu(); + public String[] accessToControlMenuRoleIds(); } \ No newline at end of file diff --git a/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/manager/MenuAccessConfigurationManager.java b/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/manager/MenuAccessConfigurationManager.java index b2d01ed6c22b3d..74e94933445fc2 100644 --- a/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/manager/MenuAccessConfigurationManager.java +++ b/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/manager/MenuAccessConfigurationManager.java @@ -19,7 +19,7 @@ */ public interface MenuAccessConfigurationManager { - public String[] getRoleIdsCanAccessControlMenu(long groupId) + public String[] getAccessToControlMenuRoleIds(long groupId) throws Exception; public boolean isShowControlMenuByRole(long groupId) throws Exception; diff --git a/modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/manager/MenuAccessConfigurationManagerImpl.java b/modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/manager/MenuAccessConfigurationManagerImpl.java index 77a5ff58f5aa22..64f20fa271f7e5 100644 --- a/modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/manager/MenuAccessConfigurationManagerImpl.java +++ b/modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/manager/MenuAccessConfigurationManagerImpl.java @@ -29,14 +29,14 @@ public class MenuAccessConfigurationManagerImpl implements MenuAccessConfigurationManager { @Override - public String[] getRoleIdsCanAccessControlMenu(long groupId) + public String[] getAccessToControlMenuRoleIds(long groupId) throws Exception { MenuAccessConfiguration menuAccessConfiguration = _configurationProvider.getGroupConfiguration( MenuAccessConfiguration.class, groupId); - return menuAccessConfiguration.roleIdsCanAccessControlMenu(); + return menuAccessConfiguration.accessToControlMenuRoleIds(); } @Override From e27c5afce9503a6c7d064243f7e5b3936e183bd1 Mon Sep 17 00:00:00 2001 From: mikellorza Date: Fri, 19 May 2023 11:47:33 +0200 Subject: [PATCH 18/24] LPS-181172 Baseline --- modules/apps/site/site-api/bnd.bnd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/apps/site/site-api/bnd.bnd b/modules/apps/site/site-api/bnd.bnd index 091b47701a875a..f2ecb80d426719 100644 --- a/modules/apps/site/site-api/bnd.bnd +++ b/modules/apps/site/site-api/bnd.bnd @@ -1,6 +1,6 @@ Bundle-Name: Liferay Site API Bundle-SymbolicName: com.liferay.site.api -Bundle-Version: 16.4.1 +Bundle-Version: 16.5.0 Export-Package:\ com.liferay.site.configuration,\ com.liferay.site.constants,\ From 0ae772d4a24eb12c306dfad837bea441f2ed36f7 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Fri, 19 May 2023 12:15:07 +0100 Subject: [PATCH 19/24] LPS-181172 I want to see where they are used (if it's really more than 1 place). --- .../MenuAccessConfigurationManager.java | 27 ---------- .../MenuAccessConfigurationManagerImpl.java | 54 ------------------- 2 files changed, 81 deletions(-) delete mode 100644 modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/manager/MenuAccessConfigurationManager.java delete mode 100644 modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/manager/MenuAccessConfigurationManagerImpl.java diff --git a/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/manager/MenuAccessConfigurationManager.java b/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/manager/MenuAccessConfigurationManager.java deleted file mode 100644 index 74e94933445fc2..00000000000000 --- a/modules/apps/site/site-api/src/main/java/com/liferay/site/configuration/manager/MenuAccessConfigurationManager.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (c) 2000-present Liferay, Inc. All rights reserved. - * - * This library 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 2.1 of the License, or (at your option) - * any later version. - * - * This library 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. - */ - -package com.liferay.site.configuration.manager; - -/** - * @author Mikel Lorza - */ -public interface MenuAccessConfigurationManager { - - public String[] getAccessToControlMenuRoleIds(long groupId) - throws Exception; - - public boolean isShowControlMenuByRole(long groupId) throws Exception; - -} \ No newline at end of file diff --git a/modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/manager/MenuAccessConfigurationManagerImpl.java b/modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/manager/MenuAccessConfigurationManagerImpl.java deleted file mode 100644 index 64f20fa271f7e5..00000000000000 --- a/modules/apps/site/site-impl/src/main/java/com/liferay/site/internal/configuration/manager/MenuAccessConfigurationManagerImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * Copyright (c) 2000-present Liferay, Inc. All rights reserved. - * - * This library 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 2.1 of the License, or (at your option) - * any later version. - * - * This library 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. - */ - -package com.liferay.site.internal.configuration.manager; - -import com.liferay.portal.kernel.module.configuration.ConfigurationProvider; -import com.liferay.site.configuration.MenuAccessConfiguration; -import com.liferay.site.configuration.manager.MenuAccessConfigurationManager; - -import org.osgi.service.component.annotations.Component; -import org.osgi.service.component.annotations.Reference; - -/** - * @author Mikel Lorza - */ -@Component(service = MenuAccessConfigurationManager.class) -public class MenuAccessConfigurationManagerImpl - implements MenuAccessConfigurationManager { - - @Override - public String[] getAccessToControlMenuRoleIds(long groupId) - throws Exception { - - MenuAccessConfiguration menuAccessConfiguration = - _configurationProvider.getGroupConfiguration( - MenuAccessConfiguration.class, groupId); - - return menuAccessConfiguration.accessToControlMenuRoleIds(); - } - - @Override - public boolean isShowControlMenuByRole(long groupId) throws Exception { - MenuAccessConfiguration menuAccessConfiguration = - _configurationProvider.getGroupConfiguration( - MenuAccessConfiguration.class, groupId); - - return menuAccessConfiguration.showControlMenuByRole(); - } - - @Reference - private ConfigurationProvider _configurationProvider; - -} \ No newline at end of file From 0c8868f1ebaa46310c24470d23f9eb2eac8b07f3 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Fri, 19 May 2023 12:32:01 +0100 Subject: [PATCH 20/24] Baseline --- portal-kernel/src/com/liferay/portal/kernel/service/packageinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/packageinfo b/portal-kernel/src/com/liferay/portal/kernel/service/packageinfo index 1801717bf7ad57..d9a61a2566a506 100644 --- a/portal-kernel/src/com/liferay/portal/kernel/service/packageinfo +++ b/portal-kernel/src/com/liferay/portal/kernel/service/packageinfo @@ -1 +1 @@ -version 22.2.0 \ No newline at end of file +version 22.1.0 \ No newline at end of file From 6ee2c11624625a2a7b8b289e1a60a4697dcd763b Mon Sep 17 00:00:00 2001 From: Pedro Leite Date: Mon, 15 May 2023 18:39:41 -0300 Subject: [PATCH 21/24] LPS-183896 Add integration test for new behavior --- .../test/ObjectFieldLocalServiceTest.java | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/modules/apps/object/object-test/src/testIntegration/java/com/liferay/object/service/test/ObjectFieldLocalServiceTest.java b/modules/apps/object/object-test/src/testIntegration/java/com/liferay/object/service/test/ObjectFieldLocalServiceTest.java index 7708dcddc49603..3b56483d4a9fef 100644 --- a/modules/apps/object/object-test/src/testIntegration/java/com/liferay/object/service/test/ObjectFieldLocalServiceTest.java +++ b/modules/apps/object/object-test/src/testIntegration/java/com/liferay/object/service/test/ObjectFieldLocalServiceTest.java @@ -1336,7 +1336,7 @@ public void testUpdateCustomObjectField() throws Exception { Assert.assertEquals( labelMap.get(LocaleUtil.GERMANY), labelMap.get(LocaleUtil.US)); - // Object field relationship name and DB type cannot be changed + // Object field relationship ObjectDefinition relatedObjectDefinition = ObjectDefinitionTestUtil.addObjectDefinition( @@ -1356,6 +1356,33 @@ public void testUpdateCustomObjectField() throws Exception { relatedObjectDefinition.getObjectDefinitionId(), "r_relationship_" + objectDefinition.getPKObjectFieldName()); + long relationshipObjectFieldId = + relationshipObjectField.getObjectFieldId(); + + // Object field relationship dbColumName cannot end with underline + + relationshipObjectField = _updateCustomObjectField( + relationshipObjectField, + Arrays.asList( + _objectFieldSettingLocalService.fetchObjectFieldSetting( + relationshipObjectFieldId, + ObjectFieldSettingConstants. + NAME_OBJECT_DEFINITION_1_SHORT_NAME), + _objectFieldSettingLocalService.fetchObjectFieldSetting( + relationshipObjectFieldId, + ObjectFieldSettingConstants. + NAME_OBJECT_RELATIONSHIP_ERC_OBJECT_FIELD_NAME))); + + String relationshipObjectFieldDBColumnName = + relationshipObjectField.getDBColumnName(); + + Assert.assertNotEquals( + StringPool.UNDERLINE, + relationshipObjectFieldDBColumnName.charAt( + relationshipObjectFieldDBColumnName.length() - 1)); + + // Object field relationship name and DB type cannot be changed + _assertFailure( ObjectFieldRelationshipTypeException.class, "Object field relationship name and DB type cannot be changed", @@ -1367,7 +1394,7 @@ public void testUpdateCustomObjectField() throws Exception { ).name( "able" ).objectFieldId( - relationshipObjectField.getObjectFieldId() + relationshipObjectFieldId ).objectFieldSettings( Collections.emptyList() ).build())); From d5acbbe09acba11b870bdc908d1393a9bd12d543 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Fri, 19 May 2023 12:42:31 +0100 Subject: [PATCH 22/24] LPS-183896 Comments should clarify code, not repeat what is obvious when reading code --- .../object/service/test/ObjectFieldLocalServiceTest.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/apps/object/object-test/src/testIntegration/java/com/liferay/object/service/test/ObjectFieldLocalServiceTest.java b/modules/apps/object/object-test/src/testIntegration/java/com/liferay/object/service/test/ObjectFieldLocalServiceTest.java index 3b56483d4a9fef..4ea56416f634c0 100644 --- a/modules/apps/object/object-test/src/testIntegration/java/com/liferay/object/service/test/ObjectFieldLocalServiceTest.java +++ b/modules/apps/object/object-test/src/testIntegration/java/com/liferay/object/service/test/ObjectFieldLocalServiceTest.java @@ -1359,8 +1359,6 @@ public void testUpdateCustomObjectField() throws Exception { long relationshipObjectFieldId = relationshipObjectField.getObjectFieldId(); - // Object field relationship dbColumName cannot end with underline - relationshipObjectField = _updateCustomObjectField( relationshipObjectField, Arrays.asList( @@ -1381,8 +1379,6 @@ public void testUpdateCustomObjectField() throws Exception { relationshipObjectFieldDBColumnName.charAt( relationshipObjectFieldDBColumnName.length() - 1)); - // Object field relationship name and DB type cannot be changed - _assertFailure( ObjectFieldRelationshipTypeException.class, "Object field relationship name and DB type cannot be changed", From 765fc9f8c6a6f42f67648c77fdd98b4c8d044c0c Mon Sep 17 00:00:00 2001 From: 190705lD Date: Fri, 19 May 2023 15:22:54 -0300 Subject: [PATCH 23/24] LPS-184240 - Create Publications Form does not submit on Enter keypress --- .../portalweb/macros/Publications.macro | 37 ++++++++++++++++++- .../publications/Publications.testcase | 14 +++++++ .../com/liferay/portalweb/tests/mytests | 1 + 3 files changed, 51 insertions(+), 1 deletion(-) create mode 160000 portal-web/test/functional/com/liferay/portalweb/tests/mytests diff --git a/portal-web/test/functional/com/liferay/portalweb/macros/Publications.macro b/portal-web/test/functional/com/liferay/portalweb/macros/Publications.macro index a41230abc28f09..0a601b8a6c3b16 100644 --- a/portal-web/test/functional/com/liferay/portalweb/macros/Publications.macro +++ b/portal-web/test/functional/com/liferay/portalweb/macros/Publications.macro @@ -81,6 +81,41 @@ definition { Alert.viewSuccessMessage(); } + macro createPublicationEnter { + if (${gotoPublicationsAdmin} == "true") { + PublicationsNavigator.openPublicationsAdmin(); + + Click(locator1 = "Button#PLUS"); + } + else { + Click(locator1 = "Publications#PUBLICATIONS_INDICATOR_BUTTON"); + + MenuItem.click(menuItem = "Create New Publication"); + } + + if (isSet(publicationName)) { + Type( + locator1 = "Publications#PUBLICATION_NAME", + value1 = ${publicationName}); + } + + if (isSet(publicationDescription)) { + Type( + locator1 = "Publications#PUBLICATION_DESCRIPTION", + value1 = ${publicationDescription}); + } + + KeyPress( + locator1 = "Publications#KEYWORD_TEXTFIELD", + value1 = "\ENTER"); + + AssertElementPresent(locator1 = "Publications#PUBLISHED_PUBLICATION_NAME", + key_publicationName = "Test"); + + + } + + macro createNewPublicationWithTemplate { if (${gotoPublicationsAdmin} == "true") { PublicationsNavigator.openPublicationsAdmin(); @@ -280,7 +315,7 @@ definition { locator1 = "Publications#KEYWORD_TEXTFIELD", value1 = ${keyword}); - KeyPress( + KeyPress( locator1 = "Publications#KEYWORD_TEXTFIELD", value1 = "\ENTER"); } diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/Publications.testcase b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/Publications.testcase index 318eba8be82722..5bb589b01b9379 100644 --- a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/Publications.testcase +++ b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/Publications.testcase @@ -11,6 +11,10 @@ definition { TestCase.setUpPortalInstance(); User.firstLoginPG(); + + Publications.enablePublications(); + + Navigator.openURL(); } tearDown { @@ -1680,4 +1684,14 @@ definition { publicationList = "Publication Name 3,Publication Name 2,Publication Name 1"); } + @priority = 2 + test CreatePublicationScreen { + task("Go to Create a Publication Screen") { + Publications.createNewPublication( + publicationName = "Test Publications" + ); + } + } + + } \ No newline at end of file diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/mytests b/portal-web/test/functional/com/liferay/portalweb/tests/mytests new file mode 160000 index 00000000000000..f43446748468cf --- /dev/null +++ b/portal-web/test/functional/com/liferay/portalweb/tests/mytests @@ -0,0 +1 @@ +Subproject commit f43446748468cf93fca24b6ea1c3748d96d75fc0 From 24127f9d68bd925c82bd66fb591db78d7f215529 Mon Sep 17 00:00:00 2001 From: 190705lD Date: Fri, 19 May 2023 16:25:39 -0300 Subject: [PATCH 24/24] LPS - 184240 SF --- .../portalweb/macros/Publications.macro | 44 +++++++++---------- .../publications/Publications.testcase | 17 +++---- 2 files changed, 28 insertions(+), 33 deletions(-) diff --git a/portal-web/test/functional/com/liferay/portalweb/macros/Publications.macro b/portal-web/test/functional/com/liferay/portalweb/macros/Publications.macro index 0a601b8a6c3b16..59dd5b0ce21fed 100644 --- a/portal-web/test/functional/com/liferay/portalweb/macros/Publications.macro +++ b/portal-web/test/functional/com/liferay/portalweb/macros/Publications.macro @@ -81,7 +81,7 @@ definition { Alert.viewSuccessMessage(); } - macro createPublicationEnter { + macro createNewPublicationWithTemplate { if (${gotoPublicationsAdmin} == "true") { PublicationsNavigator.openPublicationsAdmin(); @@ -93,30 +93,30 @@ definition { MenuItem.click(menuItem = "Create New Publication"); } + AssertElementPresent(locator1 = "Publications#TEMPLATE_SELECTOR"); + + Select( + locator1 = "Publications#TEMPLATE_OPTION", + value1 = ${templateName}); + if (isSet(publicationName)) { - Type( + AssertTextEquals( locator1 = "Publications#PUBLICATION_NAME", value1 = ${publicationName}); } if (isSet(publicationDescription)) { - Type( + AssertTextEquals( locator1 = "Publications#PUBLICATION_DESCRIPTION", value1 = ${publicationDescription}); } - KeyPress( - locator1 = "Publications#KEYWORD_TEXTFIELD", - value1 = "\ENTER"); - - AssertElementPresent(locator1 = "Publications#PUBLISHED_PUBLICATION_NAME", - key_publicationName = "Test"); - + Button.click(button = "Create"); + Alert.viewSuccessMessage(); } - - macro createNewPublicationWithTemplate { + macro createPublicationEnter { if (${gotoPublicationsAdmin} == "true") { PublicationsNavigator.openPublicationsAdmin(); @@ -128,27 +128,25 @@ definition { MenuItem.click(menuItem = "Create New Publication"); } - AssertElementPresent(locator1 = "Publications#TEMPLATE_SELECTOR"); - - Select( - locator1 = "Publications#TEMPLATE_OPTION", - value1 = ${templateName}); - if (isSet(publicationName)) { - AssertTextEquals( + Type( locator1 = "Publications#PUBLICATION_NAME", value1 = ${publicationName}); } if (isSet(publicationDescription)) { - AssertTextEquals( + Type( locator1 = "Publications#PUBLICATION_DESCRIPTION", value1 = ${publicationDescription}); } - Button.click(button = "Create"); + KeyPress( + locator1 = "Publications#KEYWORD_TEXTFIELD", + value1 = "\ENTER"); - Alert.viewSuccessMessage(); + AssertElementPresent( + key_publicationName = "Test", + locator1 = "Publications#PUBLISHED_PUBLICATION_NAME"); } macro deletePublication { @@ -315,7 +313,7 @@ definition { locator1 = "Publications#KEYWORD_TEXTFIELD", value1 = ${keyword}); - KeyPress( + KeyPress( locator1 = "Publications#KEYWORD_TEXTFIELD", value1 = "\ENTER"); } diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/Publications.testcase b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/Publications.testcase index 5bb589b01b9379..cb9882aa80c567 100644 --- a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/Publications.testcase +++ b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/Publications.testcase @@ -921,6 +921,13 @@ definition { locator1 = "Permissions#CONFIGURATION_PERMISSIONS_VIEW_CHECKBOX"); } + @priority = 2 + test CreatePublicationScreen { + task ("Go to Create a Publication Screen") { + Publications.createNewPublication(publicationName = "Test Publications"); + } + } + @priority = 4 test DiscardSubsetsofChangesInPublication { JSONPublications.addPublication(publicationName = "Publication Name"); @@ -1684,14 +1691,4 @@ definition { publicationList = "Publication Name 3,Publication Name 2,Publication Name 1"); } - @priority = 2 - test CreatePublicationScreen { - task("Go to Create a Publication Screen") { - Publications.createNewPublication( - publicationName = "Test Publications" - ); - } - } - - } \ No newline at end of file