SAK-40810 - Rubrics doesn't start due to Spring dependencies upgrade

jbbadano · Oct 23, 2018 · 52aa1cc · 52aa1cc
1 parent ec11cca
commit 52aa1cc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/rubrics/api/pom.xml b/rubrics/api/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-rest-webmvc</artifactId>
-            <version>2.6.7.RELEASE</version>
+            <version>${spring.data.rest.webmvc.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>

diff --git a/rubrics/impl/src/main/webapp/WEB-INF/components.xml b/rubrics/impl/src/main/webapp/WEB-INF/components.xml
@@ -33,4 +33,8 @@
             </list>
         </property>
     </bean>
+
+    <bean id="org.springframework.hateoas.hal.HalConfiguration.rubrics"
+        class="org.springframework.hateoas.hal.HalConfiguration" />
+
 </beans>
diff --git a/rubrics/pom.xml b/rubrics/pom.xml
@@ -22,6 +22,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <spring.data.rest.webmvc.version>2.6.16.RELEASE</spring.data.rest.webmvc.version>
     </properties>
 
     <dependencyManagement>

diff --git a/rubrics/tool/pom.xml b/rubrics/tool/pom.xml
@@ -17,8 +17,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <start-class>org.sakaiproject.rubrics.RubricsApplication</start-class>
-        <rest.assured.version>2.9.0</rest.assured.version>
-        <spring.boot.version>1.5.10.RELEASE</spring.boot.version>
+        <rest.assured.version>3.1.1</rest.assured.version>
+        <spring.boot.version>1.5.17.RELEASE</spring.boot.version>
+        <thymeleaf.version>3.0.10.RELEASE</thymeleaf.version>
     </properties>
 
     <dependencies>
@@ -83,7 +84,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-rest-webmvc</artifactId>
-            <version>2.6.7.RELEASE</version>
+            <version>${spring.data.rest.webmvc.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
@@ -111,12 +112,12 @@
         <dependency>
             <groupId>org.thymeleaf</groupId>
             <artifactId>thymeleaf</artifactId>
-            <version>3.0.9.RELEASE</version>
+            <version>${thymeleaf.version}</version>
         </dependency>
         <dependency>
             <groupId>org.thymeleaf</groupId>
             <artifactId>thymeleaf-spring4</artifactId>
-            <version>3.0.9.RELEASE</version>
+            <version>${thymeleaf.version}</version>
         </dependency>
         <!-- Spring AOP -->
         <dependency>
@@ -159,7 +160,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.jayway.restassured</groupId>
+            <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
             <version>${rest.assured.version}</version>
             <scope>test</scope>