Skip to content

Commit

Permalink
Merge branch 'liferay:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@liferay-frontend
liferay-frontend authored Sep 14, 2023
2 parents eeed8da + 04e4c85 commit 38e0987
Show file tree
Hide file tree
Showing 67 changed files with 431 additions and 144 deletions.
8 changes: 4 additions & 4 deletions modules/.releng/sdk/gradle-plugins-defaults/artifact.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
artifact.git.id=c62e3fbcac7ae293ed18362b1573cf5be1958596
artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.21/com.liferay.gradle.plugins.defaults-10.0.21-javadoc.jar
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.21/com.liferay.gradle.plugins.defaults-10.0.21-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.21/com.liferay.gradle.plugins.defaults-10.0.21.jar
artifact.git.id=981ba010af0086203c5f88de78d6cb3009ca1ba1
artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.22/com.liferay.gradle.plugins.defaults-10.0.22-javadoc.jar
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.22/com.liferay.gradle.plugins.defaults-10.0.22-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/10.0.22/com.liferay.gradle.plugins.defaults-10.0.22.jar
8 changes: 4 additions & 4 deletions modules/.releng/sdk/gradle-plugins-target-platform/artifact.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
artifact.git.id=3ad290a668abe1d2a814ff51be72a09c2c94fb70
artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.target.platform/3.0.17/com.liferay.gradle.plugins.target.platform-3.0.17-javadoc.jar
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.target.platform/3.0.17/com.liferay.gradle.plugins.target.platform-3.0.17-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.target.platform/3.0.17/com.liferay.gradle.plugins.target.platform-3.0.17.jar
artifact.git.id=d6bd8710432495e43e48cf3488f60d30bf10a0c0
artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.target.platform/3.0.18/com.liferay.gradle.plugins.target.platform-3.0.18-javadoc.jar
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.target.platform/3.0.18/com.liferay.gradle.plugins.target.platform-3.0.18-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.target.platform/3.0.18/com.liferay.gradle.plugins.target.platform-3.0.18.jar
8 changes: 4 additions & 4 deletions modules/.releng/sdk/gradle-plugins-upgrade-table-builder/artifact.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
artifact.git.id=f95321eaee5952633af55422eb84d8d39ca081f0
artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.upgrade.table.builder/3.0.4/com.liferay.gradle.plugins.upgrade.table.builder-3.0.4-javadoc.jar
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.upgrade.table.builder/3.0.4/com.liferay.gradle.plugins.upgrade.table.builder-3.0.4-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.upgrade.table.builder/3.0.4/com.liferay.gradle.plugins.upgrade.table.builder-3.0.4.jar
artifact.git.id=981ba010af0086203c5f88de78d6cb3009ca1ba1
artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.upgrade.table.builder/3.0.5/com.liferay.gradle.plugins.upgrade.table.builder-3.0.5-javadoc.jar
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.upgrade.table.builder/3.0.5/com.liferay.gradle.plugins.upgrade.table.builder-3.0.5-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.upgrade.table.builder/3.0.5/com.liferay.gradle.plugins.upgrade.table.builder-3.0.5.jar
8 changes: 4 additions & 4 deletions modules/.releng/sdk/gradle-plugins-workspace/artifact.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
artifact.git.id=18a55406b4fcdbd047dcaf2515035b1f16906e35
artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/8.0.8/com.liferay.gradle.plugins.workspace-8.0.8-javadoc.jar
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/8.0.8/com.liferay.gradle.plugins.workspace-8.0.8-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/8.0.8/com.liferay.gradle.plugins.workspace-8.0.8.jar
artifact.git.id=0a5412f6a14f014149b396242662b4fb4f3bae50
artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/9.0.0/com.liferay.gradle.plugins.workspace-9.0.0-javadoc.jar
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/9.0.0/com.liferay.gradle.plugins.workspace-9.0.0-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/9.0.0/com.liferay.gradle.plugins.workspace-9.0.0.jar
8 changes: 4 additions & 4 deletions modules/.releng/sdk/gradle-plugins/artifact.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
artifact.git.id=c62e3fbcac7ae293ed18362b1573cf5be1958596
artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.176/com.liferay.gradle.plugins-14.0.176-javadoc.jar
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.176/com.liferay.gradle.plugins-14.0.176-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.176/com.liferay.gradle.plugins-14.0.176.jar
artifact.git.id=fc4dc7ee2e1a3fab762ec3526fb34c6a3c283f99
artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.177/com.liferay.gradle.plugins-14.0.177-javadoc.jar
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.177/com.liferay.gradle.plugins-14.0.177-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/14.0.177/com.liferay.gradle.plugins-14.0.177.jar
6 changes: 3 additions & 3 deletions modules/.releng/sdk/project-templates/project-templates-service-builder/artifact.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
artifact.git.id=1235cd8bc234338d46e79eb742eae2a75e39ba72
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.service.builder/1.0.187/com.liferay.project.templates.service.builder-1.0.187-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.service.builder/1.0.187/com.liferay.project.templates.service.builder-1.0.187.jar
artifact.git.id=6ee36c7b8a5b3b133cf9f82df409c5e7c01c6daf
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.service.builder/1.0.188/com.liferay.project.templates.service.builder-1.0.188-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.service.builder/1.0.188/com.liferay.project.templates.service.builder-1.0.188.jar
6 changes: 3 additions & 3 deletions modules/.releng/sdk/project-templates/project-templates-service/artifact.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
artifact.git.id=1235cd8bc234338d46e79eb742eae2a75e39ba72
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.service/1.0.185/com.liferay.project.templates.service-1.0.185-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.service/1.0.185/com.liferay.project.templates.service-1.0.185.jar
artifact.git.id=6ee36c7b8a5b3b133cf9f82df409c5e7c01c6daf
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.service/1.0.186/com.liferay.project.templates.service-1.0.186-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.service/1.0.186/com.liferay.project.templates.service-1.0.186.jar
6 changes: 3 additions & 3 deletions modules/.releng/sdk/project-templates/project-templates-theme/artifact.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
artifact.git.id=1235cd8bc234338d46e79eb742eae2a75e39ba72
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.theme/1.0.185/com.liferay.project.templates.theme-1.0.185-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.theme/1.0.185/com.liferay.project.templates.theme-1.0.185.jar
artifact.git.id=6ee36c7b8a5b3b133cf9f82df409c5e7c01c6daf
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.theme/1.0.186/com.liferay.project.templates.theme-1.0.186-sources.jar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.theme/1.0.186/com.liferay.project.templates.theme-1.0.186.jar
12 changes: 6 additions & 6 deletions modules/.releng/sdk/project-templates/project-templates/artifact.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
artifact.git.id=97ae4e729345a21c6b31a335f2f2bba30bb5f9c0
artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.261/com.liferay.project.templates-5.0.261-javadoc.jar
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.261/com.liferay.project.templates-5.0.261-sources.jar
artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.261/com.liferay.project.templates-5.0.261.tar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.261/com.liferay.project.templates-5.0.261.jar
artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.261/com.liferay.project.templates-5.0.261.zip
artifact.git.id=71083bbf4db3e928b5a484554e206ef7cd96c740
artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.262/com.liferay.project.templates-5.0.262-javadoc.jar
artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.262/com.liferay.project.templates-5.0.262-sources.jar
artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.262/com.liferay.project.templates-5.0.262.tar
artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.262/com.liferay.project.templates-5.0.262.jar
artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.262/com.liferay.project.templates-5.0.262.zip
3 changes: 2 additions & 1 deletion ...feray/headless/delivery/internal/dto/v1_0/mapper/BaseStyledLayoutStructureItemMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,8 @@ private FragmentViewport _toFragmentViewportStyle(

return new FragmentViewport() {
{
id = viewportSize.getViewportSizeId();

setFragmentViewportStyle(
() -> new FragmentViewportStyle() {
{
Expand Down Expand Up @@ -410,7 +412,6 @@ private FragmentViewport _toFragmentViewportStyle(
});
}
});
setId(viewportSize.getViewportSizeId());
}
};
}
Expand Down
13 changes: 6 additions & 7 deletions ...iferay/headless/delivery/internal/dto/v1_0/mapper/util/StyledLayoutStructureItemUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,8 @@ public static CustomCSSViewport[] getCustomCSSViewports(
customCSSViewports.add(
new CustomCSSViewport() {
{
setCustomCSS(mobileLandscapeCustomCSS);
setId(
ViewportSize.MOBILE_LANDSCAPE.getViewportSizeId());
customCSS = mobileLandscapeCustomCSS;
id = ViewportSize.MOBILE_LANDSCAPE.getViewportSizeId();
}
});
}
Expand All @@ -82,8 +81,8 @@ public static CustomCSSViewport[] getCustomCSSViewports(
customCSSViewports.add(
new CustomCSSViewport() {
{
setCustomCSS(portraitMobileCustomCSS);
setId(ViewportSize.PORTRAIT_MOBILE.getViewportSizeId());
customCSS = portraitMobileCustomCSS;
id = ViewportSize.PORTRAIT_MOBILE.getViewportSizeId();
}
});
}
Expand All @@ -95,8 +94,8 @@ public static CustomCSSViewport[] getCustomCSSViewports(
customCSSViewports.add(
new CustomCSSViewport() {
{
setCustomCSS(tabletCustomCSS);
setId(ViewportSize.TABLET.getViewportSizeId());
customCSS = tabletCustomCSS;
id = ViewportSize.TABLET.getViewportSizeId();
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/portal-remote/portal-remote-jaxrs-whiteboard/bnd.bnd
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Bundle-Name: Liferay Portal Remote JAXRS Whiteboard
Bundle-SymbolicName: com.liferay.portal.remote.jaxrs.whiteboard
Bundle-Version: 8.2.2
Bundle-Version: 12.0.0
Export-Package:\
com.liferay.portal.remote.jaxrs.whiteboard.lifecycle,\
\
Expand Down
2 changes: 1 addition & 1 deletion modules/build-buildscript.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies {
classpath group: "com.liferay", name: "com.liferay.gradle.plugins.defaults", version: "10.0.21"
classpath group: "com.liferay", name: "com.liferay.gradle.plugins.defaults", version: "10.0.22"
classpath group: "com.liferay", name: "com.liferay.gradle.plugins.maven.plugin.builder", version: "2.0.2"
classpath group: "de.undercouch", name: "gradle-download-task", version: "5.4.0"
classpath group: "org.ysb33r.gradle", name: "gradletest", version: "3.0.0-alpha.2"
Expand Down
2 changes: 1 addition & 1 deletion modules/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ext {
"com.liferay.gradle.plugins.css.builder.version": "5.0.9",
"com.liferay.gradle.plugins.theme.builder.version": "2.0.17",
"com.liferay.portal.tools.bundle.support.version": "3.7.4",
"com.liferay.portal.tools.service.builder.version": "1.0.460",
"com.liferay.portal.tools.service.builder.version": "1.0.462",
"com.liferay.portal.tools.rest.builder.version": "1.0.222",
"com.liferay.portal.tools.soy.builder.version": "3.0.4",
"com.liferay.portal.tools.theme.builder.version": "1.1.9",
Expand Down
10 changes: 10 additions & 0 deletions ...es/dxp/apps/osb/osb-faro/osb-faro-web/src/main/js/settings/channels/pages/ChannelList.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,16 @@ const ChannelList: React.FC<IChannelListProps> = ({
className: 'table-cell-expand',
label: Liferay.Language.get('property-name')
},
{
accessor: 'groupIdCount',
label: Liferay.Language.get('Sites'),
sortable: false
},
{
accessor: 'commerceChannelIdCount',
label: Liferay.Language.get('Channels'),
sortable: false
},
{
accessor: 'id',
label: Liferay.Language.get('property-id'),
Expand Down
24 changes: 23 additions & 1 deletion ...gmentsExperimentMVCActionCommandTest.java → ...gmentsExperimentMVCActionCommandTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package com.liferay.segments.experiment.web.internal.portlet.action.test;
package com.liferay.segments.asah.connector.internal.portlet.action.test;

import com.liferay.analytics.settings.configuration.AnalyticsConfiguration;
import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian;
Expand All @@ -21,6 +21,7 @@
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.kernel.test.rule.DeleteAfterTestRun;
import com.liferay.portal.kernel.test.util.GroupTestUtil;
import com.liferay.portal.kernel.test.util.MockHttp;
import com.liferay.portal.kernel.test.util.RandomTestUtil;
import com.liferay.portal.kernel.test.util.ServiceContextTestUtil;
import com.liferay.portal.kernel.test.util.TestPropsValues;
Expand All @@ -40,6 +41,8 @@
import com.liferay.segments.service.SegmentsExperimentLocalService;
import com.liferay.segments.test.util.SegmentsTestUtil;

import java.util.Collections;

import javax.portlet.ActionRequest;

import org.junit.Assert;
Expand Down Expand Up @@ -128,6 +131,9 @@ public void testAddSegmentsExperiment() throws Exception {
TestPropsValues.getCompanyId(),
AnalyticsConfiguration.class.getName(),
HashMapDictionaryBuilder.<String, Object>put(
"liferayAnalyticsFaroBackendURL",
"http://localhost:8086"
).put(
"liferayAnalyticsURL", liferayAnalyticsURL
).build())) {

Expand Down Expand Up @@ -229,9 +235,25 @@ public void testAddSegmentsExperimentWithExistingTerminatedSegmentsExperiment()
TestPropsValues.getCompanyId(),
AnalyticsConfiguration.class.getName(),
HashMapDictionaryBuilder.<String, Object>put(
"liferayAnalyticsFaroBackendURL",
"http://localhost:8086"
).put(
"liferayAnalyticsURL", "http://localhost:8080/"
).build())) {

Object asahFaroBackendClient = ReflectionTestUtil.getFieldValue(
_mvcActionCommand, "_asahFaroBackendClient");

ReflectionTestUtil.setFieldValue(
asahFaroBackendClient, "_http",
new MockHttp(
Collections.singletonMap(
"/api/1.0/experiments/" +
segmentsExperiment.getSegmentsExperimentKey(),
() -> JSONUtil.put(
"id", "123456"
).toString())));

ReflectionTestUtil.invoke(
_mvcActionCommand, "_addSegmentsExperiment",
new Class<?>[] {ActionRequest.class},
Expand Down
Loading

0 comments on commit 38e0987

Please sign in to comment.