From 0870eceb5ef6bd8b4564ea8c34ccf94024826231 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Mon, 29 Aug 2022 15:04:12 +0200
Subject: [PATCH] Updated OL CDN URLs, see #23770

---
 .classpath                                    |  6 ++--
 .../com.gwtplugins.gdt.eclipse.core.prefs     |  2 +-
 .settings/org.eclipse.wst.common.component    | 32 ++++++++++++-------
 CHANGELOG.md                                  |  6 ++++
 pom.xml                                       |  2 +-
 src/main/webapp/GeoportalDataViewer.html      |  4 +--
 6 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/.classpath b/.classpath
index c1c10e2..a827b37 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/geoportal-data-viewer-app-2.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/geoportal-data-viewer-app-2.3.0/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/geoportal-data-viewer-app-2.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/geoportal-data-viewer-app-2.3.0/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -35,5 +35,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/geoportal-data-viewer-app-2.3.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/geoportal-data-viewer-app-2.3.0/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index c19da06..ad74a6c 100644
--- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-2.3.0-SNAPSHOT
+lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-2.3.0
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 3cb7586..b09b3fd 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                	
+                                                                    	
     
     
     
@@ -15,8 +15,10 @@
     
     
     
-    <wb-module deploy-name="geoportal-data-viewer-app-2.3.0-SNAPSHOT">
-                                                                                                                                		
+    
+    <wb-module deploy-name="geoportal-data-viewer-app-2.3.0">
+                                                                                                                                        		
+        
         
         
         
@@ -33,7 +35,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                		
+                                                                                                                                        		
+        
         
         
         
@@ -50,7 +53,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                		
+                                                                                                                                        		
+        
         
         
         
@@ -67,7 +71,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
-                                                                                                                                		
+                                                                                                                                        		
+        
         
         
         
@@ -84,7 +89,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                                		
+                                                                                                                                        		
+        
         
         
         
@@ -101,7 +107,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                                                                                                                                		
+                                                                                                                                        		
+        
         
         
         
@@ -118,7 +125,8 @@
         
         
         <property name="java-output-path" value="/geoportal-data-viewer-app/target/geoportal-data-viewer-app-0.0.1-SNAPSHOT/WEB-INF/classes"/>
-                                                                                                                                		
+                                                                                                                                        		
+        
         
         
         
@@ -135,7 +143,8 @@
         
         
         <property name="context-root" value="geoportal-data-viewer-app"/>
-                                                                                                                                	
+                                                                                                                                        	
+    
     
     
     
@@ -152,7 +161,8 @@
     
     
     </wb-module>
-                                                                
+                                                                    
+
 
 
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4a8125..b47396b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v2.3.1-SNAPSHOT] - 2022-08-29
+
+#### Bug fixed
+
+- [#23770] OpenLayers CDN URLs updated (github relative URL changed from "master/en/vX.Y.Z/" to "main/dist/en/vX.Y.Z/")
+
 ## [v2.3.0] - 2022-07-26
 
 #### Bug fixed
diff --git a/pom.xml b/pom.xml
index 5599184..dd84f83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>geoportal-data-viewer-app</artifactId>
 	<packaging>war</packaging>
-	<version>2.3.0</version>
+	<version>2.3.1-SNAPSHOT</version>
 	<name>GeoPortal Data Viewer App</name>
 	<description>The GeoPortal Data Viewer App is an application to access, discovery and navigate the GeoNa products by a Web-Map Interface</description>
 
diff --git a/src/main/webapp/GeoportalDataViewer.html b/src/main/webapp/GeoportalDataViewer.html
index 72a7ebd..d392313 100644
--- a/src/main/webapp/GeoportalDataViewer.html
+++ b/src/main/webapp/GeoportalDataViewer.html
@@ -10,10 +10,10 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
 <link
-	href="//cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.4.3/css/ol.css"
+	href="//cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@main/dist/en/v6.4.3/css/ol.css"
 	rel="stylesheet" type="text/css">
 <script
-	src="//cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.4.3/build/ol.js"
+	src="//cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@main/dist/en/v6.4.3/build/ol.js"
 	type="text/javascript"></script>
 
 <link