From 898ef5a8a5e70e0c53c6848eeca4ad671c26cd69 Mon Sep 17 00:00:00 2001
From: Suren <dsuren1@gmail.com>
Date: Mon, 14 Oct 2024 17:27:35 +0530
Subject: [PATCH 01/13] Update ms to latest

---
 MapStore2                               |   2 +-
 configs/localConfig.json                | 111 +++++++++----------
 configs/pluginsConfig.json              |  19 +++-
 dashboard-embedded-template.html        |   4 +-
 embeddedTemplate.html                   |   4 +-
 geostory-embedded-template.html         |   4 +-
 indexTemplate.html                      |   4 +-
 package.json                            |   8 +-
 web/pom.xml                             | 135 ++++++++++++++++++++++--
 web/src/main/resources/proxy.properties |   2 +-
 10 files changed, 209 insertions(+), 84 deletions(-)

diff --git a/MapStore2 b/MapStore2
index bc377a464..453cd13c1 160000
--- a/MapStore2
+++ b/MapStore2
@@ -1 +1 @@
-Subproject commit bc377a464ea5b4431834210c4f406af1bb991728
+Subproject commit 453cd13c1e6319ddc083f09528650a3934ae0cbf
diff --git a/configs/localConfig.json b/configs/localConfig.json
index 3b274e499..878267be3 100644
--- a/configs/localConfig.json
+++ b/configs/localConfig.json
@@ -108,14 +108,6 @@
     }],
     "initialState": {
       "defaultState": {
-        "annotations": {
-          "config": {
-            "multiGeometry": true,
-            "validationErrors": {}
-          },
-          "format": "decimal",
-          "defaultTextAnnotation": "New"
-        },
         "catalog": {
           "default": {
             "newService": {
@@ -238,7 +230,8 @@
                     "group": "background",
                     "title": "Empty Background",
                     "fixed": true,
-                    "type": "empty"
+                    "type": "empty",
+                    "visibility": false
                 }]
               }
             }
@@ -315,11 +308,8 @@
             }, {
                 "name": "TOC",
                 "cfg": {
-                    "activateMetedataTool": false,
                     "activateMapTitle": false,
-                    "activateSortLayer": false,
-                    "activateLayerFilterTool": false,
-                    "activateQueryTool": false
+                    "activateSortLayer": false
                 }
             }, "AddGroup", {
                 "name": "TOCItemsSettings",
@@ -429,7 +419,9 @@
             }, "AutoMapUpdate", "DrawerMenu", "Version", "Notifications", "BackgroundSelector", {
               "name": "Annotations",
               "cfg": {
-                "symbolsPath": "assets/symbols/"
+                "symbolsPath": "assets/symbols/",
+                "format": "decimal",
+                "defaultTextAnnotation": "New"
               }
             },
             {
@@ -486,52 +478,55 @@
                   ]
               }
             }, {
-                "name": "TOC",
-                "cfg": {
-                    "activateMetedataTool": true,
-                    "metadataOptions": {
-                        "xmlNamespaces": {
-                            "gmd": "http://www.isotc211.org/2005/gmd",
-                            "srv": "http://www.isotc211.org/2005/srv",
-                            "gco": "http://www.isotc211.org/2005/gco",
-                            "gmx": "http://www.isotc211.org/2005/gmx",
-                            "gfc": "http://www.isotc211.org/2005/gfc",
-                            "gts": "http://www.isotc211.org/2005/gts",
-                            "gml": "http://www.opengis.net/gml"
-                        },
-                        "extractors": [{
+            "name": "MetadataInfo",
+            "cfg": {
+              "metadataOptions": {
+                "xmlNamespaces": {
+                  "gmd": "http://www.isotc211.org/2005/gmd",
+                  "srv": "http://www.isotc211.org/2005/srv",
+                  "gco": "http://www.isotc211.org/2005/gco",
+                  "gmx": "http://www.isotc211.org/2005/gmx",
+                  "gfc": "http://www.isotc211.org/2005/gfc",
+                  "gts": "http://www.isotc211.org/2005/gts",
+                  "gml": "http://www.opengis.net/gml"
+                },
+                "extractors": [
+                  {
+                    "properties": {
+                      "title": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:title/gco:CharacterString",
+                      "abstract": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:abstract/gco:CharacterString",
+                      "purpose": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:purpose/gco:CharacterString",
+                      "source": "/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:statement/gco:CharacterString",
+                      "createdDate": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:Date[../../gmd:dateType/gmd:CI_DateTypeCode[@codeListValue='creation']]",
+                      "lastRevisionDate": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:Date[../../gmd:dateType/gmd:CI_DateTypeCode[@codeListValue='revision']]",
+                      "pointsOfContact": {
+                        "xpath": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty",
+                        "properties": {
+                          "individualName": "gmd:individualName/gco:CharacterString",
+                          "organisationName": "gmd:organisationName/gco:CharacterString",
+                          "contactInfo": {
+                            "xpath": "gmd:contactInfo/gmd:CI_Contact",
                             "properties": {
-                                "title": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:title/gco:CharacterString",
-                                "abstract": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:abstract/gco:CharacterString",
-                                "purpose": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:purpose/gco:CharacterString",
-                                "source": "/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:statement/gco:CharacterString",
-                                "createdDate": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:Date[../../gmd:dateType/gmd:CI_DateTypeCode[@codeListValue='creation']]",
-                                "lastRevisionDate": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:Date[../../gmd:dateType/gmd:CI_DateTypeCode[@codeListValue='revision']]",
-                                "pointsOfContact": {
-                                    "xpath": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty",
-                                    "properties": {
-                                        "individualName": "gmd:individualName/gco:CharacterString",
-                                        "organisationName": "gmd:organisationName/gco:CharacterString",
-                                        "contactInfo": {
-                                            "xpath": "gmd:contactInfo/gmd:CI_Contact",
-                                            "properties": {
-                                                "phone": "gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString",
-                                                "deliveryPoints": "gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString",
-                                                "city": "gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString",
-                                                "postalCode": "gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString",
-                                                "country": "gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString",
-                                                "electronicMailAddress": "gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString",
-                                                "URL": "gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL",
-                                                "hoursOfService": "gmd:hoursOfService/gco:CharacterString"
-                                            }
-                                        },
-                                        "role": "gmd:role/gmd:CI_RoleCode/@codeListValue"
-                                    }
-                                }
+                              "phone": "gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString",
+                              "deliveryPoints": "gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString",
+                              "city": "gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString",
+                              "postalCode": "gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString",
+                              "country": "gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString",
+                              "electronicMailAddress": "gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString",
+                              "URL": "gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL",
+                              "hoursOfService": "gmd:hoursOfService/gco:CharacterString"
                             }
-                        }]
+                          },
+                          "role": "gmd:role/gmd:CI_RoleCode/@codeListValue"
+                        }
+                      }
                     }
-                }
+                  }
+                ]
+              }
+            }
+          }, {
+                "name": "TOC"
             },
             "FilterLayer",
             "AddGroup",
@@ -738,8 +733,6 @@
             "name": "TOC",
             "cfg": {
               "activateMapTitle": false,
-              "activateSettingsTool": false,
-              "activateMetedataTool": false,
               "activateRemoveLayer": false
             }
           },
