Merge 4fc4d42 into 48e6609

OpenWiseSolutions · Nov 1, 2018 · df5da08 · df5da08
2 parents 48e6609 + 4fc4d42
commit df5da08
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.1.RELEASE</version>
+        <version>1.5.17.RELEASE</version>
     </parent>
 
     <licenses>
@@ -194,7 +194,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- OpenHub Spring Boot application -->
-        <spring-boot.version>1.5.1.RELEASE</spring-boot.version>
+        <spring-boot.version>1.5.17.RELEASE</spring-boot.version>
         <start-class>org.openhubframework.openhub.OpenHubApplication</start-class>
 
         <camel-version>2.18.2</camel-version>
@@ -206,7 +206,6 @@
         <javamelody-version>1.65.0</javamelody-version>
         <metrics-version>3.2.0</metrics-version>
         <jolokia-version>1.3.5</jolokia-version>
-        <spring-data-commons.version>1.12.8.RELEASE</spring-data-commons.version>
     </properties>
 
     <dependencyManagement>
@@ -259,6 +258,16 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- Spring boot dependencies -->
+            <!-- Note: too keep camel integration from overriding spring libraries -->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <!-- Apache Camel -->
             <dependency>
                 <groupId>org.apache.camel</groupId>
@@ -356,21 +365,6 @@
                 <artifactId>jsr305</artifactId>
                 <version>3.0.0</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-aspects</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.data</groupId>
-                <artifactId>spring-data-commons</artifactId>
-                <version>${spring-data-commons.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-context-support</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/web/src/main/java/org/openhubframework/openhub/config/WebConfigurer.java b/web/src/main/java/org/openhubframework/openhub/config/WebConfigurer.java
@@ -116,7 +116,7 @@ public ServletListenerRegistrationBean<SessionListener> sessionListener() {
 
     @ConditionalOnProperty(value = CorsProperties.CORS_ENABLED)
     @Bean
-    public FilterRegistrationBean corsFilter() {
+    public FilterRegistrationBean corsFilterRegistrationBean() {
         // it could be used also as http://docs.spring.io/spring-boot/docs/1.5.2.RELEASE/reference/htmlsingle/#boot-features-cors
         // but filter approach has more options
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();