From 0dc6b5b0adeed14b2025f63933dd1380ce220161 Mon Sep 17 00:00:00 2001
From: mrg3kko <erik.andersson@monator.com>
Date: Wed, 4 Mar 2020 13:06:16 +0100
Subject: [PATCH 1/2] 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
             <groupId>com.liferay.portal</groupId>
             <artifactId>com.liferay.portal.kernel</artifactId>
             <scope>provided</scope>
-            <version>2.50.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.liferay.portal</groupId>
             <artifactId>com.liferay.util.taglib</artifactId>
-            <version>2.8.0</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index d677869..4fa1706 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
         <compileTarget>11</compileTarget>
         <jstl.version>1.2</jstl.version>
         <junit.version>4.12</junit.version>
-        <liferay.version>7.0.0</liferay.version>
+        <liferay.version>7.2.1</liferay.version>
         <log4j.version>1.2.16</log4j.version>
         <portlet-api.version>2.0</portlet-api.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,4 +45,16 @@
         <spring.fw.version>4.3.25.RELEASE</spring.fw.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.liferay.portal</groupId>
+                <artifactId>release.portal.bom</artifactId>
+                <version>${liferay.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 </project>

From c4f50e8fd977eb95b14ab33854abd8bc60b8d3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrik=20Bj=C3=B6rk?= <patrik.bjork@vgregion.se>
Date: Mon, 9 Mar 2020 14:18:24 +0100
Subject: [PATCH 2/2] 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 @@
 <?xml version="1.0"?>
-<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 7.0.0//EN" "http://www.liferay.com/dtd/liferay-display_7_0_0.dtd">
+<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 7.2.0//EN" "http://www.liferay.com/dtd/liferay-display_7_2_0.dtd">
 
 <display>
     <category name="VGR">
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 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 7.0.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_7_0_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 7.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_7_2_0.dtd">
 <liferay-portlet-app>
 
     <portlet>