Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation

# Conflicts:
#	pom.xml

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("\\.", "_"));
         }

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

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("\\.", "_"));

hawkbit-test-report/pom.xml

@@ -18,7 +18,7 @@
       <version>0.2.0-SNAPSHOT</version>
    </parent>
    <artifactId>hawkbit-test-report</artifactId>
-   <name>Hawkbit :: Test Report</name>
+   <name>hawkBit :: Test Report</name>
 
    <packaging>pom</packaging>
 
@@ -75,8 +75,7 @@
                   </goals>
                </execution>
             </executions>
-         </plugin>
-
+         </plugin>      
       </plugins>
    </build>
 </project>

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java

@@ -11,6 +11,7 @@ package org.eclipse.hawkbit.ui.components;
 import java.util.Arrays;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.hawkbit.repository.model.DistributionSet;
 import org.eclipse.hawkbit.ui.decorators.SPUIButtonDecorator;
 import org.eclipse.hawkbit.ui.decorators.SPUIComboBoxDecorator;
@@ -23,7 +24,6 @@ import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.vaadin.sass.internal.util.StringUtil;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.FontAwesome;
 import com.vaadin.server.Resource;
@@ -108,16 +108,16 @@ public final class SPUIComponentProvider {
             final Class<? extends SPUIHeaderLayoutDecorator> tableHeaderLayoutDecorator) {
         // Do we really need this???
         HorizontalLayout hLayout = getHorizontalLayout(new SPUIHorizontalLayout().getUiHorizontalLayout().getClass());
+
+        if (tableHeaderLayoutDecorator == null) {
+            return hLayout;
+        }
+
         try {
-            SPUIHeaderLayoutDecorator layoutDecorator = null;
-            if (tableHeaderLayoutDecorator != null) {
-                layoutDecorator = tableHeaderLayoutDecorator.newInstance();
-                hLayout = layoutDecorator.decorate(hLayout);
-            }
-        } catch (final InstantiationException exception) {
-            LOG.error("Error occured while creating horizontal decorator " + SPUIHeaderLayoutDecorator.class,
-                    exception);
-        } catch (final IllegalAccessException exception) {
+            final SPUIHeaderLayoutDecorator layoutDecorator = tableHeaderLayoutDecorator.newInstance();
+            hLayout = layoutDecorator.decorate(hLayout);
+
+        } catch (final InstantiationException | IllegalAccessException exception) {
             LOG.error("Error occured while creating horizontal decorator " + SPUIHeaderLayoutDecorator.class,
                     exception);
         }
@@ -324,7 +324,7 @@ public final class SPUIComponentProvider {
      * @return Label
      */
     public static Label createNameValueLabel(final String label, final String... values) {
-        final String valueStr = StringUtil.collectionToDelimitedString(Arrays.asList(values), " ");
+        final String valueStr = StringUtils.join(Arrays.asList(values), " ");
         final Label nameValueLabel = new Label(getBoldHTMLText(label) + valueStr, ContentMode.HTML);
         nameValueLabel.setSizeFull();
         nameValueLabel.addStyleName(SPUIDefinitions.TEXT_STYLE);

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java

@@ -73,8 +73,8 @@ import org.vaadin.spring.events.EventBus;
 import org.vaadin.spring.events.EventScope;
 import org.vaadin.spring.events.annotation.EventBusListenerMethod;
 
+import com.google.common.base.Strings;
 import com.google.common.collect.Iterables;
-import com.google.gwt.thirdparty.guava.common.base.Strings;
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.event.Action;
@@ -104,6 +104,8 @@ import com.vaadin.ui.themes.ValoTheme;
 @ViewScope
 public class TargetTable extends AbstractTable implements Handler {
 
+    private static final String TARGET_PINNED = "targetPinned";
+
     private static final long serialVersionUID = -2300392868806614568L;
 
     private static final Logger LOG = LoggerFactory.getLogger(TargetTable.class);
@@ -271,7 +273,7 @@ public class TargetTable extends AbstractTable implements Handler {
         final Map<String, Object> queryConfig = prepareQueryConfigFilters();
 
         // Create TargetBeanQuery factory with the query config.
-        final BeanQueryFactory<TargetBeanQuery> targetQF = new BeanQueryFactory<TargetBeanQuery>(TargetBeanQuery.class);
+        final BeanQueryFactory<TargetBeanQuery> targetQF = new BeanQueryFactory<>(TargetBeanQuery.class);
         targetQF.setQueryConfiguration(queryConfig);
 
         // create lazy query container with lazy defination and query
@@ -394,7 +396,7 @@ public class TargetTable extends AbstractTable implements Handler {
      */
     @Override
     protected List<TableColumn> getTableVisibleColumns() {
-        final List<TableColumn> columnList = new ArrayList<TableColumn>();
+        final List<TableColumn> columnList = new ArrayList<>();
         if (isMaximized()) {
             columnList.add(new TableColumn(SPUILabelDefinitions.VAR_NAME, i18n.get("header.name"), 0.2f));
             columnList.add(new TableColumn(SPUILabelDefinitions.VAR_CREATED_BY, i18n.get("header.createdBy"), 0.1f));
@@ -469,7 +471,7 @@ public class TargetTable extends AbstractTable implements Handler {
     }
 
     private Map<String, Object> prepareQueryConfigFilters() {
-        final Map<String, Object> queryConfig = new HashMap<String, Object>();
+        final Map<String, Object> queryConfig = new HashMap<>();
         managementUIState.getTargetTableFilters().getSearchText()
                 .ifPresent(value -> queryConfig.put(SPUIDefinitions.FILTER_BY_TEXT, value));
         managementUIState.getTargetTableFilters().getDistributionSet()
@@ -481,7 +483,7 @@ public class TargetTable extends AbstractTable implements Handler {
         queryConfig.put(SPUIDefinitions.FILTER_BY_NO_TAG, managementUIState.getTargetTableFilters().isNoTagSelected());
 
         if (isFilteredByTags()) {
-            final List<String> list = new ArrayList<String>();
+            final List<String> list = new ArrayList<>();
             list.addAll(managementUIState.getTargetTableFilters().getClickedTargetTags());
             queryConfig.put(SPUIDefinitions.FILTER_BY_TAG, list.toArray(new String[list.size()]));
         }
@@ -522,7 +524,7 @@ public class TargetTable extends AbstractTable implements Handler {
         pinBtn.setId(SPUIComponetIdProvider.TARGET_PIN_ICON + "." + itemId);
         pinBtn.addClickListener(event -> addPinClickListener(event));
         if (isPinned(((TargetIdName) itemId).getControllerId())) {
-            pinBtn.addStyleName("targetPinned");
+            pinBtn.addStyleName(TARGET_PINNED);
             isTargetPinned = Boolean.TRUE;
             targetPinnedBtn = pinBtn;
             eventBus.publish(this, PinUnpinEvent.PIN_TARGET);
@@ -533,7 +535,7 @@ public class TargetTable extends AbstractTable implements Handler {
     }
 
     private boolean isPinned(final String targetId) {
-        boolean result = false;
+        boolean result;
         if (managementUIState.getDistributionTableFilters().getPinnedTargetId().isPresent()
                 && targetId.equals(managementUIState.getDistributionTableFilters().getPinnedTargetId().get())) {
             result = true;
@@ -594,7 +596,7 @@ public class TargetTable extends AbstractTable implements Handler {
         eventBus.publish(this, PinUnpinEvent.PIN_TARGET);
         /* change target table styling */
         styleTargetTable();
-        eventBtn.addStyleName("targetPinned");
+        eventBtn.addStyleName(TARGET_PINNED);
         isTargetPinned = Boolean.FALSE;
     }
 
@@ -605,7 +607,7 @@ public class TargetTable extends AbstractTable implements Handler {
     }
 
     private void resetPinStyle(final Button pinBtn) {
-        pinBtn.removeStyleName("targetPinned");
+        pinBtn.removeStyleName(TARGET_PINNED);
         pinBtn.addStyleName(SPUIStyleDefinitions.TARGET_STATUS_PIN_TOGGLE);
         HawkbitCommonUtil.applyStatusLblStyle(this, pinBtn, pinBtn.getData());
     }
@@ -644,7 +646,7 @@ public class TargetTable extends AbstractTable implements Handler {
         final com.vaadin.event.dd.TargetDetails taregtDet = event.getTargetDetails();
         final Table targetTable = (Table) taregtDet.getTarget();
         final Set<TargetIdName> targetSelected = HawkbitCommonUtil.getSelectedTargetDetails(targetTable);
-        final Set<String> targetList = new HashSet<String>();
+        final Set<String> targetList = new HashSet<>();
         final AbstractSelectTargetDetails dropData = (AbstractSelectTargetDetails) event.getTargetDetails();
         final Object targetItemId = dropData.getItemIdOver();
         if (!targetSelected.contains(targetItemId)) {
@@ -701,9 +703,8 @@ public class TargetTable extends AbstractTable implements Handler {
 
     private static Set<DistributionSetIdName> getDraggedDistributionSet(final TableTransferable transferable,
             final Table source) {
-        @SuppressWarnings("unchecked")
         final Set<DistributionSetIdName> distSelected = HawkbitCommonUtil.getSelectedDSDetails(source);
-        final Set<DistributionSetIdName> distributionIdSet = new HashSet<DistributionSetIdName>();
+        final Set<DistributionSetIdName> distributionIdSet = new HashSet<>();
         if (!distSelected.contains(transferable.getData(ITEMID))) {
             distributionIdSet.add((DistributionSetIdName) transferable.getData(ITEMID));
         } else {
@@ -828,15 +829,11 @@ public class TargetTable extends AbstractTable implements Handler {
         }
     }
 
-    /**
-     * @param filterEvent
-     * @return
-     */
-    private boolean checkFilterEvent(final TargetFilterEvent filterEvent) {
-        boolean isFilterEvent = false;
-        boolean isFilter = false;
-        boolean isRemoveFilters = false;
-        boolean isStatusFilter = false;
+    private static boolean checkFilterEvent(final TargetFilterEvent filterEvent) {
+        boolean isFilterEvent;
+        boolean isFilter;
+        boolean isRemoveFilters;
+        boolean isStatusFilter;
         isFilter = filterEvent == TargetFilterEvent.FILTER_BY_TEXT || filterEvent == TargetFilterEvent.FILTER_BY_TAG
                 || filterEvent == TargetFilterEvent.FILTER_BY_DISTRIBUTION
                 || filterEvent == TargetFilterEvent.FILTER_BY_TARGET_FILTER_QUERY;
@@ -1020,11 +1017,11 @@ public class TargetTable extends AbstractTable implements Handler {
     private List<TargetIdName> getTargetIdsBySimpleFilters(final PageRequest pageRequest) {
         final Long filterByDistId = managementUIState.getTargetTableFilters().getDistributionSet().isPresent()
                 ? managementUIState.getTargetTableFilters().getDistributionSet().get().getId() : null;
-        final List<TargetUpdateStatus> statusList = new ArrayList<TargetUpdateStatus>();
+        final List<TargetUpdateStatus> statusList = new ArrayList<>();
         if (isFilteredByStatus()) {
             statusList.addAll(managementUIState.getTargetTableFilters().getClickedStatusTargetTags());
         }
-        final List<String> tagList = new ArrayList<String>();
+        final List<String> tagList = new ArrayList<>();
         if (isFilteredByTags()) {
             tagList.addAll(managementUIState.getTargetTableFilters().getClickedTargetTags());
         }
@@ -1081,7 +1078,7 @@ public class TargetTable extends AbstractTable implements Handler {
         String[] targetTags = null;
         Long distributionId = null;
         String searchText = null;
-        Boolean noTagClicked = Boolean.FALSE;
+        Boolean noTagClicked;
         Long pinnedDistId = null;
 
         if (isFilteredByTags()) {
@@ -1129,13 +1126,13 @@ public class TargetTable extends AbstractTable implements Handler {
                 && !Strings.isNullOrEmpty(managementUIState.getTargetTableFilters().getSearchText().get());
     }
 
-    private Boolean anyFilterSelected(final Collection<TargetUpdateStatus> status, final Long distributionId,
+    private static Boolean anyFilterSelected(final Collection<TargetUpdateStatus> status, final Long distributionId,
             final Boolean noTagClicked, final String[] targetTags, final String searchText) {
         return status == null && distributionId == null && Strings.isNullOrEmpty(searchText)
                 && !isTagSelected(targetTags, noTagClicked);
     }
 
-    private Boolean isTagSelected(final String[] targetTags, final Boolean noTagClicked) {
+    private static Boolean isTagSelected(final String[] targetTags, final Boolean noTagClicked) {
         return targetTags == null && !noTagClicked;
     }
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/AbstractSimpleTableHeader.java

@@ -15,7 +15,7 @@ import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
 import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
 import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
 
-import com.google.gwt.thirdparty.guava.common.base.Strings;
+import com.google.common.base.Strings;
 import com.vaadin.server.FontAwesome;
 import com.vaadin.ui.AbstractTextField.TextChangeEventMode;
 import com.vaadin.ui.Alignment;

pom.xml

@@ -15,7 +15,7 @@
    <parent>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-parent</artifactId>
-      <version>1.2.7.RELEASE</version>
+      <version>1.2.8.RELEASE</version>
    </parent>
 
    <groupId>org.eclipse.hawkbit</groupId>
@@ -57,42 +57,61 @@
    </repositories>
 
    <properties>
-      <spring.boot.version>1.2.7.RELEASE</spring.boot.version>
+      <java.version>1.8</java.version>
+   
+      <spring.boot.version>1.2.8.RELEASE</spring.boot.version>
 
-      <!-- Spring boot overrides - START -->
-      <h2.version>1.4.186</h2.version>
-      <jackson.version>2.5.0</jackson.version>
-      <hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
-      <spring-data-releasetrain.version>Fowler-SR1</spring-data-releasetrain.version>
+      <!-- Spring boot version overrides (should be reviewed with every boot upgrade) - START -->
+      <!-- Newer versions needed than defined in Boot-->
+      <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>
-      <mongodb.version>3.0.2</mongodb.version>
-      <!-- Spring boot overrides - END -->
+      <!--  Support for MongoDB 3 -->
+      <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.spring.version>1.0.0</vaadin.spring.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.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 -->
 
-      <!-- Misc -->
+      <!-- Misc libraries versions - START -->
       <fest-assert.version>1.4</fest-assert.version>
       <org.easytesting.version>2.0M10</org.easytesting.version>
-      <java.version>1.8</java.version>
       <allure.version>1.4.22</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>
       <pl.pragmatists.version>1.0.2</pl.pragmatists.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>
+      <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.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 - END -->
 
-      <!-- Sonar -->
+      <!-- Sonar - START-->
       <sonar.host.url>https://sonar.eu-gb.mybluemix.net</sonar.host.url>
       <sonar.github.repository>eclipse/hawkbit</sonar.github.repository>
       <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -123,7 +142,7 @@
       <!-- Tells Sonar where the Jacoco coverage result file is located for
          Integration Tests -->
       <sonar.jacoco.itReportPath>${jacoco.outputDir}/${jacoco.out.it.file}</sonar.jacoco.itReportPath>
-      <guava.version>19.0</guava.version>
+      <!-- Sonar - END-->
    </properties>
 
 
@@ -335,7 +354,7 @@
          <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.7</version>
+            <version>${slf4j.version}</version>
          </dependency>
          <!-- Vaadin -->
          <dependency>
@@ -363,30 +382,6 @@
             <artifactId>vaadin-push</artifactId>
             <version>${vaadin.version}</version>
          </dependency>
-         <!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory).
-            For widgetset compilation, vaadin-client-compiler is automatically added
-            on the compilation classpath by vaadin-maven-plugin so normally there is
-            no need for an explicit dependency. -->
-         <dependency>
-            <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-client-compiler</artifactId>
-            <version>${vaadin.version}</version>
-            <scope>provided</scope>
-            <exclusions>
-               <exclusion>
-                  <groupId>org.eclipse.jetty</groupId>
-                  <artifactId>jetty-servlets</artifactId>
-               </exclusion>
-               <exclusion>
-                  <groupId>org.eclipse.jetty</groupId>
-                  <artifactId>jetty-annotations</artifactId>
-               </exclusion>
-               <exclusion>
-                  <groupId>org.eclipse.jetty</groupId>
-                  <artifactId>jetty-util</artifactId>
-               </exclusion>
-            </exclusions>
-         </dependency>
          <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-themes</artifactId>
@@ -395,44 +390,44 @@
          <dependency>
             <groupId>org.vaadin.addons.lazyquerycontainer</groupId>
             <artifactId>vaadin-lazyquerycontainer</artifactId>
-            <version>7.4.0.1</version>
+            <version>${vaadin.addon.vaadin-lazyquerycontainer.version}</version>
          </dependency>
          <dependency>
             <groupId>org.vaadin.addons</groupId>
             <artifactId>flexibleoptiongroup</artifactId>
-            <version>2.2.0</version>
+            <version>${vaadin.addon.flexibleoptiongroup.version}</version>
          </dependency>
          <dependency>
             <groupId>org.vaadin.addons</groupId>
             <artifactId>tokenfield</artifactId>
-            <version>7.0.1</version>
+            <version>${vaadin.addon.tokenfield.version}</version>
          </dependency>
          <dependency>
             <groupId>org.vaadin.alump.distributionbar</groupId>
             <artifactId>dbar-addon</artifactId>
-            <version>1.2.0</version>
+            <version>${vaadin.addon.dbar-addon.version}</version>
          </dependency>
          <dependency>
             <groupId>org.vaadin.addons</groupId>
             <artifactId>contextmenu</artifactId>
-            <version>4.5</version>
+            <version>${vaadin.addon.contextmenu.version}</version>
          </dependency>
 
          <!-- Misc -->
          <dependency>
             <groupId>javax.el</groupId>
             <artifactId>javax.el-api</artifactId>
-            <version>2.2.4</version>
+            <version>${javax.el-api.version}</version>
          </dependency>
          <dependency>
             <groupId>net.sf.corn</groupId>
             <artifactId>corn-cps</artifactId>
-            <version>1.1.7</version>
+            <version>${corn-cps.version}</version>
          </dependency>
          <dependency>
             <groupId>net._01001111</groupId>
             <artifactId>jlorem</artifactId>
-            <version>1.1</version>
+            <version>${jlorem.version}</version>
          </dependency>
          <!-- Spring -->
          <dependency>
@@ -514,13 +509,6 @@
                </exclusion>
             </exclusions>
          </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>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.jpa</artifactId>
@@ -530,7 +518,7 @@
          <dependency>
             <groupId>cz.jirutka.rsql</groupId>
             <artifactId>rsql-parser</artifactId>
-            <version>2.0.0</version>
+            <version>${rsql-parser.version}</version>
          </dependency>
          <!-- JSON PATH, used to e.g. parse vcap services from environment -->
          <dependency>
@@ -541,7 +529,7 @@
          <dependency>
             <groupId>com.googlecode.json-simple</groupId>
             <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
+            <version>${json-simple.version}</version>
             <exclusions>
                <exclusion>
                   <groupId>junit</groupId>
@@ -549,13 +537,13 @@
                </exclusion>
             </exclusions>
          </dependency>
-         <!-- Spring boot overrides - START -->
-         <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>1.4.01</version>
+         
+          <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
          </dependency>
-         <!-- Spring boot overrides - END -->
+         
          <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -567,22 +555,16 @@
                </exclusion>
             </exclusions>
          </dependency>
-         <dependency>
-            <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-testbench</artifactId>
-            <version>4.0.3</version>
-            <scope>test</scope>
-         </dependency>
          <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20141113</version>
+            <version>${json.version}</version>
             <scope>test</scope>
          </dependency>
          <dependency>
             <groupId>de.flapdoodle.embed</groupId>
             <artifactId>de.flapdoodle.embed.mongo</artifactId>
-            <version>1.50.0</version>
+            <version>${embedded-mongo.version}</version>
             <scope>test</scope>
          </dependency>
          <dependency>
@@ -606,7 +588,7 @@
          <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-client</artifactId>
-            <version>1.18.1</version>
+            <version>${jersey-client.version}</version>
             <scope>test</scope>
          </dependency>
          <dependency>
@@ -618,13 +600,13 @@
          <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path-assert</artifactId>
-            <version>0.9.1</version>
+            <version>${json-path.version}</version>
             <scope>test</scope>
          </dependency>
          <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>1.2.3</version>
+            <version>${mariadb-java-client.version}</version>
             <scope>test</scope>
          </dependency>
          <dependency>