[Release] Merge remote-tracking branch 'origin/release/1.6.5' into de…

…velop Change-Id: I619157b719a4e9fa34be41302b6eb74e336b0411
bmwcarit · Jan 18, 2019 · 4f915e9 · 4f915e9
2 parents 1f800a6 + 59e8b52
commit 4f915e9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -412,7 +412,7 @@
 			are referenced.
 		-->
 		<jersey.version>1.19.4</jersey.version>
-		<jackson.version>2.9.7</jackson.version>
+		<jackson.version>2.9.8</jackson.version>
 		<guice.version>3.0</guice.version>
 		<jetty.version>9.2.13.v20150730</jetty.version>
 		<tycho.version>0.24.0</tycho.version>

diff --git a/wiki/ReleaseNotes.md b/wiki/ReleaseNotes.md
@@ -17,15 +17,23 @@ the versioning scheme [here](JoynrVersioning.md).
   ParticipantIdStorage now also stores major versions of providers.
 * **[Java, JEE]** Provided an example for the usage of the message persistence feature. Check the
   `examples/message-persistence/` folder.
-* **[Java]** Update jackson to version 2.9.7
-* **[C++]** MQTT connection will not be attempted if MQTT TLS is enabled, but TLS certificates
-  do not exist or are inaccessible or TLS options cannot be set.
 * **[JS]** Fixed an issue where joynr.shutdown would not wait for clearSubscriptions before shutting
   down.
 * **[Java]** Eliminated declared but unneeded dependcies in some of the sub-projects. Also avoided
   defining versions inside the dependencyManagement for transitive dependencies not being directly
   used in joynr.
 
+## Configuration property changes
+  None.
+
+# joynr 1.6.5
+
+## API relevant changes
+None.
+
+## Other changes
+* **[Java]** Update jackson to version 2.9.8
+
 ## Configuration property changes
 None.
 

diff --git a/wiki/jee.md b/wiki/jee.md
@@ -619,12 +619,12 @@ referenced libs.
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>2.8.8</version>
+      <version>2.9.8</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-xml</artifactId>
-      <version>2.8.8</version>
+      <version>2.9.8</version>
     </dependency>
 
 Finally in case you're using JSON: Not setting a value to the @JsonProperty annotations