From a23b6bcc409ec9c16fb5677df6d1f296c56336d1 Mon Sep 17 00:00:00 2001
From: Michael Hirsch <michael.hirsch@bosch-si.com>
Date: Wed, 28 Sep 2016 15:57:52 +0200
Subject: [PATCH 1/3] hawkBit pom release preparations

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
---
 pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a35752663..6e0f26287 100644
--- a/pom.xml
+++ b/pom.xml
@@ -400,9 +400,8 @@
       <profile>
          <id>nexus_staging</id>
          <activation>
-            <activeByDefault>true</activeByDefault>
             <property>
-               <name>useNexusStaging</name>
+               <name>!skipNexusStaging</name>
             </property>
          </activation>
          <build>
@@ -415,7 +414,7 @@
                      as part of building the module. -->
                   <groupId>org.sonatype.plugins</groupId>
                   <artifactId>nexus-staging-maven-plugin</artifactId>
-                  <version>1.6.5</version>
+                  <version>1.6.7</version>
                   <extensions>true</extensions>
                   <configuration>
                      <serverId>ossrh</serverId>

From e08962cf8f84fc614084df44a61d5cd57b90af94 Mon Sep 17 00:00:00 2001
From: kaizimmerm <kai.zimmermann@bosch-si.com>
Date: Fri, 30 Sep 2016 08:53:58 +0200
Subject: [PATCH 2/3] Fixed broken DMF API collection handling

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
---
 .../eclipse/hawkbit/simulator/amqp/SpSenderService.java  | 2 +-
 .../hawkbit/dmf/json/model/ActionUpdateStatus.java       | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/amqp/SpSenderService.java b/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/amqp/SpSenderService.java
index 1ced8c2fd..f384347c6 100644
--- a/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/amqp/SpSenderService.java
+++ b/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/amqp/SpSenderService.java
@@ -206,7 +206,7 @@ public class SpSenderService extends SenderService {
         headers.put(MessageHeaderKey.TENANT, cacheValue.getTenant());
         headers.put(MessageHeaderKey.TOPIC, EventTopic.UPDATE_ACTION_STATUS.name());
         headers.put(MessageHeaderKey.CONTENT_TYPE, MessageProperties.CONTENT_TYPE_JSON);
-        actionUpdateStatus.getMessage().addAll(updateResultMessages);
+        actionUpdateStatus.addMessage(updateResultMessages);
         actionUpdateStatus.setActionId(cacheValue.getActionId());
         return convertMessage(actionUpdateStatus, messageProperties);
     }
diff --git a/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/ActionUpdateStatus.java b/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/ActionUpdateStatus.java
index 2262cab96..652039e35 100644
--- a/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/ActionUpdateStatus.java
+++ b/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/ActionUpdateStatus.java
@@ -9,6 +9,7 @@
 package org.eclipse.hawkbit.dmf.json.model;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -72,4 +73,12 @@ public class ActionUpdateStatus {
         return this.message.add(message);
     }
 
+    public boolean addMessage(final Collection<String> messages) {
+        if (this.message == null) {
+            this.message = new ArrayList<>();
+        }
+
+        return this.message.addAll(messages);
+    }
+
 }

From de6b5cd93d3b378e4c9cf8e1c3adfc74d555d2ac Mon Sep 17 00:00:00 2001
From: kaizimmerm <kai.zimmermann@bosch-si.com>
Date: Fri, 30 Sep 2016 09:12:39 +0200
Subject: [PATCH 3/3] Optimized array allocation

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
---
 .../eclipse/hawkbit/dmf/json/model/ActionUpdateStatus.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/ActionUpdateStatus.java b/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/ActionUpdateStatus.java
index 652039e35..f17252bd8 100644
--- a/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/ActionUpdateStatus.java
+++ b/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/ActionUpdateStatus.java
@@ -74,8 +74,13 @@ public class ActionUpdateStatus {
     }
 
     public boolean addMessage(final Collection<String> messages) {
+        if (messages == null || messages.isEmpty()) {
+            return false;
+        }
+
         if (this.message == null) {
-            this.message = new ArrayList<>();
+            this.message = new ArrayList<>(messages);
+            return true;
         }
 
         return this.message.addAll(messages);