Adjust to Liferay 7.4

Vastra-Gotalandsregionen · Sep 6, 2023 · 15ac319 · 15ac319
1 parent e2f7d28
commit 15ac319
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 10 deletions.
diff --git a/core-bc/composites/webcomp/pom.xml b/core-bc/composites/webcomp/pom.xml
@@ -35,6 +35,12 @@ Generation time : 2017-02-01 09:32:10 CET
             <version>${spring.fw.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.rometools</groupId>
+            <artifactId>rome</artifactId>
+            <version>1.15.0</version>
+        </dependency>
+
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>

diff --git a/core-bc/modules/portlet/pom.xml b/core-bc/modules/portlet/pom.xml
@@ -206,13 +206,11 @@ 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>
         </dependency>
 
         <dependency>

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
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 7.2.0//EN" "http://www.liferay.com/dtd/liferay-display_7_2_0.dtd">
+<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 7.4.0//EN" "http://www.liferay.com/dtd/liferay-display_7_4_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
@@ -2,5 +2,5 @@ name=Handbok
 module-group-id=vgregion.se
 module-incremental-version=2
 short-description=Handbok
-liferay-versions=7.2.0+
+liferay-versions=7.4.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
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!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">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 7.4.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_7_4_0.dtd">
 <liferay-portlet-app>
 
     <portlet>

diff --git a/core-bc/modules/portlet/src/main/webapp/WEB-INF/portlet.xml b/core-bc/modules/portlet/src/main/webapp/WEB-INF/portlet.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
-<portlet-app version="3.0"
-             xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+<portlet-app xmlns="http://xmlns.jcp.org/xml/ns/portlet" version="3.0"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
+             xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/portlet https://docs.liferay.com/portlet-api/3.0/portlet-app_3_0.xsd">
 
     <portlet>
         <portlet-name>handbok</portlet-name>

diff --git a/pom.xml b/pom.xml
@@ -36,15 +36,26 @@
         <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.4.13.u73</liferay.version>
         <slf4j.version>1.7.36</slf4j.version>
-        <log4j.version>2.17.2</log4j.version>
         <portlet-api.version>2.0</portlet-api.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <servlet-api.version>3.0.1</servlet-api.version>
         <spring.fw.version>5.3.18</spring.fw.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.liferay.portal</groupId>
+                <artifactId>release.dxp.bom</artifactId>
+                <version>${liferay.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>