You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/04/03 16:50:44 UTC

[isis] 01/02: ISIS-2304: fixes incompatibility with Spring Boot 2.2.6.RELEASE

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 20422b5d6302e6f9637f8a5e268821aaed0589a2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 3 18:49:05 2020 +0200

    ISIS-2304: fixes incompatibility with Spring Boot 2.2.6.RELEASE
    
    just bumps vaadin version
---
 core/pom.xml                 | 4 ++--
 examples/demo-vaadin/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index b22f127..193f9ab 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -167,13 +167,13 @@
 		<simpleslackapi.version>1.2.0</simpleslackapi.version>
 		<slf4j-api.version>1.7.26</slf4j-api.version> <!-- as provided by spring-boot, needed to solve convergence issues -->
 		<spring-framework.version>5.2.5.RELEASE</spring-framework.version>
-		<spring-boot.version>2.2.4.RELEASE</spring-boot.version> <!--  has no effect here, needs to be set in core-parent/pom.xml -->
+		<spring-boot.version>2.2.6.RELEASE</spring-boot.version> <!--  has no effect here, needs to be set in core-parent/pom.xml -->
 		<summernote.version>0.8.11</summernote.version>
 		<swagger-core.version>1.6.0</swagger-core.version>
 
 		<togglz.version>2.1.0.Final</togglz.version>
 
-		<vaadin.version>14.1.22</vaadin.version>
+		<vaadin.version>14.1.23</vaadin.version>
 
 		<wicket.version>8.7.0</wicket.version>
 		<wicket-bootstrap.version>2.0.13</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap-core -->
diff --git a/examples/demo-vaadin/pom.xml b/examples/demo-vaadin/pom.xml
index 7f34c05..5c0f28e 100644
--- a/examples/demo-vaadin/pom.xml
+++ b/examples/demo-vaadin/pom.xml
@@ -42,7 +42,7 @@
 			-->
 		<node.version>v12.14.0</node.version>
 		<npm.version>6.13.1</npm.version>
-		<vaadin.version>14.1.19</vaadin.version>
+		<vaadin.version>14.1.23</vaadin.version>
 
 	</properties>