Merged gitlab changes.

Vastra-Gotalandsregionen · Oct 12, 2022 · 6fbef92 · 6fbef92
2 parents e2f7d28 + c4f50e8
commit 6fbef92
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/core-bc/modules/portlet/pom.xml b/core-bc/modules/portlet/pom.xml
@@ -206,13 +206,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
@@ -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>
         <slf4j.version>1.7.36</slf4j.version>
         <log4j.version>2.17.2</log4j.version>
         <portlet-api.version>2.0</portlet-api.version>
@@ -68,4 +68,16 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <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>