Update dependencies

swri-robotics · May 23, 2017 · 29c9537 · 29c9537
1 parent af2757b
commit 29c9537
Show file tree

Hide file tree

Showing 18 changed files with 93,183 additions and 1,064 deletions.
diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md
@@ -6,59 +6,55 @@ Silk Icons
 
 #### This software uses the following open source libraries:
 
-AspectJ 1.8.9
+AspectJ 1.8.10
 - License: EPL 1.0
 - https://eclipse.org/aspectj/
 
-Spring Framework 4.3.0
+Spring Framework 4.3.9
 - License: Apache 2.0
 - http://projects.spring.io/spring-framework/
 
-Spring Data JPA 1.9.4
+Spring Data JPA 1.11.3
 - License: Apache 2.0
 - http://projects.spring.io/spring-data-jpa/
 
-Spring Security 4.0.3
+Spring Security 4.2.2
 - License: Apache 2.0
 - http://projects.spring.io/spring-security/
 
-Thymeleaf 2.1.4
+Thymeleaf 3.0.6
 - License: Apache 2.0
 - http://www.thymeleaf.org/
 
-HikariCP 2.4.5
+HikariCP 2.6.1
 - License: Apache 2.0
 - https://brettwooldridge.github.io/HikariCP/
 
-Hibernate ORM 5.1.0
+Hibernate ORM 5.2.10
 - License: LGPL 2.1
 - http://hibernate.org/orm/
 
-Hibernate Search 5.5.3
-- License: LGPL 2.1
-- http://hibernate.org/search/
-
-Logback 1.1.5
+Logback 1.1.11
 - License: LGPL 2.1
 - http://logback.qos.ch/
 
-H2 Database Engine 1.4.192
+H2 Database Engine 1.4.195
 - License: EPL 1.0
 - http://www.h2database.com/html/main.html
 
-H2GIS 1.3.0
+H2GIS 1.3.1
 - License: LGPL 3.0
 - http://www.h2gis.org/docs/home/
 
-SLF4J 1.7.16
+SLF4J 1.7.25
 - License: MIT
 - http://www.slf4j.org/
 
-Jackson Databind 2.6.5
+Jackson Databind 2.8.8
 - License: Apache 2.0
 - https://github.com/FasterXML/jackson-databind
 
-Google Guava 18.0
+Google Guava 21.0
 - License: Apache 2.0
 - https://github.com/google/guava
 
@@ -70,15 +66,15 @@ Mockito 1.10.19
 - License: MIT
 - http://mockito.org/
 
-AssertJ 2.3.0
+AssertJ 3.6.2
 - License: Apache 2.0
 - http://joel-costigliola.github.io/assertj/
 
 Hamcrest 1.3
 - License: BSD
 - http://hamcrest.org/
 
-Objenesis 2.1
+Objenesis 2.5.1
 - License: MIT
 - http://objenesis.org/
 
@@ -94,23 +90,23 @@ Apache Commons Lang 3.3.2
 - License: Apache 2.0
 - https://commons.apache.org/proper/commons-lang/
 
-Google Maps Services 0.1.12
+Google Maps Services 0.1.20
 - License: Apache 2.0
 - https://github.com/googlemaps/google-maps-services-java
 
-YamlBeans 1.09
+YamlBeans 1.11
 - License: BSD
 - https://github.com/EsotericSoftware/yamlbeans
 
 Sencha ExtJS 6.0.1
 - License: GPLv3
 - https://www.sencha.com/products/extjs/
 
-OpenLayers 3.15.1
+OpenLayers 4.1.1
 - License: BSD
 - http://openlayers.org/
 
-SockJS 1.0.3
+SockJS 1.1.4
 - License: MIT
 - https://github.com/sockjs/sockjs-client
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Bag Database changelog
 
+Forthcoming
+
+- Updated dependencies
+
 2.6.0
 
 - Fix date rendering in grids

diff --git a/pom.xml b/pom.xml
@@ -7,24 +7,29 @@
     <groupId>com.github.swri-robotics</groupId>
     <artifactId>bag-database</artifactId>
     <packaging>war</packaging>
-    <version>2.6.0</version>
+    <version>2.7.0-SNAPSHOT</version>
     <name>Bag Database</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java-version>1.8</java-version>
         <!-- Override Spring version -->
-        <spring.version>4.3.3.RELEASE</spring.version>
+        <spring.version>4.3.9.RELEASE</spring.version>
         <!-- AssertJ is not a part of Spring IO platform, so the version must be provided explicitly -->
-        <assertj-core-version>2.3.0</assertj-core-version>
-        <hibernate.version>5.2.3.Final</hibernate.version>
-        <aspectj.version>1.8.9</aspectj.version>
+        <assertj-core-version>3.6.2</assertj-core-version>
+        <hibernate.version>5.2.10.Final</hibernate.version>
+        <aspectj.version>1.8.10</aspectj.version>
     </properties>
