Merge pull request #203 from commercetools/1.0.0-M6-release-prep

Release preparation for v1.0.0-M6

Author: heshamMassoud

README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/commercetools/commercetools-sync-java.svg?branch=master)](https://travis-ci.org/commercetools/commercetools-sync-java)
 [![codecov](https://codecov.io/gh/commercetools/commercetools-sync-java/branch/master/graph/badge.svg)](https://codecov.io/gh/commercetools/commercetools-sync-java)
 [![Download](https://api.bintray.com/packages/commercetools/maven/commercetools-sync-java/images/download.svg) ](https://bintray.com/commercetools/maven/commercetools-sync-java/_latestVersion)
-[![Javadoc](http://javadoc-badge.appspot.com/com.commercetools/commercetools-sync-java.svg?label=Javadoc)](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M5/)
+[![Javadoc](http://javadoc-badge.appspot.com/com.commercetools/commercetools-sync-java.svg?label=Javadoc)](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M6/)
 [![Known Vulnerabilities](https://snyk.io/test/github/commercetools/commercetools-sync-java/4b2e26113d591bda158217c5dc1cf80a88665646/badge.svg)](https://snyk.io/test/github/commercetools/commercetools-sync-java/4b2e26113d591bda158217c5dc1cf80a88665646)
 
 Java API which exposes utilities for building update actions and automatic syncing of CTP data from external sources 
@@ -17,9 +17,12 @@ Java API which exposes utilities for building update actions and automatic synci
   - [Installation](#installation)
     - [Maven](#maven)
     - [Gradle](#gradle)
+    - [SBT](#sbt)
+    - [Ivy](#ivy)
 - [Roadmap](#roadmap)
 - [Release Notes](/docs/RELEASE_NOTES.md)
-- [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M1/)
+- [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M6/)
+
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 ## Usage
 
@@ -53,19 +56,22 @@ most popular ones:
 <dependency>
   <groupId>com.commercetools</groupId>
   <artifactId>commercetools-sync-java</artifactId>
-  <version>v1.0.0-M5</version>
+  <version>v1.0.0-M6</version>
 </dependency>
 ````
 #### Gradle
 ````groovy
-implementation 'com.commercetools:commercetools-sync-java:v1.0.0-M5'
+implementation 'com.commercetools:commercetools-sync-java:v1.0.0-M6'
+````
+#### SBT 
+````
+libraryDependencies += "com.commercetools" % "commercetools-sync-java" % "v1.0.0-M6"
 ````
-<!-- TODO #### SBT 
-````java
-libraryDependencies ++= Seq(
-    "com.commercetools" % "commercetools-sync-java" % "v1.0.0-M5",
- )
-````-->
+#### Ivy 
+````xml
+<dependency org="com.commercetools" name="commercetools-sync-java" rev="v1.0.0-M6"/>
+````
+
 
 ## Roadmap
 https://github.com/commercetools/commercetools-sync-java/milestones

docs/RELEASE_NOTES.md

@@ -33,6 +33,7 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
 
+- [v1.0.0-M6 -  Dec 4, 2017](#v100-m6----dec-4-2017)
 - [v1.0.0-M5 -  Nov 16, 2017](#v100-m5----nov-16-2017)
 - [v1.0.0-M4 -  Nov 7, 2017](#v100-m4----nov-7-2017)
 - [v1.0.0-M3 -  Nov 3, 2017](#v100-m3----nov-3-2017)
@@ -41,8 +42,15 @@
 - [v1.0.0-M1 -  Sep 06, 2017](#v100-m1----sep-06-2017)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
 <!--
-### v1.0.0-M6 -  Dec 1, 2017
+### v1.0.0-M7 -  Dec 19, 2017
+[Commits](https://github.com/commercetools/commercetools-sync-java/compare/v1.0.0-M6...v1.0.0-M7) |
+[Javadoc](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M7/) | 
+[Jar](https://bintray.com/commercetools/maven/commercetools-sync-java/v1.0.0-M7)
+-->
+
+### v1.0.0-M6 -  Dec 5, 2017
 [Commits](https://github.com/commercetools/commercetools-sync-java/compare/v1.0.0-M5...v1.0.0-M6) |
 [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M6/) | 
 [Jar](https://bintray.com/commercetools/maven/commercetools-sync-java/v1.0.0-M6)
@@ -52,13 +60,16 @@
 - **Product Sync** - Introduced `beforeCreateCallback` option which is callback applied on a product draft before a request to create it on CTP is issued. [#183](https://github.com/commercetools/commercetools-sync-java/issues/183)
 - **Inventory Sync** - Introduced `beforeCreateCallback` option which is callback applied on a inventoryEntry draft before a request to create it on CTP is issued. [#183](https://github.com/commercetools/commercetools-sync-java/issues/183)
 
-**Bug Fixes** (1)
-- **Commons** - Fixed library version in User-Agent headers of JVM SDK clients using the library. [#191](https://github.com/commercetools/commercetools-sync-java/issues/191)
-
 **Major Enhancements** (2)
 - **Category Sync** - Introduced batching on update action requests to allow for requesting updates of more than 500 actions. [#21](https://github.com/commercetools/commercetools-sync-java/issues/21)
 - **Product Sync** - Introduced batching on update action requests to allow for requesting updates of more than 500 actions. [#21](https://github.com/commercetools/commercetools-sync-java/issues/21)
 
+**Bug Fixes** (1)
+- **Commons** - Fixed library version in User-Agent headers of JVM SDK clients using the library. [#191](https://github.com/commercetools/commercetools-sync-java/issues/191)
+
+**Documentation** (1)
+- **Commons** - Added [Code of Conduct](/docs/CODE_OF_CONDUCT.md) doc.
+
 **Migration guide** (6)
 - **Product Sync** - Removed `removeOtherVariants` option which is already done by the sync by default. Removal of 
 variants can be prevented through the beforeUpdateCallback. Please check [here](/src/integration-test/java/com/commercetools/sync/integration/ctpprojectsource/products/templates/beforeupdatecallback/KeepOtherVariantsSyncIT.java)
@@ -72,7 +83,7 @@ library. [#191](https://github.com/commercetools/commercetools-sync-java/issues/
 - **Category Sync** - `beforeUpdateCallback` now treats a null return as an empty list of update actions. [#183](https://github.com/commercetools/commercetools-sync-java/issues/183)
 - **Product Sync** - `beforeUpdateCallback` now treats a null return as an empty list of update actions. [#183](https://github.com/commercetools/commercetools-sync-java/issues/183)
 - **Inventory Sync** - `beforeUpdateCallback` now treats a null return as an empty list of update actions. [#183](https://github.com/commercetools/commercetools-sync-java/issues/183)
---> 
+
 
 ### v1.0.0-M5 -  Nov 16, 2017
 [Commits](https://github.com/commercetools/commercetools-sync-java/compare/v1.0.0-M4...v1.0.0-M5) |

src/integration-test/java/com/commercetools/sync/integration/services/ProductServiceIT.java

@@ -608,8 +608,7 @@ public void updateProduct_WithMoreThan500Actions_ShouldNotFail() {
         assertThat(fetchedProductOptional).isNotEmpty();
         final Product fetchedProduct = fetchedProductOptional.get();
 
-        // Test that the fetched product has a version number equal to the number of update actions applied on it.
-        assertThat(fetchedProduct.getVersion()).isEqualTo(numberOfUpdateActions + 1);
+        // Test that the fetched product has the name of the last update action that was applied.
         assertThat(fetchedProduct.getMasterData().getStaged().getName())
             .isEqualTo(LocalizedString.of(Locale.GERMAN, format("name:%s", numberOfUpdateActions)));
     }