upgraded spring, spring boot and webjars locator

Evolveum · Oct 2, 2017 · 99457f1 · 99457f1
1 parent 0e733a8
commit 99457f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -63,8 +63,8 @@
         <selenium.version>1.0.1</selenium.version>
         <slf4j.version>1.7.25</slf4j.version>
         <logback.version>1.1.11</logback.version>
-        <spring.boot.version>1.5.6.RELEASE</spring.boot.version>
-        <spring.version>4.3.10.RELEASE</spring.version>
+        <spring.boot.version>1.5.7.RELEASE</spring.boot.version>
+        <spring.version>4.3.11.RELEASE</spring.version>
         <spring.security.version>4.2.3.RELEASE</spring.security.version>
         <cas.client.version>3.4.1</cas.client.version>
         <testng.version>6.8.8</testng.version>
@@ -1118,11 +1118,6 @@
                     </exclusion>
                 </exclusions>
 			</dependency>
-			<dependency>
-	        	<groupId>org.webjars</groupId>
-	    		<artifactId>webjars-locator</artifactId>
-	    		<version>0.15</version>
-	        </dependency>
 	        <dependency>
 	            <groupId>ro.isdc.wro4j</groupId>
 	            <artifactId>wro4j-core</artifactId>

diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -178,11 +178,6 @@
             <artifactId>wro4j-core</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-        	<groupId>org.webjars</groupId>
-    		<artifactId>webjars-locator</artifactId>
-    		<scope>runtime</scope> <!-- used for loading js/css from webjars -->
-        </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>less</artifactId>
@@ -192,7 +187,6 @@
         <dependency>
             <groupId>ro.isdc.wro4j</groupId>
             <artifactId>wro4j-extensions</artifactId>
-            <!--<scope>runtime</scope> &lt;!&ndash; used to compile less files &ndash;&gt;-->
             <exclusions>
                 <exclusion>
                     <groupId>org.webjars</groupId>