-    <parent>
-        <groupId>io.spring.platform</groupId>
-        <artifactId>platform-bom</artifactId>
-        <version>2.0.8.RELEASE</version>
-        <relativePath />
-    </parent>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.spring.platform</groupId>
+                <artifactId>platform-bom</artifactId>
+                <version>Brussels-SR2</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <!-- Spring -->
         <dependency>
@@ -56,15 +61,21 @@
         <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>
-            <version>1.2.0.RELEASE</version>
+            <version>1.3.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf</artifactId>
+            <version>3.0.6.RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>org.thymeleaf</groupId>
             <artifactId>thymeleaf-spring4</artifactId>
+            <version>3.0.6.RELEASE</version>
             <!-- Avoid org.hibernate.jpa.boot.archive.spi.ArchiveException: Could not build ClassFile in Java 8 -->
             <exclusions>
                 <exclusion>
@@ -76,13 +87,13 @@
         <dependency>
             <groupId>org.thymeleaf.extras</groupId>
             <artifactId>thymeleaf-extras-springsecurity4</artifactId>
-            <version>2.1.2.RELEASE</version>
+            <version>3.0.2.RELEASE</version>
         </dependency>
         <!-- Persistence -->
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -124,19 +135,13 @@
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
-            <version>3.5.1</version>
+            <version>3.5.3</version>
         </dependency>
         <dependency>
             <groupId>com.mattbertolini</groupId>
             <artifactId>liquibase-slf4j</artifactId>
             <version>2.0.0</version>
         </dependency>
-        <!-- Avoid: javax.validation.ValidationException: HV000183: Unable to load 'javax.el.ExpressionFactory' -->
-        <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>javax.el-api</artifactId>
-            <scope>test</scope>
-        </dependency>
 
         <!-- Provides spatial support for an embedded H2 database -->
         <dependency>
@@ -147,7 +152,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.192</version>
+            <version>1.4.195</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -157,17 +162,17 @@
         <dependency>
             <groupId>org.orbisgis</groupId>
             <artifactId>h2gis-ext</artifactId>
-            <version>1.3.0</version>
+            <version>1.3.1</version>
         </dependency>
         <dependency>
             <groupId>org.orbisgis</groupId>
             <artifactId>h2gis-utilities</artifactId>
-            <version>1.3.0</version>
+            <version>1.3.1</version>
         </dependency>
         <dependency>
             <groupId>org.orbisgis</groupId>
             <artifactId>h2gis-functions</artifactId>
-            <version>1.3.0</version>
+            <version>1.3.1</version>
         </dependency>
 
         <!-- Spring Data -->
@@ -179,7 +184,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>5.2.1.Final</version>
+            <version>5.4.1.Final</version>
         </dependency>
         <!-- Logging -->
         <dependency>
@@ -210,7 +215,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>18.0</version>
+            <version>21.0</version>
         </dependency>
         <!-- Test -->
         <dependency>
@@ -271,13 +276,24 @@
         <dependency>
             <groupId>com.google.maps</groupId>
             <artifactId>google-maps-services</artifactId>
-            <version>0.1.12</version>
+            <version>0.1.20</version>
         </dependency>
         <dependency>
             <groupId>com.esotericsoftware.yamlbeans</groupId>
             <artifactId>yamlbeans</artifactId>
-            <version>1.09</version>
+            <version>1.11</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-el-api</artifactId>
+            <version>8.5.15</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-el</artifactId>
+            <version>8.5.15</version>
+        </dependency>
+
 
         <!-- OpenCV for image processing; note that this includes platform-
              specific libraries -->
@@ -304,7 +320,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.6.1</version>
                 <inherited>false</inherited>
                 <configuration>
                     <source>${java-version}</source>
@@ -320,7 +336,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.8</version>
+                <version>1.10</version>
                 <configuration>
                     <showWeaveInfo>true</showWeaveInfo>
                     <source>${java-version}</source>

diff --git a/src/main/java/com/github/swrirobotics/config/SecurityConfig.java b/src/main/java/com/github/swrirobotics/config/SecurityConfig.java
@@ -40,6 +40,7 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.access.AccessDeniedHandler;
@@ -104,12 +105,14 @@ protected void configure(HttpSecurity http) throws Exception {
         }
 
         http
+            .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.ALWAYS).and()
             .exceptionHandling().accessDeniedHandler(accessDeniedHandler()).and()
             .authorizeRequests()
                 // List resources that any users can access
                 .antMatchers("/",
                              "/bags/**",
                              "/favicon.ico",
+                             "/generalError",
                              "/register/**",
                              "/resources/**",
                              "/status/**",