diff --git a/configs/pluginsConfig.json b/configs/pluginsConfig.json
index 98a762a9e..c8f37f98b 100644
--- a/configs/pluginsConfig.json
+++ b/configs/pluginsConfig.json
@@ -5,7 +5,6 @@
       "glyph": "1-map",
       "mandatory": true,
       "defaultConfig": {
-        "mapTypeOverride": "openlayers",
         "mapOptions": {
           "openlayers": {
             "interactions": {
@@ -59,7 +58,8 @@
         "FeatureEditor",
         "FilterLayer",
         "AddGroup",
-        "Swipe"
+        "Swipe",
+        "MetadataInfo"
       ],
       "autoEnableChildren": [
         "TOCItemsSettings",
@@ -213,7 +213,8 @@
       "title": "plugins.Home.title",
       "description": "plugins.Home.description",
       "dependencies": [
-        "OmniBar"
+        "OmniBar",
+        "SidebarMenu"
       ]
     },
     {
@@ -397,6 +398,9 @@
     {
       "name": "Swipe"
     },
+    {
+      "name": "MetadataInfo"
+    },
     {
       "name": "SearchByBookmark"
     },
@@ -485,9 +489,14 @@
       "denyUserSelection": true,
       "title": "plugins.Save.title",
       "description": "plugins.Save.description",
-      "dependencies": [
-        "SidebarMenu",
+      "children": [
         "SaveAs"
+      ],
+      "autoEnableChildren": [
+        "SaveAs"
+      ],
+      "dependencies": [
+        "SidebarMenu"
       ]
     },
     {
diff --git a/dashboard-embedded-template.html b/dashboard-embedded-template.html
index f788f772f..767a984eb 100644
--- a/dashboard-embedded-template.html
+++ b/dashboard-embedded-template.html
@@ -96,7 +96,9 @@
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
         <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
-        <script async type="text/javascript" src="https://unpkg.com/bowser@2.7.0/es5.js" onload="checkBrowser()"></script>
+        <script src="https://unpkg.com/bowser@2.7.0/es5.js"
+            async integrity="sha384-CWiXbo5RNu6nv9tiCWA2y1DQKjEQDDH+yFQga1FytuIZjOTcVr+4ojw2S2lShj/d" crossorigin="anonymous"
+            onload="checkBrowser()"></script>
         <script type="text/javascript">
             function checkBrowser() {
                 var browserInfo = bowser.getParser(window.navigator.userAgent);
diff --git a/embeddedTemplate.html b/embeddedTemplate.html
index 07b2e961c..940243cd3 100644
--- a/embeddedTemplate.html
+++ b/embeddedTemplate.html
@@ -105,7 +105,9 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
         <link rel="shortcut icon" type="image/png" href="/favicon.ico" />
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
-        <script async type="text/javascript" src="https://unpkg.com/bowser@2.7.0/es5.js" onload="checkBrowser()"></script>
+        <script src="https://unpkg.com/bowser@2.7.0/es5.js"
+            async integrity="sha384-CWiXbo5RNu6nv9tiCWA2y1DQKjEQDDH+yFQga1FytuIZjOTcVr+4ojw2S2lShj/d" crossorigin="anonymous"
+            onload="checkBrowser()"></script>
         <script type="text/javascript">
             function checkBrowser() {
                 var browserInfo = bowser.getParser(window.navigator.userAgent);
diff --git a/geostory-embedded-template.html b/geostory-embedded-template.html
index 93c7d7756..b27039fc0 100644
--- a/geostory-embedded-template.html
+++ b/geostory-embedded-template.html
@@ -96,7 +96,9 @@
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
     <link rel="shortcut icon" type="image/png" href="/favicon.ico" />
     <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
-    <script async type="text/javascript" src="https://unpkg.com/bowser@2.7.0/es5.js" onload="checkBrowser()"></script>
+    <script src="https://unpkg.com/bowser@2.7.0/es5.js"
+        async integrity="sha384-CWiXbo5RNu6nv9tiCWA2y1DQKjEQDDH+yFQga1FytuIZjOTcVr+4ojw2S2lShj/d" crossorigin="anonymous"
+        onload="checkBrowser()"></script>
     <script type="text/javascript">
         function checkBrowser() {
             var browserInfo = bowser.getParser(window.navigator.userAgent);
diff --git a/indexTemplate.html b/indexTemplate.html
index 0328108b9..c92b71068 100644
--- a/indexTemplate.html
+++ b/indexTemplate.html
@@ -123,7 +123,9 @@
       </style>
       <link rel="stylesheet" href="assets/css/font-awesome.min.css" />
       <script src="assets/js/proj4.js"></script>
-      <script async type="text/javascript" src="assets/js/es5.js" onload="checkBrowser()"></script>
+      <script src="https://unpkg.com/bowser@2.7.0/es5.js"
+              async integrity="sha384-CWiXbo5RNu6nv9tiCWA2y1DQKjEQDDH+yFQga1FytuIZjOTcVr+4ojw2S2lShj/d" crossorigin="anonymous"
+              onload="checkBrowser()"></script>
       <script type="text/javascript">
           function checkBrowser() {
               var browserInfo = bowser.getParser(window.navigator.userAgent);
diff --git a/package.json b/package.json
index 0aea19c07..9a8b9706b 100644
--- a/package.json
+++ b/package.json
@@ -65,8 +65,8 @@
     "expect": "1.20.1",
     "file-loader": "2.0.0",
     "glob": "7.1.1",
-    "html-loader": "0.5.1",
-    "html-webpack-plugin": "4.5.0",
+    "html-loader": "2.0.0",
+    "html-webpack-plugin": "5.2.0",
     "jsdoc-jsx": "0.1.0",
     "karma": "6.4.0",
     "karma-chrome-launcher": "3.1.1",
@@ -82,7 +82,7 @@
     "karma-webpack": "5.0.0",
     "less": "4.1.1",
     "less-loader": "8.0.0",
-    "markdownlint-cli": "0.32.2",
+    "markdownlint-cli": "0.34.0",
     "mini-css-extract-plugin": "1.3.9",
     "mkdirp": "0.5.1",
     "ncp": "2.0.0",
@@ -107,7 +107,7 @@
     "terser": "5.18.1",
     "url-loader": "0.5.7",
     "vusion-webfonts-generator": "0.4.1",
-    "webpack": "5.9.0",
+    "webpack": "5.54.0",
     "webpack-bundle-size-analyzer": "2.0.2",
     "webpack-cli": "4.10.0",
     "webpack-dev-server": "3.11.0"
diff --git a/web/pom.xml b/web/pom.xml
index bff5983ff..edbe3fddf 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -24,13 +24,26 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <resources.output.dir>${basedir}/target/mapstore</resources.output.dir>
     <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
+      <tomcat.version>8.5.69</tomcat.version>
+      <tomcat.port>8080</tomcat.port>
+      <mapstore-services.version>1.8-SNAPSHOT</mapstore-services.version>
+      <geostore-webapp.version>2.2.0</geostore-webapp.version>
+      <http_proxy.version>1.5.0</http_proxy.version>
+      <print-lib.version>2.3.1</print-lib.version>
+      <httpclient.version>4.5.13</httpclient.version>
+      <junit.version>4.13.1</junit.version>
+      <mockito-core.version>4.0.0</mockito-core.version>
+      <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
+      <ehcache-web.version>2.0.4</ehcache-web.version>
+      <commons-pool.version>1.5.4</commons-pool.version>
+      <jaxws-api.version>2.3.1</jaxws-api.version>
   </properties>
   <dependencies>
     <!-- MapStore backend -->
     <dependency>
-      <groupId>it.geosolutions.mapstore</groupId>
-      <artifactId>mapstore-services</artifactId>
-      <version>1.6.2</version>
+        <groupId>it.geosolutions.mapstore</groupId>
+        <artifactId>mapstore-services</artifactId>
+        <version>${mapstore-services.version}</version>
     </dependency>
     <!-- ================================================================ -->
     <!-- GeoStore modules -->
@@ -38,14 +51,14 @@
     <dependency>
       <groupId>it.geosolutions.geostore</groupId>
       <artifactId>geostore-webapp</artifactId>
-      <version>2.0.0</version>
+      <version>${geostore-webapp.version}</version>
       <type>war</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>proxy</groupId>
       <artifactId>http_proxy</artifactId>
-      <version>1.4.0</version>
+      <version>${http_proxy.version}</version>
       <type>war</type>
       <scope>runtime</scope>
     </dependency>
@@ -86,20 +99,17 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
-      <version>4.13.1</version>
     </dependency>
     <!--  mockito -->
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>4.0.0</version>
       <scope>test</scope>
     </dependency>
     <!-- servlet -->
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>3.0.1</version>
     </dependency>
     <dependency>
         <groupId>jstl</groupId>
@@ -110,13 +120,11 @@
     <dependency>
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache-web</artifactId>
-      <version>2.0.4</version>
     </dependency>
     <!-- misc -->
     <dependency>
         <groupId>commons-pool</groupId>
         <artifactId>commons-pool</artifactId>
-        <version>1.5.4</version>
     </dependency>
   </dependencies>
 
@@ -412,6 +420,39 @@
           </overlays>
         </configuration>
       </plugin>
+
+    <plugin>
+        <groupId>org.codehaus.cargo</groupId>
+        <artifactId>cargo-maven3-plugin</artifactId>
+        <configuration>
+            <container>
+                <containerId>tomcat8x</containerId>
+                <zipUrlInstaller>
+                    <url>https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/8.5.69/tomcat-8.5.69.zip</url>
+                </zipUrlInstaller>
+            </container>
+            <configuration>
+                <type>standalone</type>
+                <home>
+                    ${project.build.directory}/apache-tomcat-${tomcat.version}
+                </home>
+                <properties>
+                    <cargo.servlet.port>${tomcat.port}</cargo.servlet.port>
+                    <cargo.logging>low</cargo.logging>
+                </properties>
+            </configuration>
+            <deployables>
+                <deployable>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>${project.artifactId}</artifactId>
+                    <type>war</type>
+                    <properties>
+                        <context>/mapstore</context>
+                    </properties>
+                </deployable>
+            </deployables>
+        </configuration>
+    </plugin>
       <!-- Run the application using "mvn jetty:run" -->
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
@@ -554,8 +595,72 @@
                             <excludeAllDependencies>true</excludeAllDependencies>
                         </configuration>
                     </plugin>
+                    <plugin>
+                        <groupId>com.coderplus.maven.plugins</groupId>
+                        <artifactId>copy-rename-maven-plugin</artifactId>
+                        <version>1.0</version>
+                        <executions>
+                            <execution>
+                                <id>rename-context</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <overWrite>true</overWrite>
+                                    <sourceFile>src/printing/applicationContext-print.xml</sourceFile>
+                                    <destinationFile>target/mapstore/WEB-INF/classes/applicationContext-print.xml</destinationFile>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                 </plugins>
             </build>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpclient</artifactId>
+                        <version>${httpclient.version}</version>
+                    </dependency>
+                    <!-- JUnit -->
+                    <dependency>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                        <scope>test</scope>
+                        <version>${junit.version}</version>
+                    </dependency>
+                    <!--  mockito -->
+                    <dependency>
+                        <groupId>org.mockito</groupId>
+                        <artifactId>mockito-core</artifactId>
+                        <version>${mockito-core.version}</version>
+                    </dependency>
+                    <!-- servlet -->
+                    <dependency>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>javax.servlet-api</artifactId>
+                        <version>${javax.servlet-api.version}</version>
+                    </dependency>
+                    <!-- gzip compression filter -->
+                    <dependency>
+                        <groupId>net.sf.ehcache</groupId>
+                        <artifactId>ehcache-web</artifactId>
+                        <version>${ehcache-web.version}</version>
+                    </dependency>
+                    <!-- misc -->
+                    <dependency>
+                        <groupId>commons-pool</groupId>
+                        <artifactId>commons-pool</artifactId>
+                        <version>${commons-pool.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.xml.ws</groupId>
+                        <artifactId>jaxws-api</artifactId>
+                        <version>${jaxws-api.version}</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
         </profile>
     </profiles>
   <repositories>
@@ -579,6 +684,16 @@
         </snapshots>
     </repository>
 
+      <!-- OSGEO snapshot (mapfish-print)-->
+      <repository>
+          <id>osgeo-snapshot</id>
+          <name>Open Source Geospatial Foundation Repository</name>
+          <url>https://repo.osgeo.org/repository/snapshot/</url>
+          <snapshots>
+              <enabled>true</enabled>
+          </snapshots>
+      </repository>
+
      <!-- Georchestra -->
      <repository>
         <id>georchestra</id>
diff --git a/web/src/main/resources/proxy.properties b/web/src/main/resources/proxy.properties
index 5503f889e..0a09cb204 100644
--- a/web/src/main/resources/proxy.properties
+++ b/web/src/main/resources/proxy.properties
@@ -27,4 +27,4 @@ reqtypeWhitelist.capabilities = .*[Gg]et[Cc]apabilities.*
 reqtypeWhitelist.featureinfo = .*[Gg]et[Ff]eature[Ii]nfo.*
 reqtypeWhitelist.csw = .*csw.*
 reqtypeWhitelist.geostore = .*geostore.*
-reqtypeWhitelist.generic = (.*exist.*)|(.*pdf.*)|(.*map.*)|(.*wms.*)|(.*wmts.*)|(.*tms.*)|(.*wfs.*)|(.*ows.*)|(.*spatialreference.*)|(.*wps.*)|(.*rest.*)|(.*tileset\.json.*)|(.*\.b3dm.*)|(.*\.i3dm.*)|(.*\.pnts.*)|(.*\.glb.*)
+reqtypeWhitelist.generic = (.*exist.*)|(.*pdf.*)|(.*map.*)|(.*wms.*)|(.*wmts.*)|(.*tms.*)|(.*wfs.*)|(.*ows.*)|(.*spatialreference.*)|(.*wps.*)|(.*rest.*)|(.*tileset\.json.*)|(.*\.b3dm.*)|(.*\.i3dm.*)|(.*\.pnts.*)|(.*\.glb.*)|(.*\.ifc.*)

From 3d0f96cf56146df734bd301821046e9bb95c2079 Mon Sep 17 00:00:00 2001
From: Suren <dsuren1@gmail.com>
Date: Tue, 15 Oct 2024 12:02:03 +0530
Subject: [PATCH 02/13] version updated

---
 package.json |  2 +-
 version.txt  |  4 ++--
 web/pom.xml  | 43 ++++++-------------------------------------
 3 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/package.json b/package.json
index 9a8b9706b..db876f600 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "georchestra",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "geOrchestra",
   "repository": "https://github.com/georchestra/mapstore2-georchestra",
   "main": "index.js",
diff --git a/version.txt b/version.txt
index 66b9d0b8b..24d0cdf89 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
-2023.02.xx
-2023.02.xx
+2024.02.xx
+2024.02.xx
diff --git a/web/pom.xml b/web/pom.xml
index edbe3fddf..9a58757da 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
         <groupId>org.mapfish.print</groupId>
         <artifactId>print-lib</artifactId>
-        <version>geosolutions-2.2.0</version>
+        <version>${print-lib.version}</version>
         <exclusions>
             <exclusion>
                 <groupId>commons-codec</groupId>
@@ -99,17 +99,20 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
+      <version>${junit.version}</version>
     </dependency>
     <!--  mockito -->
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
+      <version>${mockito-core.version}</version>
     </dependency>
     <!-- servlet -->
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
+      <version>${javax.servlet-api.version}</version>
     </dependency>
     <dependency>
         <groupId>jstl</groupId>
@@ -120,11 +123,13 @@
     <dependency>
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache-web</artifactId>
+      <version>${ehcache-web.version}</version>
     </dependency>
     <!-- misc -->
     <dependency>
         <groupId>commons-pool</groupId>
         <artifactId>commons-pool</artifactId>
+        <version>${commons-pool.version}</version>
     </dependency>
   </dependencies>
 
@@ -623,42 +628,6 @@
                         <artifactId>httpclient</artifactId>
                         <version>${httpclient.version}</version>
                     </dependency>
-                    <!-- JUnit -->
-                    <dependency>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
-                        <scope>test</scope>
-                        <version>${junit.version}</version>
-                    </dependency>
-                    <!--  mockito -->
-                    <dependency>
-                        <groupId>org.mockito</groupId>
-                        <artifactId>mockito-core</artifactId>
-                        <version>${mockito-core.version}</version>
-                    </dependency>
-                    <!-- servlet -->
-                    <dependency>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>javax.servlet-api</artifactId>
-                        <version>${javax.servlet-api.version}</version>
-                    </dependency>
-                    <!-- gzip compression filter -->
-                    <dependency>
-                        <groupId>net.sf.ehcache</groupId>
-                        <artifactId>ehcache-web</artifactId>
-                        <version>${ehcache-web.version}</version>
-                    </dependency>
-                    <!-- misc -->
-                    <dependency>
-                        <groupId>commons-pool</groupId>
-                        <artifactId>commons-pool</artifactId>
-                        <version>${commons-pool.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.xml.ws</groupId>
-                        <artifactId>jaxws-api</artifactId>
-                        <version>${jaxws-api.version}</version>
-                    </dependency>
                 </dependencies>
             </dependencyManagement>
         </profile>

From f213c9b704ca528a50550a5684b128b0653a02ed Mon Sep 17 00:00:00 2001
From: Suren <dsuren1@gmail.com>
Date: Tue, 15 Oct 2024 18:06:01 +0530
Subject: [PATCH 03/13] pom updated

---
 web/pom.xml | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/web/pom.xml b/web/pom.xml
index 9a58757da..68e05b6ac 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -600,36 +600,8 @@
                             <excludeAllDependencies>true</excludeAllDependencies>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>com.coderplus.maven.plugins</groupId>
-                        <artifactId>copy-rename-maven-plugin</artifactId>
-                        <version>1.0</version>
-                        <executions>
-                            <execution>
-                                <id>rename-context</id>
-                                <phase>prepare-package</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <overWrite>true</overWrite>
-                                    <sourceFile>src/printing/applicationContext-print.xml</sourceFile>
-                                    <destinationFile>target/mapstore/WEB-INF/classes/applicationContext-print.xml</destinationFile>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpclient</artifactId>
-                        <version>${httpclient.version}</version>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
         </profile>
     </profiles>
   <repositories>

From 7dbe460cc4592dbf1149b2aa4f56cb9a463c29a2 Mon Sep 17 00:00:00 2001
From: Suren <dsuren1@gmail.com>
Date: Tue, 15 Oct 2024 18:56:12 +0530
Subject: [PATCH 04/13] workflow update

---
 .github/workflows/mapstore.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/mapstore.yml b/.github/workflows/mapstore.yml
index 9b8b7d00c..e5192ef6c 100644
--- a/.github/workflows/mapstore.yml
+++ b/.github/workflows/mapstore.yml
@@ -71,7 +71,7 @@ jobs:
       run: mkdir -p scratch && cp web/target/georchestra-mapstore*.deb scratch/georchestra-mapstore-${{ github.sha }}.deb
 
     - name: "publish deb as artifact"
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: georchestra-mapstore.deb
         path: scratch/georchestra-mapstore-${{ github.sha }}.deb
@@ -80,7 +80,7 @@ jobs:
       run: mkdir -p scratch && cp web/target/mapstore.war scratch/mapstore-${{ github.sha }}.war
 
     - name: "publish war as artifact"
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: mapstore.war
         path: scratch/mapstore-${{ github.sha }}.war

From 55df370c0355c4d03279b3ba0d29058cd706f804 Mon Sep 17 00:00:00 2001
From: Suren <dsuren1@gmail.com>
Date: Tue, 15 Oct 2024 19:18:26 +0530
Subject: [PATCH 05/13] add missing theme variables

---
 themes/default/variables.less | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/themes/default/variables.less b/themes/default/variables.less
index 624aa3810..a6e559286 100644
--- a/themes/default/variables.less
+++ b/themes/default/variables.less
@@ -59,6 +59,10 @@
 @ms-focus-color: rgba(@ms-primary, 0.4);
 @ms-placeholder-color: lighten(@ms-main-color, 30%);
 
+@ms-selected-color: rgba(@ms-primary, 0.4);
+@ms-selected-bg: rgba(@ms-focus-color, 0.4); 
+@ms-selected-hover-bg: rgba(@ms-focus-color, 0.1);
+
 @ms-jumbotron-color: @ms-main-color;
 @ms-jumbotron-bg: rgba(@ms-main-bg, 0.75);
 
@@ -117,6 +121,10 @@
     // outline color or border color for focused element
     focus-color: --ms-focus-color, var(--georchestra-ms-focus-color, @ms-focus-color);
 
+    selected-color: --ms-selected-color, @ms-selected-color;
+    selected-bg: --ms-selected-bg, @ms-selected-bg;
+    selected-hover-bg: --ms-selected-hover-bg, @ms-selected-hover-bg;
+    
     // **************
     // text color for placeholders
     placeholder-color: --ms-placeholder-color, var(--georchestra-ms-placeholder-color, @ms-placeholder-color);

From b1a77d1648d6145dd8b780cbd29b994f7554165a Mon Sep 17 00:00:00 2001
From: Suren <dsuren1@gmail.com>
Date: Wed, 16 Oct 2024 12:00:26 +0530
Subject: [PATCH 06/13] fix build

---
 assets/css/font-awesome.min.css | 4 ----
 embedded.html                   | 1 -
 embeddedTemplate.html           | 1 -
 favicon.ico                     | 0
 index.html                      | 1 -
 indexTemplate.html              | 1 -
 package.json                    | 2 +-
 7 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 assets/css/font-awesome.min.css
 create mode 100644 favicon.ico

diff --git a/assets/css/font-awesome.min.css b/assets/css/font-awesome.min.css
deleted file mode 100644
index 540440ce8..000000000
--- a/assets/css/font-awesome.min.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*!
- *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-resistance:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-vcard:before,.fa-address-card:before{content:"\f2bb"}.fa-vcard-o:before,.fa-address-card-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer:before,.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bathtub:before,.fa-s15:before,.fa-bath:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}
diff --git a/embedded.html b/embedded.html
index 9e0c92c5a..db0b93b14 100644
--- a/embedded.html
+++ b/embedded.html
@@ -102,7 +102,6 @@
         </style>
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
         <link rel="shortcut icon" type="image/png" href="/favicon.ico" />
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
     </head>
diff --git a/embeddedTemplate.html b/embeddedTemplate.html
index 940243cd3..2f04df3f0 100644
--- a/embeddedTemplate.html
+++ b/embeddedTemplate.html
@@ -102,7 +102,6 @@
         </style>
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
         <link rel="shortcut icon" type="image/png" href="/favicon.ico" />
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
         <script src="https://unpkg.com/bowser@2.7.0/es5.js"
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 000000000..e69de29bb
diff --git a/index.html b/index.html
index 22f9f80ec..8f59976c3 100644
--- a/index.html
+++ b/index.html
@@ -121,7 +121,6 @@
                 src: local('Noto Sans'), local('NotoSans-Regular'), url(assets/fonts/NotoSans.ttf) format('truetype');
             }
         </style>
-        <link rel="stylesheet" href="assets/css/font-awesome.min.css" />
         <link rel="shortcut icon" type="image/png" href="/favicon.ico" />
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
         <!--<script src="https://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=__API_KEY_MAPQUEST__"></script>-->
diff --git a/indexTemplate.html b/indexTemplate.html
index c92b71068..cb95ce307 100644
--- a/indexTemplate.html
+++ b/indexTemplate.html
@@ -121,7 +121,6 @@
                 src: local('Noto Sans'), local('NotoSans-Regular'), url(assets/fonts/NotoSans.ttf) format('truetype');
           }
       </style>
-      <link rel="stylesheet" href="assets/css/font-awesome.min.css" />
       <script src="assets/js/proj4.js"></script>
       <script src="https://unpkg.com/bowser@2.7.0/es5.js"
               async integrity="sha384-CWiXbo5RNu6nv9tiCWA2y1DQKjEQDDH+yFQga1FytuIZjOTcVr+4ojw2S2lShj/d" crossorigin="anonymous"
diff --git a/package.json b/package.json
index db876f600..d56b443a2 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "expect": "1.20.1",
     "file-loader": "2.0.0",
     "glob": "7.1.1",
-    "html-loader": "2.0.0",
+    "html-loader": "2.1.2",
     "html-webpack-plugin": "5.2.0",
     "jsdoc-jsx": "0.1.0",
     "karma": "6.4.0",

From 78b3317f3520dd70c047bd8e519cfa43245839ea Mon Sep 17 00:00:00 2001
From: Suren <dsuren1@gmail.com>
Date: Wed, 16 Oct 2024 16:21:58 +0530
Subject: [PATCH 07/13] ms service to stable

---
 web/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/pom.xml b/web/pom.xml
index 68e05b6ac..c9e075ebc 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -26,7 +26,7 @@
     <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
       <tomcat.version>8.5.69</tomcat.version>
       <tomcat.port>8080</tomcat.port>
-      <mapstore-services.version>1.8-SNAPSHOT</mapstore-services.version>
+      <mapstore-services.version>1.8.0</mapstore-services.version>
       <geostore-webapp.version>2.2.0</geostore-webapp.version>
       <http_proxy.version>1.5.0</http_proxy.version>
       <print-lib.version>2.3.1</print-lib.version>

From e987907be973590abcfffa47e69e48fa4ad437be Mon Sep 17 00:00:00 2001
From: Suren <dsuren1@gmail.com>
Date: Fri, 18 Oct 2024 13:31:01 +0530
Subject: [PATCH 08/13] snapshot repo removed

---
 web/pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/web/pom.xml b/web/pom.xml
index c9e075ebc..20e22abd3 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -625,16 +625,6 @@
         </snapshots>
     </repository>
 
-      <!-- OSGEO snapshot (mapfish-print)-->
-      <repository>
-          <id>osgeo-snapshot</id>
-          <name>Open Source Geospatial Foundation Repository</name>
-          <url>https://repo.osgeo.org/repository/snapshot/</url>
-          <snapshots>
-              <enabled>true</enabled>
-          </snapshots>
-      </repository>
-
      <!-- Georchestra -->
      <repository>
         <id>georchestra</id>

From e53afb399b7243fc1a92e3c46e7234fc0c1d7821 Mon Sep 17 00:00:00 2001
From: Suren <dsuren1@gmail.com>
Date: Mon, 21 Oct 2024 12:42:12 +0530
Subject: [PATCH 09/13] config updated

---
 configs/localConfig.json |  45 ++++++++---
 web/pom.xml              | 161 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 196 insertions(+), 10 deletions(-)

diff --git a/configs/localConfig.json b/configs/localConfig.json
index 878267be3..6e70e402c 100644
--- a/configs/localConfig.json
+++ b/configs/localConfig.json
@@ -833,17 +833,44 @@
             "fluid": true
           }
         }],
-      "dashboard": [{
-        "name": "OmniBar",
-        "cfg": {
-          "containerPosition": "header",
-          "className": "navbar shadow navbar-home"
-        }
-      }, "Login", "Language", "NavMenu",
+      "dashboard": [
+        {
+          "name": "OmniBar",
+          "cfg": {
+            "containerPosition": "header",
+            "className": "navbar shadow navbar-home"
+          }
+        }, 
+        "Details",
+        "AddWidgetDashboard",
+        "MapConnectionDashboard",
+        {
+          "name": "SidebarMenu",
+          "cfg": {
+            "containerPosition": "columns"
+          }
+        },
+        {
+          "name": "Home",
+          "override": {
+            "OmniBar": {
+              "priority": 5
+            }
+          }
+        },
+        {
+          "name": "Login",
+          "override": {
+            "OmniBar": {
+              "priority": 5
+            }
+          }
+        },
+        "Language", "NavMenu",
         "DashboardSave", "DashboardSaveAs",
         "DashboardExport", "DashboardImport",
         "DeleteDashboard",
-        "Attribution", "Home", {
+        "Attribution", {
         "name": "Share",
         "cfg": {
           "showAPI": false,
@@ -888,7 +915,7 @@
             },
             "containerPosition": "columns"
           }
-        }, "BurgerMenu", "Dashboard", "Notifications", {
+        }, "Dashboard", "Notifications", {
           "name": "Tutorial",
           "cfg": {
             "allowClicksThruHole": false,
diff --git a/web/pom.xml b/web/pom.xml
index 20e22abd3..6ee2e9a85 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -37,6 +37,7 @@
       <ehcache-web.version>2.0.4</ehcache-web.version>
       <commons-pool.version>1.5.4</commons-pool.version>
       <jaxws-api.version>2.3.1</jaxws-api.version>
+      <jstl.version>1.2</jstl.version>
   </properties>
   <dependencies>
     <!-- MapStore backend -->
@@ -117,7 +118,7 @@
     <dependency>
         <groupId>jstl</groupId>
         <artifactId>jstl</artifactId>
-        <version>1.2</version>
+        <version>${jstl.version}</version>
     </dependency>
     <!-- gzip compression filter -->
     <dependency>
@@ -602,6 +603,164 @@
                     </plugin>
                 </plugins>
             </build>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>jstl</groupId>
+                        <artifactId>jstl</artifactId>
+                        <version>${jstl.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpclient</artifactId>
+                        <version>${httpclient.version}</version>
+                    </dependency>
+                    <!-- JUnit -->
+                    <dependency>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                        <scope>test</scope>
+                        <version>${junit.version}</version>
+                    </dependency>
+                    <!--  mockito -->
+                    <dependency>
+                        <groupId>org.mockito</groupId>
+                        <artifactId>mockito-core</artifactId>
+                        <version>${mockito-core.version}</version>
+                    </dependency>
+                    <!-- servlet -->
+                    <dependency>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>javax.servlet-api</artifactId>
+                        <version>${javax.servlet-api.version}</version>
+                    </dependency>
+                    <!-- gzip compression filter -->
+                    <dependency>
+                        <groupId>net.sf.ehcache</groupId>
+                        <artifactId>ehcache-web</artifactId>
+                        <version>${ehcache-web.version}</version>
+                    </dependency>
+                    <!-- misc -->
+                    <dependency>
+                        <groupId>commons-pool</groupId>
+                        <artifactId>commons-pool</artifactId>
+                        <version>${commons-pool.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.xml.ws</groupId>
+                        <artifactId>jaxws-api</artifactId>
+                        <version>${jaxws-api.version}</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+        <profile>
+            <id>printing</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.coderplus.maven.plugins</groupId>
+                        <artifactId>copy-rename-maven-plugin</artifactId>
+                        <version>1.0</version>
+                        <executions>
+                            <execution>
+                                <id>rename-context</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <overWrite>true</overWrite>
+                                    <sourceFile>src/printing/applicationContext-print.xml</sourceFile>
+                                    <destinationFile>target/mapstore/WEB-INF/classes/applicationContext-print.xml</destinationFile>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpclient</artifactId>
+                        <version>${httpclient.version}</version>
+                    </dependency>
+                    <!-- JUnit -->
+                    <dependency>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                        <scope>test</scope>
+                        <version>${junit.version}</version>
+                    </dependency>
+                    <!--  mockito -->
+                    <dependency>
+                        <groupId>org.mockito</groupId>
+                        <artifactId>mockito-core</artifactId>
+                        <version>${mockito-core.version}</version>
+                    </dependency>
+                    <!-- servlet -->
+                    <dependency>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>javax.servlet-api</artifactId>
+                        <version>${javax.servlet-api.version}</version>
+                    </dependency>
+                    <!-- gzip compression filter -->
+                    <dependency>
+                        <groupId>net.sf.ehcache</groupId>
+                        <artifactId>ehcache-web</artifactId>
+                        <version>${ehcache-web.version}</version>
+                    </dependency>
+                    <!-- misc -->
+                    <dependency>
+                        <groupId>commons-pool</groupId>
+                        <artifactId>commons-pool</artifactId>
+                        <version>${commons-pool.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.xml.ws</groupId>
+                        <artifactId>jaxws-api</artifactId>
+                        <version>${jaxws-api.version}</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <dependencies>
+                <!-- mapfish-print -->
+                <dependency>
+                    <groupId>org.mapfish.print</groupId>
+                    <artifactId>print-lib</artifactId>
+                    <version>${print-lib.version}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>commons-codec</groupId>
+                            <artifactId>commons-codec</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>com.fasterxml.jackson.core</groupId>
+                            <artifactId>jackson-annotations</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>com.fasterxml.jackson.core</groupId>
+                            <artifactId>jackson-core</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>com.fasterxml.jackson.core</groupId>
+                            <artifactId>jackson-databind</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.springframework</groupId>
+                            <artifactId>spring-web</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.springframework</groupId>
+                            <artifactId>spring-context</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
         </profile>
     </profiles>
   <repositories>

From 0e8fa209528c8483c715a8b911cdb365d4f14ac4 Mon Sep 17 00:00:00 2001
From: Lorenzo Natali <lorenzo.natali@geosolutionsgroup.com>
Date: Tue, 22 Oct 2024 12:21:11 +0200
Subject: [PATCH 10/13] Fixed dependencies

---
 pom.xml     |  6 +++---
 web/pom.xml | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 42212ea46..fc6430226 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,17 +18,17 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-core</artifactId>
-                <version>2.13.1</version>
+                <version>2.16.1</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>
-                <version>2.13.1</version>
+                <version>2.16.1</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>2.13.1</version>
+                <version>2.16.1</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/web/pom.xml b/web/pom.xml
index 6ee2e9a85..9762da035 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -45,6 +45,25 @@
         <groupId>it.geosolutions.mapstore</groupId>
         <artifactId>mapstore-services</artifactId>
         <version>${mapstore-services.version}</version>
+        <!-- Fix issuew with MapStoter 2024.02.00 -->
+        <exclusions>
+            <exclusion>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-core</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-web</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-config</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-ldap</artifactId>
+            </exclusion>
+        </exclusions>
     </dependency>
     <!-- ================================================================ -->
     <!-- GeoStore modules -->

From 7a0d3d5cbbca479c67c045bae9c60a50337321e0 Mon Sep 17 00:00:00 2001
From: Lorenzo Natali <lorenzo.natali@geosolutionsgroup.com>
Date: Tue, 22 Oct 2024 13:08:59 +0200
Subject: [PATCH 11/13] Fixed missing file copy

---
 web/pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/web/pom.xml b/web/pom.xml
index 9762da035..f7819e017 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -226,6 +226,52 @@
               </resources>
             </configuration>
           </execution>
+          <execution>
+                <id>only dashboard-embedded.html</id>
+                <phase>process-classes</phase>
+                <goals>
+                    <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                    <outputDirectory>${resources.output.dir}</outputDirectory>
+                    <encoding>UTF-8</encoding>
+                    <resources>
+                        <resource>
+                            <directory>${basedir}/../dist</directory>
+                            <includes>
+                                <include>dashboard-embedded.html</include>
+                            </includes>
+                            <excludes>
+                                <exclude>MapStore2/*</exclude>
+                                <exclude>MapStore2/**/*</exclude>
+                            </excludes>
+                        </resource>
+                    </resources>
+                </configuration>
+            </execution>
+            <execution>
+                <id>only geostory-embedded.html</id>
+                <phase>process-classes</phase>
+                <goals>
+                    <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                    <outputDirectory>${resources.output.dir}</outputDirectory>
+                    <encoding>UTF-8</encoding>
+                    <resources>
+                        <resource>
+                            <directory>${basedir}/../dist</directory>
+                            <includes>
+                                <include>geostory-embedded.html</include>
+                            </includes>
+                            <excludes>
+                                <exclude>MapStore2/*</exclude>
+                                <exclude>MapStore2/**/*</exclude>
+                            </excludes>
+                        </resource>
+                    </resources>
+                </configuration>
+            </execution>
           <execution>
             <id>only api.html</id>
             <phase>process-classes</phase>

From 3352f0104eb3d041c88e558c43da203a040728fd Mon Sep 17 00:00:00 2001
From: Lorenzo Natali <lorenzo.natali@geosolutionsgroup.com>
Date: Tue, 22 Oct 2024 13:50:31 +0200
Subject: [PATCH 12/13] Update pom.xml

---
 web/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/pom.xml b/web/pom.xml
index f7819e017..b90f2b032 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -45,7 +45,7 @@
         <groupId>it.geosolutions.mapstore</groupId>
         <artifactId>mapstore-services</artifactId>
         <version>${mapstore-services.version}</version>
-        <!-- Fix issuew with MapStoter 2024.02.00 -->
+        <!-- Fix issuew with MapStore 2024.02.00 spring secuirty duplication. Could be removed for 2024.02.01 -->
         <exclusions>
             <exclusion>
                 <groupId>org.springframework.security</groupId>

From 027367f39c354c55f341163f85b1c761c4a29de9 Mon Sep 17 00:00:00 2001
From: Lorenzo Natali <lorenzo.natali@geosolutionsgroup.com>
Date: Tue, 22 Oct 2024 16:20:24 +0200
Subject: [PATCH 13/13] Use mapstore services 1.8-SNAPSHOT

---
 web/pom.xml | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/web/pom.xml b/web/pom.xml
index b90f2b032..5da300b58 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -26,7 +26,7 @@
     <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
       <tomcat.version>8.5.69</tomcat.version>
       <tomcat.port>8080</tomcat.port>
-      <mapstore-services.version>1.8.0</mapstore-services.version>
+      <mapstore-services.version>1.8-SNAPSHOT</mapstore-services.version>
       <geostore-webapp.version>2.2.0</geostore-webapp.version>
       <http_proxy.version>1.5.0</http_proxy.version>
       <print-lib.version>2.3.1</print-lib.version>
@@ -45,25 +45,6 @@
         <groupId>it.geosolutions.mapstore</groupId>
         <artifactId>mapstore-services</artifactId>
         <version>${mapstore-services.version}</version>
-        <!-- Fix issuew with MapStore 2024.02.00 spring secuirty duplication. Could be removed for 2024.02.01 -->
-        <exclusions>
-            <exclusion>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-core</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-web</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-config</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-ldap</artifactId>
-            </exclusion>
-        </exclusions>
     </dependency>
     <!-- ================================================================ -->
     <!-- GeoStore modules -->