From 13345406ee2e9d7355b89802c210d549606cf7a4 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Mon, 22 Feb 2016 11:01:47 +0100 Subject: [PATCH 1/5] Upgraded 3rd party libs --- .../hawkbit/artifact/MongoDBTestRule.java | 2 +- .../AbstractIntegrationTestWithMongoDB.java | 2 +- pom.xml | 41 +++++++++++-------- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/hawkbit-artifact-repository-mongo/src/test/java/org/eclipse/hawkbit/artifact/MongoDBTestRule.java b/hawkbit-artifact-repository-mongo/src/test/java/org/eclipse/hawkbit/artifact/MongoDBTestRule.java index d8485787e..f5d88ceaa 100644 --- a/hawkbit-artifact-repository-mongo/src/test/java/org/eclipse/hawkbit/artifact/MongoDBTestRule.java +++ b/hawkbit-artifact-repository-mongo/src/test/java/org/eclipse/hawkbit/artifact/MongoDBTestRule.java @@ -88,7 +88,7 @@ public class MongoDBTestRule implements TestRule { System.setProperty("spring.data.mongodb.port", String.valueOf(port)); } - Version version = Version.V3_1_0; + Version version = Version.V3_0_8; if (System.getProperty("inf.mongodb.version") != null) { version = Version.valueOf("V" + System.getProperty("inf.mongodb.version").trim().replaceAll("\\.", "_")); } diff --git a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/AbstractIntegrationTestWithMongoDB.java b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/AbstractIntegrationTestWithMongoDB.java index eb2174a57..6d116c5f0 100644 --- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/AbstractIntegrationTestWithMongoDB.java +++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/AbstractIntegrationTestWithMongoDB.java @@ -55,7 +55,7 @@ public abstract class AbstractIntegrationTestWithMongoDB extends AbstractIntegra System.setProperty("spring.data.mongodb.port", String.valueOf(port)); } - Version version = Version.V3_0_5; + Version version = Version.V3_0_8; if (System.getProperty("inf.mongodb.version") != null) { version = Version .valueOf("V" + System.getProperty("inf.mongodb.version").trim().replaceAll("\\.", "_")); diff --git a/pom.xml b/pom.xml index aa188e76a..99471bb93 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.7.RELEASE + 1.2.8.RELEASE org.eclipse.hawkbit @@ -57,42 +57,49 @@ - 1.2.7.RELEASE + 1.2.8.RELEASE - - 1.4.186 + + 2.5.0 5.2.2.Final - Fowler-SR1 1.2.0.RELEASE - 3.0.2 - + + Fowler-SR1 + 3.2.2 + 1.0.0 0.0.6.RELEASE - 7.5.7 + 7.5.10 ${vaadin.version} - + 1.4 2.0M10 - 1.8 1.4.15 - 2.6.0 + 2.6.2 1.5.4 1.0.2 0.9.1 3.4 1.8.5 + 19.0 + 1.3.5 + 1.50.2 + + + 1.8 - + scm:git:https://github.com/eclipse/hawkbit.git scm:git:https://github.com/eclipse/hawkbit.git https://github.com/eclipse/hawkbit.git + - + https://sonar.eu-gb.mybluemix.net eclipse/hawkbit jacoco @@ -123,7 +130,7 @@ ${jacoco.outputDir}/${jacoco.out.it.file} - 19.0 + @@ -335,7 +342,7 @@ org.slf4j slf4j-api - 1.7.7 + ${slf4j.version} @@ -582,7 +589,7 @@ de.flapdoodle.embed de.flapdoodle.embed.mongo - 1.50.0 + ${embedded-mongo.version} test @@ -624,7 +631,7 @@ org.mariadb.jdbc mariadb-java-client - 1.2.3 + ${mariadb-java-client.version} test From cf3adaac63c62886b4e5fc24c72c0e87e05ee511 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Mon, 22 Feb 2016 12:20:56 +0100 Subject: [PATCH 2/5] Cleaned up POM --- pom.xml | 65 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/pom.xml b/pom.xml index 99471bb93..67dbdadd9 100644 --- a/pom.xml +++ b/pom.xml @@ -74,6 +74,11 @@ 0.0.6.RELEASE 7.5.10 ${vaadin.version} + 7.4.0.1 + 2.2.0 + 7.0.1 + 1.2.0 + 4.5 @@ -84,11 +89,18 @@ 1.5.4 1.0.2 0.9.1 - 3.4 1.8.5 19.0 1.3.5 1.50.2 + 1.18.1 + 2.2.4 + 1.1.7 + 1.1 + 1.1.1 + 3.4 + 20141113 + 2.0.0 1.8 @@ -402,44 +414,44 @@ org.vaadin.addons.lazyquerycontainer vaadin-lazyquerycontainer - 7.4.0.1 + ${vaadin.addon.vaadin-lazyquerycontainer.version} org.vaadin.addons flexibleoptiongroup - 2.2.0 + ${vaadin.addon.flexibleoptiongroup.version} org.vaadin.addons tokenfield - 7.0.1 + ${vaadin.addon.tokenfield.version} org.vaadin.alump.distributionbar dbar-addon - 1.2.0 + ${vaadin.addon.dbar-addon.version} org.vaadin.addons contextmenu - 4.5 + ${vaadin.addon.contextmenu.version} javax.el javax.el-api - 2.2.4 + ${javax.el-api.version} net.sf.corn corn-cps - 1.1.7 + ${corn-cps.version} net._01001111 jlorem - 1.1 + ${jlorem.version} @@ -521,13 +533,6 @@ - - - com.fasterxml - classmate - 1.3.0 - org.eclipse.persistence org.eclipse.persistence.jpa @@ -537,7 +542,7 @@ cz.jirutka.rsql rsql-parser - 2.0.0 + ${rsql-parser.version} @@ -548,7 +553,7 @@ com.googlecode.json-simple json-simple - 1.1.1 + ${json-simple.version} junit @@ -556,13 +561,13 @@ - - - xml-apis - xml-apis - 1.4.01 + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} - + org.springframework.boot spring-boot-starter-test @@ -574,16 +579,10 @@ - - com.vaadin - vaadin-testbench - 4.0.3 - test - org.json json - 20141113 + ${json.version} test @@ -613,7 +612,7 @@ com.sun.jersey jersey-client - 1.18.1 + ${jersey-client.version} test @@ -625,7 +624,7 @@ com.jayway.jsonpath json-path-assert - 0.9.1 + ${json-path.version} test From 713922d7624077a2e33b62f8651c32c413e1c7c1 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Mon, 22 Feb 2016 12:21:14 +0100 Subject: [PATCH 3/5] Remove broken spring property usage for vaadin caching --- .../src/main/resources/hawkbitdefaults.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties b/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties index 09ae37f90..98749a384 100644 --- a/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties +++ b/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties @@ -29,10 +29,8 @@ flyway.initOnMigrate=true flyway.sqlMigrationSuffix=${spring.jpa.database}.sql # Vaadin Servlet -vaadin.static.servlet.resourceCacheTime=${spring.resources.cache-period} vaadin.static.servlet.productionMode=true vaadin.servlet.productionMode=true -vaadin.servlet.resourceCacheTime=${spring.resources.cache-period} vaadin.servlet.urlMapping=/UI/* vaadin.servlet.params.heartbeatInterval=60 vaadin.servlet.params.closeIdleSessions=false From 8507ae2bd3cf0baece719f8865215d7ba5559512 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Tue, 23 Feb 2016 11:14:48 +0100 Subject: [PATCH 4/5] Moved java version on top --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 67dbdadd9..e5ac3ca26 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,8 @@ + 1.8 + 1.2.8.RELEASE @@ -102,8 +104,6 @@ 20141113 2.0.0 - - 1.8 scm:git:https://github.com/eclipse/hawkbit.git From 1db0d6a5e98c3191e67ba305f4fde0d87741c743 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Tue, 23 Feb 2016 13:10:33 +0100 Subject: [PATCH 5/5] Upgraded to newer jackson and hibernate validator version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e5ac3ca26..f5ec54435 100644 --- a/pom.xml +++ b/pom.xml @@ -63,8 +63,8 @@ - 2.5.0 - 5.2.2.Final + 2.5.5 + 5.2.4.Final 1.2.0.RELEASE Fowler-SR1