lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #49 from bsinno/update-spring-boot

Browse Source 
ok merging.
This commit is contained in:
Michael Hirsch
2016-02-23 15:56:48 +01:00
parent 1ede39fb45 1db0d6a5e9
commit 275d929607
4 changed files with 60 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-artifact-repository-mongo/src/test/java/org/eclipse/hawkbit/artifact/MongoDBTestRule.java
View File

@@ -88,7 +88,7 @@ public class MongoDBTestRule implements TestRule {
System.setProperty("spring.data.mongodb.port", String.valueOf(port)); 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) { if (System.getProperty("inf.mongodb.version") != null) {
version = Version.valueOf("V" + System.getProperty("inf.mongodb.version").trim().replaceAll("\\.", "_")); version = Version.valueOf("V" + System.getProperty("inf.mongodb.version").trim().replaceAll("\\.", "_"));
} }

2
hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties
View File

@@ -29,10 +29,8 @@ flyway.initOnMigrate=true
flyway.sqlMigrationSuffix=${spring.jpa.database}.sql flyway.sqlMigrationSuffix=${spring.jpa.database}.sql
# Vaadin Servlet # Vaadin Servlet
vaadin.static.servlet.resourceCacheTime=${spring.resources.cache-period}
vaadin.static.servlet.productionMode=true vaadin.static.servlet.productionMode=true
vaadin.servlet.productionMode=true vaadin.servlet.productionMode=true
vaadin.servlet.resourceCacheTime=${spring.resources.cache-period}
vaadin.servlet.urlMapping=/UI/* vaadin.servlet.urlMapping=/UI/*
vaadin.servlet.params.heartbeatInterval=60 vaadin.servlet.params.heartbeatInterval=60
vaadin.servlet.params.closeIdleSessions=false vaadin.servlet.params.closeIdleSessions=false

2
hawkbit-repository/src/test/java/org/eclipse/hawkbit/AbstractIntegrationTestWithMongoDB.java
View File

@@ -55,7 +55,7 @@ public abstract class AbstractIntegrationTestWithMongoDB extends AbstractIntegra
System.setProperty("spring.data.mongodb.port", String.valueOf(port)); 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) { if (System.getProperty("inf.mongodb.version") != null) {
version = Version version = Version
.valueOf("V" + System.getProperty("inf.mongodb.version").trim().replaceAll("\\.", "_")); .valueOf("V" + System.getProperty("inf.mongodb.version").trim().replaceAll("\\.", "_"));

110
pom.xml
View File

@@ -15,7 +15,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>1.2.7.RELEASE</version> <version>1.2.8.RELEASE</version>
</parent> </parent>
<groupId>org.eclipse.hawkbit</groupId> <groupId>org.eclipse.hawkbit</groupId>
@@ -57,42 +57,61 @@
</repositories> </repositories>
<properties> <properties>
<spring.boot.version>1.2.7.RELEASE</spring.boot.version> <java.version>1.8</java.version>
<!-- Spring boot overrides - START --> <spring.boot.version>1.2.8.RELEASE</spring.boot.version>
<h2.version>1.4.186</h2.version>
<jackson.version>2.5.0</jackson.version> <!-- Spring boot version overrides (should be reviewed with every boot upgrade) - START -->
<hibernate-validator.version>5.2.2.Final</hibernate-validator.version> <!-- Newer versions needed than defined in Boot-->
<spring-data-releasetrain.version>Fowler-SR1</spring-data-releasetrain.version> <jackson.version>2.5.5</jackson.version>
<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
<spring-cloud-connectors.version>1.2.0.RELEASE</spring-cloud-connectors.version> <spring-cloud-connectors.version>1.2.0.RELEASE</spring-cloud-connectors.version>
<mongodb.version>3.0.2</mongodb.version> <!-- Support for MongoDB 3 -->
<!-- Spring boot overrides - END --> <spring-data-releasetrain.version>Fowler-SR1</spring-data-releasetrain.version>
<mongodb.version>3.2.2</mongodb.version>
<!-- Spring boot version overrides - END -->
<!-- Vaadin versions - START --> <!-- Vaadin versions - START -->
<vaadin.spring.version>1.0.0</vaadin.spring.version> <vaadin.spring.version>1.0.0</vaadin.spring.version>
<vaadin.spring.addon.version>0.0.6.RELEASE</vaadin.spring.addon.version> <vaadin.spring.addon.version>0.0.6.RELEASE</vaadin.spring.addon.version>
<vaadin.version>7.5.7</vaadin.version> <vaadin.version>7.5.10</vaadin.version>
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version> <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
<vaadin.addon.vaadin-lazyquerycontainer.version>7.4.0.1</vaadin.addon.vaadin-lazyquerycontainer.version>
<vaadin.addon.flexibleoptiongroup.version>2.2.0</vaadin.addon.flexibleoptiongroup.version>
<vaadin.addon.tokenfield.version>7.0.1</vaadin.addon.tokenfield.version>
<vaadin.addon.dbar-addon.version>1.2.0</vaadin.addon.dbar-addon.version>
<vaadin.addon.contextmenu.version>4.5</vaadin.addon.contextmenu.version>
<!-- Vaadin versions - END --> <!-- Vaadin versions - END -->
<!-- Misc --> <!-- Misc libraries versions - START -->
<fest-assert.version>1.4</fest-assert.version> <fest-assert.version>1.4</fest-assert.version>
<org.easytesting.version>2.0M10</org.easytesting.version> <org.easytesting.version>2.0M10</org.easytesting.version>
<java.version>1.8</java.version>
<allure.version>1.4.15</allure.version> <allure.version>1.4.15</allure.version>
<eclipselink.version>2.6.0</eclipselink.version> <eclipselink.version>2.6.2</eclipselink.version>
<org.powermock.version>1.5.4</org.powermock.version> <org.powermock.version>1.5.4</org.powermock.version>
<pl.pragmatists.version>1.0.2</pl.pragmatists.version> <pl.pragmatists.version>1.0.2</pl.pragmatists.version>
<json-path.version>0.9.1</json-path.version> <json-path.version>0.9.1</json-path.version>
<commons-lang3.version>3.4</commons-lang3.version>
<aspectj.version>1.8.5</aspectj.version> <aspectj.version>1.8.5</aspectj.version>
<guava.version>19.0</guava.version>
<mariadb-java-client.version>1.3.5</mariadb-java-client.version>
<embedded-mongo.version>1.50.2</embedded-mongo.version>
<jersey-client.version>1.18.1</jersey-client.version>
<javax.el-api.version>2.2.4</javax.el-api.version>
<corn-cps.version>1.1.7</corn-cps.version>
<jlorem.version>1.1</jlorem.version>
<json-simple.version>1.1.1</json-simple.version>
<commons-lang3.version>3.4</commons-lang3.version>
<json.version>20141113</json.version>
<rsql-parser.version>2.0.0</rsql-parser.version>
<!-- Misc libraries versions - END -->
<!-- Release --> <!-- Release - START -->
<release.scm.connection>scm:git:https://github.com/eclipse/hawkbit.git</release.scm.connection> <release.scm.connection>scm:git:https://github.com/eclipse/hawkbit.git</release.scm.connection>
<release.scm.developerConnection>scm:git:https://github.com/eclipse/hawkbit.git</release.scm.developerConnection> <release.scm.developerConnection>scm:git:https://github.com/eclipse/hawkbit.git</release.scm.developerConnection>
<release.scm.url>https://github.com/eclipse/hawkbit.git</release.scm.url> <release.scm.url>https://github.com/eclipse/hawkbit.git</release.scm.url>
<!-- Release - END -->
<!-- Sonar --> <!-- Sonar - START-->
<sonar.host.url>https://sonar.eu-gb.mybluemix.net</sonar.host.url> <sonar.host.url>https://sonar.eu-gb.mybluemix.net</sonar.host.url>
<sonar.github.repository>eclipse/hawkbit</sonar.github.repository> <sonar.github.repository>eclipse/hawkbit</sonar.github.repository>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -123,7 +142,7 @@
<!-- Tells Sonar where the Jacoco coverage result file is located for <!-- Tells Sonar where the Jacoco coverage result file is located for
Integration Tests --> Integration Tests -->
<sonar.jacoco.itReportPath>${jacoco.outputDir}/${jacoco.out.it.file}</sonar.jacoco.itReportPath> <sonar.jacoco.itReportPath>${jacoco.outputDir}/${jacoco.out.it.file}</sonar.jacoco.itReportPath>
<guava.version>19.0</guava.version> <!-- Sonar - END-->
</properties> </properties>
@@ -335,7 +354,7 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.7</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<!-- Vaadin --> <!-- Vaadin -->
<dependency> <dependency>
@@ -395,44 +414,44 @@
<dependency> <dependency>
<groupId>org.vaadin.addons.lazyquerycontainer</groupId> <groupId>org.vaadin.addons.lazyquerycontainer</groupId>
<artifactId>vaadin-lazyquerycontainer</artifactId> <artifactId>vaadin-lazyquerycontainer</artifactId>
<version>7.4.0.1</version> <version>${vaadin.addon.vaadin-lazyquerycontainer.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.vaadin.addons</groupId> <groupId>org.vaadin.addons</groupId>
<artifactId>flexibleoptiongroup</artifactId> <artifactId>flexibleoptiongroup</artifactId>
<version>2.2.0</version> <version>${vaadin.addon.flexibleoptiongroup.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.vaadin.addons</groupId> <groupId>org.vaadin.addons</groupId>
<artifactId>tokenfield</artifactId> <artifactId>tokenfield</artifactId>
<version>7.0.1</version> <version>${vaadin.addon.tokenfield.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.vaadin.alump.distributionbar</groupId> <groupId>org.vaadin.alump.distributionbar</groupId>
<artifactId>dbar-addon</artifactId> <artifactId>dbar-addon</artifactId>
<version>1.2.0</version> <version>${vaadin.addon.dbar-addon.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.vaadin.addons</groupId> <groupId>org.vaadin.addons</groupId>
<artifactId>contextmenu</artifactId> <artifactId>contextmenu</artifactId>
<version>4.5</version> <version>${vaadin.addon.contextmenu.version}</version>
</dependency> </dependency>
<!-- Misc --> <!-- Misc -->
<dependency> <dependency>
<groupId>javax.el</groupId> <groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId> <artifactId>javax.el-api</artifactId>
<version>2.2.4</version> <version>${javax.el-api.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.corn</groupId> <groupId>net.sf.corn</groupId>
<artifactId>corn-cps</artifactId> <artifactId>corn-cps</artifactId>
<version>1.1.7</version> <version>${corn-cps.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net._01001111</groupId> <groupId>net._01001111</groupId>
<artifactId>jlorem</artifactId> <artifactId>jlorem</artifactId>
<version>1.1</version> <version>${jlorem.version}</version>
</dependency> </dependency>
<!-- Spring --> <!-- Spring -->
<dependency> <dependency>
@@ -514,13 +533,6 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Override of classmate version, that is a hibernate validator
dependency. allow PB of CQ -->
<dependency>
<groupId>com.fasterxml</groupId>
<artifactId>classmate</artifactId>
<version>1.3.0</version>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.persistence</groupId> <groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId> <artifactId>org.eclipse.persistence.jpa</artifactId>
@@ -530,7 +542,7 @@
<dependency> <dependency>
<groupId>cz.jirutka.rsql</groupId> <groupId>cz.jirutka.rsql</groupId>
<artifactId>rsql-parser</artifactId> <artifactId>rsql-parser</artifactId>
<version>2.0.0</version> <version>${rsql-parser.version}</version>
</dependency> </dependency>
<!-- JSON PATH, used to e.g. parse vcap services from environment --> <!-- JSON PATH, used to e.g. parse vcap services from environment -->
<dependency> <dependency>
@@ -541,7 +553,7 @@
<dependency> <dependency>
<groupId>com.googlecode.json-simple</groupId> <groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId> <artifactId>json-simple</artifactId>
<version>1.1.1</version> <version>${json-simple.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>junit</groupId> <groupId>junit</groupId>
@@ -549,13 +561,13 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Spring boot overrides - START -->
<dependency> <dependency>
<groupId>xml-apis</groupId> <groupId>org.apache.commons</groupId>
<artifactId>xml-apis</artifactId> <artifactId>commons-lang3</artifactId>
<version>1.4.01</version> <version>${commons-lang3.version}</version>
</dependency> </dependency>
<!-- Spring boot overrides - END -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
@@ -567,22 +579,16 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-testbench</artifactId>
<version>4.0.3</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>
<artifactId>json</artifactId> <artifactId>json</artifactId>
<version>20141113</version> <version>${json.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.flapdoodle.embed</groupId> <groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId> <artifactId>de.flapdoodle.embed.mongo</artifactId>
<version>1.50.0</version> <version>${embedded-mongo.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -606,7 +612,7 @@
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId> <artifactId>jersey-client</artifactId>
<version>1.18.1</version> <version>${jersey-client.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -618,13 +624,13 @@
<dependency> <dependency>
<groupId>com.jayway.jsonpath</groupId> <groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path-assert</artifactId> <artifactId>json-path-assert</artifactId>
<version>0.9.1</version> <version>${json-path.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mariadb.jdbc</groupId> <groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId> <artifactId>mariadb-java-client</artifactId>
<version>1.2.3</version> <version>${mariadb-java-client.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>