From 0dc6b5b0adeed14b2025f63933dd1380ce220161 Mon Sep 17 00:00:00 2001 From: mrg3kko Date: Wed, 4 Mar 2020 13:06:16 +0100 Subject: [PATCH 1/3] Changed Liferay dependencies to use BOM-method. Updated liferay version to 7.2.1 --- core-bc/modules/portlet/pom.xml | 3 +-- pom.xml | 14 +++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/core-bc/modules/portlet/pom.xml b/core-bc/modules/portlet/pom.xml index 50030b4..8ac57fd 100644 --- a/core-bc/modules/portlet/pom.xml +++ b/core-bc/modules/portlet/pom.xml @@ -195,13 +195,12 @@ Generation time : 2017-02-01 09:32:10 CET com.liferay.portal com.liferay.portal.kernel provided - 2.50.0 com.liferay.portal com.liferay.util.taglib - 2.8.0 + provided diff --git a/pom.xml b/pom.xml index d677869..4fa1706 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 11 1.2 4.12 - 7.0.0 + 7.2.1 1.2.16 2.0 UTF-8 @@ -45,4 +45,16 @@ 4.3.25.RELEASE + + + + com.liferay.portal + release.portal.bom + ${liferay.version} + pom + import + + + + From c4f50e8fd977eb95b14ab33854abd8bc60b8d3b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Bj=C3=B6rk?= Date: Mon, 9 Mar 2020 14:18:24 +0100 Subject: [PATCH 2/3] Make compatible with DXP 7.2. --- .../modules/portlet/src/main/webapp/WEB-INF/liferay-display.xml | 2 +- .../src/main/webapp/WEB-INF/liferay-plugin-package.properties | 2 +- .../modules/portlet/src/main/webapp/WEB-INF/liferay-portlet.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core-bc/modules/portlet/src/main/webapp/WEB-INF/liferay-display.xml b/core-bc/modules/portlet/src/main/webapp/WEB-INF/liferay-display.xml index 0a5ecbc..03dd777 100644 --- a/core-bc/modules/portlet/src/main/webapp/WEB-INF/liferay-display.xml +++ b/core-bc/modules/portlet/src/main/webapp/WEB-INF/liferay-display.xml @@ -1,5 +1,5 @@ - + diff --git a/core-bc/modules/portlet/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/core-bc/modules/portlet/src/main/webapp/WEB-INF/liferay-plugin-package.properties index c692dfe..6af9153 100644 --- a/core-bc/modules/portlet/src/main/webapp/WEB-INF/liferay-plugin-package.properties +++ b/core-bc/modules/portlet/src/main/webapp/WEB-INF/liferay-plugin-package.properties @@ -2,5 +2,5 @@ name=Handbok module-group-id=vgregion.se module-incremental-version=2 short-description=Handbok -liferay-versions=7.1.0+ +liferay-versions=7.2.0+ speed-filters-enabled=false diff --git a/core-bc/modules/portlet/src/main/webapp/WEB-INF/liferay-portlet.xml b/core-bc/modules/portlet/src/main/webapp/WEB-INF/liferay-portlet.xml index 9023671..2045abf 100644 --- a/core-bc/modules/portlet/src/main/webapp/WEB-INF/liferay-portlet.xml +++ b/core-bc/modules/portlet/src/main/webapp/WEB-INF/liferay-portlet.xml @@ -1,5 +1,5 @@ - + From 4f955d423368772974fae44f7b08840290bfba9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Nov 2022 22:32:51 +0000 Subject: [PATCH 3/3] Bump postgresql from 42.3.5 to 42.3.8 in /core-bc/composites/svc Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.5 to 42.3.8. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.3.5...REL42.3.8) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- core-bc/composites/svc/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-bc/composites/svc/pom.xml b/core-bc/composites/svc/pom.xml index 91d7c9c..d876ce8 100644 --- a/core-bc/composites/svc/pom.xml +++ b/core-bc/composites/svc/pom.xml @@ -69,7 +69,7 @@ org.postgresql postgresql - 42.3.5 + 42.3.8