Merge pull request #270 from commercetools/m11-release-prep

v1.0.0-M11  release prep

Author: heshamMassoud

README.md

@@ -2,9 +2,9 @@
 # commercetools sync
 [![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)
-[![Benchmarks M10](https://img.shields.io/badge/Benchmarks-M10-orange.svg)](https://commercetools.github.io/commercetools-sync-java/benchmarks/)
+[![Benchmarks M11](https://img.shields.io/badge/Benchmarks-M11-orange.svg)](https://commercetools.github.io/commercetools-sync-java/benchmarks/)
 [![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-M10/)
+[![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-M11/)
 [![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 
@@ -22,7 +22,7 @@ Java API which exposes utilities for building update actions and automatic synci
     - [Ivy](#ivy)
 - [Roadmap](#roadmap)
 - [Release Notes](/docs/RELEASE_NOTES.md)
-- [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M10/)
+- [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/v1.0.0-M11/)
 - [Benchmarks](https://commercetools.github.io/commercetools-sync-java/benchmarks/)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -58,20 +58,20 @@ most popular ones:
 <dependency>
   <groupId>com.commercetools</groupId>
   <artifactId>commercetools-sync-java</artifactId>
-  <version>v1.0.0-M10</version>
+  <version>v1.0.0-M11</version>
 </dependency>
 ````
 #### Gradle
 ````groovy
-implementation 'com.commercetools:commercetools-sync-java:v1.0.0-M10'
+implementation 'com.commercetools:commercetools-sync-java:v1.0.0-M11'
 ````
 #### SBT 
 ````
-libraryDependencies += "com.commercetools" % "commercetools-sync-java" % "v1.0.0-M10"
+libraryDependencies += "com.commercetools" % "commercetools-sync-java" % "v1.0.0-M11"
 ````
 #### Ivy 
 ````xml
-<dependency org="com.commercetools" name="commercetools-sync-java" rev="v1.0.0-M10"/>
+<dependency org="com.commercetools" name="commercetools-sync-java" rev="v1.0.0-M11"/>
 ````
 
 

gradle-scripts/dependencies.gradle

@@ -1,10 +1,10 @@
 ext{
-    commercetoolsJvmSdkVersion = '1.29.0'
-    mockitoVersion = '2.13.0'
+    commercetoolsJvmSdkVersion = '1.30.0'
+    mockitoVersion = '2.15.0'
     jUnitVersion = '4.12'
-    assertjVersion = '3.9.0'
+    assertjVersion = '3.9.1'
     checkstyleVersion = '7.7'
-    pmdVersion = '5.6.1'
+    pmdVersion = '5.8.1'
     jacocoVersion = '0.8.0'
     findbugsVersion = '3.0.1'
 }

src/integration-test/java/com/commercetools/sync/integration/commons/utils/ProductTypeITUtils.java

@@ -2,8 +2,8 @@
 
 import io.sphere.sdk.client.SphereClient;
 import io.sphere.sdk.models.LocalizedString;
-import io.sphere.sdk.products.attributes.AttributeDefinition;
-import io.sphere.sdk.products.attributes.AttributeDefinitionBuilder;
+import io.sphere.sdk.products.attributes.AttributeDefinitionDraft;
+import io.sphere.sdk.products.attributes.AttributeDefinitionDraftBuilder;
 import io.sphere.sdk.products.attributes.BooleanAttributeType;
 import io.sphere.sdk.products.attributes.LocalizedStringAttributeType;
 import io.sphere.sdk.producttypes.ProductType;
@@ -62,7 +62,7 @@ public static void createProductType(@Nonnull final String productTypeKey,
                                          @Nonnull final SphereClient ctpClient) {
         if (!productTypeExists(productTypeKey, ctpClient)) {
             final ProductTypeDraft productTypeDraft = ProductTypeDraftBuilder
-                .of(productTypeKey, name, "description", buildAttributeDefinitions(locale))
+                .of(productTypeKey, name, "description", buildAttributeDefinitionDrafts(locale))
                 .build();
             ctpClient.execute(ProductTypeCreateCommand.of(productTypeDraft)).toCompletableFuture().join();
         }
@@ -114,14 +114,12 @@ public static ProductType createProductType(@Nonnull final String jsonResourcePa
      * @param locale defines the locale for which the field definition names are going to be bound to.
      * @return the list of field definitions.
      */
-    private static List<AttributeDefinition> buildAttributeDefinitions(@Nonnull final Locale locale) {
+    private static List<AttributeDefinitionDraft> buildAttributeDefinitionDrafts(@Nonnull final Locale locale) {
         return asList(
-            AttributeDefinitionBuilder.of(LOCALISED_STRING_ATTRIBUTE_NAME,
-                LocalizedString.of(locale, LOCALISED_STRING_ATTRIBUTE_NAME), LocalizedStringAttributeType.of())
-                                      .build(),
-            AttributeDefinitionBuilder.of(BOOLEAN_ATTRIBUTE_NAME,
-                LocalizedString.of(locale, BOOLEAN_ATTRIBUTE_NAME), BooleanAttributeType.of())
-                                      .build()
+            AttributeDefinitionDraftBuilder.of(LocalizedStringAttributeType.of(), LOCALISED_STRING_ATTRIBUTE_NAME,
+                LocalizedString.of(locale, LOCALISED_STRING_ATTRIBUTE_NAME), false).build(),
+            AttributeDefinitionDraftBuilder.of(BooleanAttributeType.of(), BOOLEAN_ATTRIBUTE_NAME,
+                LocalizedString.of(locale, BOOLEAN_ATTRIBUTE_NAME), false).build()
         );
 
     }