[dependabot] Dependencies upgrades

pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>it.geosolutions</groupId>
@@ -63,8 +64,8 @@
     <scm>
         <url>https://github.com/geosolutions-it/geostore</url>
         <connection>scm:git:[email protected]:geosolutions-it/geostore.git</connection>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
 
     <ciManagement>
         <system>jenkins</system>

src/cli/pom.xml

@@ -37,7 +37,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.3.175</version>
+            <version>2.2.220</version>
         </dependency>
 
    	    <!-- Apache Commons -->

src/core/persistence/pom.xml

@@ -143,7 +143,7 @@
         <dependency>
 		    <groupId>com.h2database</groupId>
 		    <artifactId>h2</artifactId>
-		    <version>1.3.175</version>
+		    <version>2.2.220</version>
 		</dependency>
 
 		<!-- HIBERNATE -->

src/core/security/pom.xml

@@ -96,7 +96,7 @@
 		</dependency>
         <dependency>
 	      <groupId>org.jasypt</groupId>
-	      <artifactId>jasypt</artifactId>
+	      <artifactId>jasypt-acegisecurity</artifactId>
 	   </dependency>
        <dependency>
             <groupId>org.acegisecurity</groupId>

src/core/security/src/main/java/it/geosolutions/geostore/core/security/password/GeoStoreDigestPasswordEncoder.java

@@ -21,12 +21,12 @@
 
 import org.apache.commons.codec.binary.Base64;
 import org.jasypt.digest.StandardByteDigester;
-import org.jasypt.spring.security.PasswordEncoder;
+import org.jasypt.acegisecurity.PasswordEncoder;
 import org.jasypt.util.password.StrongPasswordEncryptor;
 import static it.geosolutions.geostore.core.security.password.SecurityUtils.toBytes;
 
 /**
- * This Encoder provide encription and check of password using a digest
+ * This Encoder provide encryption and check of password using a digest
  * @author Lorenzo Natali (lorenzo.natali at geo-solutions.it)
  *
  */

src/modules/rest/impl/pom.xml

@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
             <artifactId>spring-security-oauth2</artifactId>
-            <version>2.0.16.RELEASE</version>
+            <version>2.0.17.RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>

src/modules/rest/impl/src/test/java/it/geosolutions/geostore/rest/service/impl/RESTResourceServiceImplTest.java

@@ -23,13 +23,10 @@
 import it.geosolutions.geostore.core.model.enums.DataType;
 import it.geosolutions.geostore.core.model.enums.Role;
 import it.geosolutions.geostore.services.ServiceTestBase;
-import it.geosolutions.geostore.services.exception.BadRequestServiceEx;
-import it.geosolutions.geostore.services.exception.NotFoundServiceEx;
 import it.geosolutions.geostore.services.rest.impl.RESTResourceServiceImpl;
 import it.geosolutions.geostore.services.rest.model.RESTAttribute;
 import it.geosolutions.geostore.services.rest.utils.MockSecurityContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.Assert;
 
 import javax.ws.rs.core.SecurityContext;
 import java.util.ArrayList;
@@ -43,15 +40,14 @@
 public class RESTResourceServiceImplTest extends ServiceTestBase {
 
     RESTResourceServiceImpl restService;
-    long adminID;
 
-    @Before
-    public void setUp() throws BadRequestServiceEx, NotFoundServiceEx {
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
         restService = new RESTResourceServiceImpl();
         restService.setResourceService(resourceService);
     }
 
-    @Test
     public void testUpdateResource_editorUpdate() throws Exception {
         // insert fake user for security context
         long u0ID = createUser("u0", Role.USER, "p0");
@@ -97,12 +93,12 @@ public void testUpdateResource_editorUpdate() throws Exception {
 
         // verify the attribute has been changed
         Attribute a = sr.getAttribute().get(0);
-        assertEquals(a.getName(), NAME);
-        assertEquals(a.getValue(), VALUE);
-        assertEquals(a.getType(), DataType.STRING);
+        Assert.assertEquals(a.getName(), NAME);
+        Assert.assertEquals(a.getValue(), VALUE);
+        Assert.assertEquals(a.getType(), DataType.STRING);
 
-        assertEquals(sr.getCreator(), "u0");
-        assertEquals(sr.getEditor(), "u0");
+        Assert.assertEquals(sr.getCreator(), "u0");
+        Assert.assertEquals(sr.getEditor(), "u0");
 
         // Update rule as "user1"
         // insert fake user for security context
@@ -127,11 +123,11 @@ public void testUpdateResource_editorUpdate() throws Exception {
 
         // verify the attribute has been changed
         a = sr.getAttribute().get(0);
-        assertEquals(a.getName(), NAME);
-        assertEquals(a.getValue(), VALUE);
-        assertEquals(a.getType(), DataType.STRING);
+        Assert.assertEquals(a.getName(), NAME);
+        Assert.assertEquals(a.getValue(), VALUE);
+        Assert.assertEquals(a.getType(), DataType.STRING);
 
-        assertEquals(sr.getCreator(), "u0");
-        assertEquals(sr.getEditor(), "u1");
+        Assert.assertEquals(sr.getCreator(), "u0");
+        Assert.assertEquals(sr.getEditor(), "u1");
     }
 }