From c1558e37329d8de8bfed5f91c9d92060f41ea4f2 Mon Sep 17 00:00:00 2001 From: Hesham Massoud Date: Thu, 8 Aug 2019 13:22:53 +0200 Subject: [PATCH 1/5] Bump dependencies. --- build.gradle | 2 +- docs/RELEASE_NOTES.md | 10 ++++++++++ gradle-scripts/dependencies.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- gradlew.bat | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 31feb268f4..f958bc28fe 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'org.ajoberstar.git-publish' version '2.1.1' id 'com.adarshr.test-logger' version '1.7.0' id 'org.ajoberstar.grgit' version '3.1.1' - id "com.github.ben-manes.versions" version '0.21.0' + id "com.github.ben-manes.versions" version '0.22.0' id 'ru.vyarus.mkdocs' version '1.1.0' } diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md index 637401399e..f7bcad9119 100644 --- a/docs/RELEASE_NOTES.md +++ b/docs/RELEASE_NOTES.md @@ -34,6 +34,16 @@ [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/1.4.0/) | [Jar](https://bintray.com/commercetools/maven/commercetools-sync-java/1.4.0) +- 🛠️ **Enhancements** (8) + - **Commons** - Bumped commercetools-jvm-sdk to version [1.45.0](http://commercetools.github.io/commercetools-jvm-sdk/apidocs/io/sphere/sdk/meta/ReleaseNotes.html#v1_45_0). + - **Commons** - Bumped gradle to version [gradle-5.5.1](https://docs.gradle.org/5.5.1/release-notes.html) + - **Commons** - Bumped `org.junit.jupiter:junit-jupiter-api` to 5.5.1. + - **Commons** - Bumped `org.junit.jupiter:junit-jupiter-engine` to 5.5.1. + - **Commons** - Bumped `org.junit.jupiter:junit-jupiter-params` to 5.5.1. + - **Commons** - Bumped `mockito-junit-jupiter` dependency to 3.0.0. + - **Commons** - Bumped `assertj` to 3.13.2. + - **Commons** - Bumped `com.github.ben-manes.versions` to 0.22.0. + --> ### 1.3.0 - Jul 3, 2019 diff --git a/gradle-scripts/dependencies.gradle b/gradle-scripts/dependencies.gradle index 915fca2032..97ae19f1d5 100644 --- a/gradle-scripts/dependencies.gradle +++ b/gradle-scripts/dependencies.gradle @@ -1,7 +1,7 @@ ext{ - commercetoolsJvmSdkVersion = '1.44.0' - mockitoJunitJupiterVersion = '2.28.2' - jupiterApiVersion = '5.5.0' + commercetoolsJvmSdkVersion = '1.45.0' + mockitoJunitJupiterVersion = '3.0.0' + jupiterApiVersion = '5.5.1' assertjVersion = '3.12.2' checkstyleVersion = '8.2' pmdVersion = '6.14.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b0acbdcd73..4b7e1f3d38 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b0d6d0ab5d..8e25e6c19d 100755 --- a/gradlew +++ b/gradlew @@ -7,7 +7,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/gradlew.bat b/gradlew.bat index 15e1ee37a7..24467a141f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -5,7 +5,7 @@ @rem you may not use this file except in compliance with the License. @rem You may obtain a copy of the License at @rem -@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem https://www.apache.org/licenses/LICENSE-2.0 @rem @rem Unless required by applicable law or agreed to in writing, software @rem distributed under the License is distributed on an "AS IS" BASIS, From 8ff58a6b74cfc8a16f8a1bbc7ce3cfcb2286735c Mon Sep 17 00:00:00 2001 From: Hesham Massoud Date: Thu, 8 Aug 2019 13:25:39 +0200 Subject: [PATCH 2/5] Bump version in docs. --- README.md | 14 +++++++------- docs/README.md | 12 ++++++------ docs/usage/CART_DISCOUNT_SYNC.md | 2 +- docs/usage/CATEGORY_SYNC.md | 2 +- docs/usage/IMPORTANT_USAGE_TIPS.md | 2 +- docs/usage/INVENTORY_SYNC.md | 2 +- docs/usage/PRODUCT_SYNC.md | 2 +- docs/usage/QUICK_START.md | 4 ++-- mkdocs.yml | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index f0a8c2f8c2..8d57e96195 100644 --- a/README.md +++ b/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 1.3.0](https://img.shields.io/badge/Benchmarks-1.3.0-orange.svg)](https://commercetools.github.io/commercetools-sync-java/benchmarks/) +[![Benchmarks 1.4.0](https://img.shields.io/badge/Benchmarks-1.4.0-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/1.3.0/) +[![Javadoc](http://javadoc-badge.appspot.com/com.commercetools/commercetools-sync-java.svg?label=Javadoc)](https://commercetools.github.io/commercetools-sync-java/v/1.4.0/) [![Known Vulnerabilities](https://snyk.io/test/github/commercetools/commercetools-sync-java/4b2e26113d591bda158217c5dc1cf80a88665646/badge.svg)](https://snyk.io/test/github/commercetools/commercetools-sync-java/4b2e26113d591bda158217c5dc1cf80a88665646) More at https://commercetools.github.io/commercetools-sync-java @@ -34,7 +34,7 @@ The library supports synchronising the following entities in commercetools - [Ivy](#ivy) - [Roadmap](#roadmap) - [Release Notes](/docs/RELEASE_NOTES.md) -- [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/1.3.0/) +- [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/1.4.0/) - [Benchmarks](https://commercetools.github.io/commercetools-sync-java/benchmarks/) @@ -74,26 +74,26 @@ Here are the most popular ones: com.commercetools commercetools-sync-java - 1.3.0 + 1.4.0 ```` #### Gradle ````groovy -implementation 'com.commercetools:commercetools-sync-java:1.3.0' +implementation 'com.commercetools:commercetools-sync-java:1.4.0' ```` #### SBT ```` -libraryDependencies += "com.commercetools" % "commercetools-sync-java" % "1.3.0" +libraryDependencies += "com.commercetools" % "commercetools-sync-java" % "1.4.0" ```` #### Ivy ````xml - + ```` diff --git a/docs/README.md b/docs/README.md index 65742f4a3a..beb90f8b58 100644 --- a/docs/README.md +++ b/docs/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 1.3.0](https://img.shields.io/badge/Benchmarks-1.3.0-orange.svg)](https://commercetools.github.io/commercetools-sync-java/benchmarks/) +[![Benchmarks 1.4.0](https://img.shields.io/badge/Benchmarks-1.4.0-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/1.3.0/) +[![Javadoc](http://javadoc-badge.appspot.com/com.commercetools/commercetools-sync-java.svg?label=Javadoc)](https://commercetools.github.io/commercetools-sync-java/v/1.4.0/) [![Known Vulnerabilities](https://snyk.io/test/github/commercetools/commercetools-sync-java/4b2e26113d591bda158217c5dc1cf80a88665646/badge.svg)](https://snyk.io/test/github/commercetools/commercetools-sync-java/4b2e26113d591bda158217c5dc1cf80a88665646) @@ -51,18 +51,18 @@ Here are the most popular ones: com.commercetools commercetools-sync-java - 1.3.0 + 1.4.0 ```` #### Gradle ````groovy -implementation 'com.commercetools:commercetools-sync-java:1.3.0' +implementation 'com.commercetools:commercetools-sync-java:1.4.0' ```` #### SBT ```` -libraryDependencies += "com.commercetools" % "commercetools-sync-java" % "1.3.0" +libraryDependencies += "com.commercetools" % "commercetools-sync-java" % "1.4.0" ```` #### Ivy ````xml - + ```` diff --git a/docs/usage/CART_DISCOUNT_SYNC.md b/docs/usage/CART_DISCOUNT_SYNC.md index 5503c21312..8b4b8256e4 100644 --- a/docs/usage/CART_DISCOUNT_SYNC.md +++ b/docs/usage/CART_DISCOUNT_SYNC.md @@ -36,7 +36,7 @@ Therefore, in order for the sync to resolve the actual ids of those references i reference should return its `key`. **Note**: When syncing from a source commercetools project, you can use this util which this library provides: - [`replaceCartDiscountsReferenceIdsWithKeys`](https://commercetools.github.io/commercetools-sync-java/v/1.3.0/com/commercetools/sync/cartdiscounts/utils/CartDiscountReferenceReplacementUtils.html#replaceCartDiscountsReferenceIdsWithKeys-java.util.List-) + [`replaceCartDiscountsReferenceIdsWithKeys`](https://commercetools.github.io/commercetools-sync-java/v/1.4.0/com/commercetools/sync/cartdiscounts/utils/CartDiscountReferenceReplacementUtils.html#replaceCartDiscountsReferenceIdsWithKeys-java.util.List-) that replaces the references id fields with keys, in order to make them ready for reference resolution by the sync: ````java // Puts the keys in the reference id fields to prepare for reference resolution diff --git a/docs/usage/CATEGORY_SYNC.md b/docs/usage/CATEGORY_SYNC.md index 4e37d7c6fc..57bf2031f5 100644 --- a/docs/usage/CATEGORY_SYNC.md +++ b/docs/usage/CATEGORY_SYNC.md @@ -37,7 +37,7 @@ otherwise they won't be matched. reference would return its `key`. **Note**: This library provides you with a utility method - [`replaceCategoriesReferenceIdsWithKeys`](https://commercetools.github.io/commercetools-sync-java/v/1.3.0/com/commercetools/sync/categories/utils/CategoryReferenceReplacementUtils.html#replaceCategoriesReferenceIdsWithKeys-java.util.List-) + [`replaceCategoriesReferenceIdsWithKeys`](https://commercetools.github.io/commercetools-sync-java/v/1.4.0/com/commercetools/sync/categories/utils/CategoryReferenceReplacementUtils.html#replaceCategoriesReferenceIdsWithKeys-java.util.List-) that replaces the references id fields with keys, in order to make them ready for reference resolution by the sync: ````java // Puts the keys in the reference id fields to prepare for reference resolution diff --git a/docs/usage/IMPORTANT_USAGE_TIPS.md b/docs/usage/IMPORTANT_USAGE_TIPS.md index 8669520cf7..904638acf7 100644 --- a/docs/usage/IMPORTANT_USAGE_TIPS.md +++ b/docs/usage/IMPORTANT_USAGE_TIPS.md @@ -29,7 +29,7 @@ productSync.sync(batch1) By design, scaling the sync process should **not** be done by executing the batches themselves in parallel. However, it can be done either by: - Changing the number of [max parallel requests](https://github.com/commercetools/commercetools-sync-java/tree/master/src/main/java/com/commercetools/sync/commons/utils/ClientConfigurationUtils.java#L116) within the `sphereClient` configuration. It defines how many requests the client can execute in parallel. - - or changing the draft [batch size](https://commercetools.github.io/commercetools-sync-java/v/1.3.0/com/commercetools/sync/commons/BaseSyncOptionsBuilder.html#batchSize-int-). It defines how many drafts can one batch contain. + - or changing the draft [batch size](https://commercetools.github.io/commercetools-sync-java/v/1.4.0/com/commercetools/sync/commons/BaseSyncOptionsBuilder.html#batchSize-int-). It defines how many drafts can one batch contain. The current overridable default [configuration](https://github.com/commercetools/commercetools-sync-java/tree/master/src/main/java/com/commercetools/sync/commons/utils/ClientConfigurationUtils.java#L45) of the `sphereClient` is the recommended good balance for stability and performance for the sync process. diff --git a/docs/usage/INVENTORY_SYNC.md b/docs/usage/INVENTORY_SYNC.md index 83cb0203a7..0cf1ed05ef 100644 --- a/docs/usage/INVENTORY_SYNC.md +++ b/docs/usage/INVENTORY_SYNC.md @@ -35,7 +35,7 @@ against a [InventoryEntryDraft](https://docs.commercetools.com/http-api-projects reference would return its `key`. **Note**: This library provides you with a utility method - [`replaceInventoriesReferenceIdsWithKeys`](https://commercetools.github.io/commercetools-sync-java/v/1.3.0/com/commercetools/sync/inventories/utils/InventoryReferenceReplacementUtils.html#replaceInventoriesReferenceIdsWithKeys-java.util.List-) + [`replaceInventoriesReferenceIdsWithKeys`](https://commercetools.github.io/commercetools-sync-java/v/1.4.0/com/commercetools/sync/inventories/utils/InventoryReferenceReplacementUtils.html#replaceInventoriesReferenceIdsWithKeys-java.util.List-) that replaces the references id fields with keys, in order to make them ready for reference resolution by the sync: ````java // Puts the keys in the reference id fields to prepare for reference resolution diff --git a/docs/usage/PRODUCT_SYNC.md b/docs/usage/PRODUCT_SYNC.md index b8bee3bb17..b64b3ab069 100644 --- a/docs/usage/PRODUCT_SYNC.md +++ b/docs/usage/PRODUCT_SYNC.md @@ -40,7 +40,7 @@ order for the sync to resolve the actual ids of those references, those `key`s h reference would return its `key`. **Note**: This library provides you with a utility method - [`replaceProductsReferenceIdsWithKeys`](https://commercetools.github.io/commercetools-sync-java/v/1.3.0/com/commercetools/sync/products/utils/ProductReferenceReplacementUtils.html#replaceProductsReferenceIdsWithKeys-java.util.List-) + [`replaceProductsReferenceIdsWithKeys`](https://commercetools.github.io/commercetools-sync-java/v/1.4.0/com/commercetools/sync/products/utils/ProductReferenceReplacementUtils.html#replaceProductsReferenceIdsWithKeys-java.util.List-) that replaces the references id fields with keys, in order to make them ready for reference resolution by the sync: ````java // Puts the keys in the reference id fields to prepare for reference resolution diff --git a/docs/usage/QUICK_START.md b/docs/usage/QUICK_START.md index 6c5ce25dac..7541eb9150 100644 --- a/docs/usage/QUICK_START.md +++ b/docs/usage/QUICK_START.md @@ -37,7 +37,7 @@ com.commercetools commercetools-sync-java - 1.3.0 + 1.4.0 ```` - For Gradle users: @@ -48,7 +48,7 @@ implementation 'com.commercetools.sdk.jvm.core:commercetools-java-client:1.37.0' implementation 'com.commercetools.sdk.jvm.core:commercetools-convenience:1.37.0' // Add commercetools-sync-java dependency. -implementation 'com.commercetools:commercetools-sync-java:1.3.0' +implementation 'com.commercetools:commercetools-sync-java:1.4.0' ```` ### 2. Setup Syncing Options diff --git a/mkdocs.yml b/mkdocs.yml index ab25935dce..b2055fdd3f 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -56,7 +56,7 @@ nav: - Advanced: - Sync Options: usage/SYNC_OPTIONS.md - Usage Tips: usage/IMPORTANT_USAGE_TIPS.md - - Javadoc: https://commercetools.github.io/commercetools-sync-java/v/1.3.0/ + - Javadoc: https://commercetools.github.io/commercetools-sync-java/v/1.4.0/ - Release notes: RELEASE_NOTES.md - Roadmap: https://github.com/commercetools/commercetools-sync-java/milestones - Issues: https://github.com/commercetools/commercetools-sync-java/issues From 978dae0591e662deabc51fab674044d254d91212 Mon Sep 17 00:00:00 2001 From: Hesham Massoud Date: Thu, 8 Aug 2019 13:25:52 +0200 Subject: [PATCH 3/5] Make new release notes visible. --- docs/RELEASE_NOTES.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md index f7bcad9119..9ce0c42921 100644 --- a/docs/RELEASE_NOTES.md +++ b/docs/RELEASE_NOTES.md @@ -29,7 +29,15 @@ --> + + +### 1.4.0 - Aug 8, 2019 [Commits](https://github.com/commercetools/commercetools-sync-java/compare/1.3.0...1.4.0) | [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/1.4.0/) | [Jar](https://bintray.com/commercetools/maven/commercetools-sync-java/1.4.0) @@ -44,8 +52,6 @@ - **Commons** - Bumped `assertj` to 3.13.2. - **Commons** - Bumped `com.github.ben-manes.versions` to 0.22.0. ---> - ### 1.3.0 - Jul 3, 2019 [Commits](https://github.com/commercetools/commercetools-sync-java/compare/1.2.0...1.3.0) | [Javadoc](https://commercetools.github.io/commercetools-sync-java/v/1.3.0/) | From 62ed6069526e2243203bd39fc7309cd6f04e79f0 Mon Sep 17 00:00:00 2001 From: Hesham Massoud Date: Thu, 8 Aug 2019 13:30:25 +0200 Subject: [PATCH 4/5] Add caveat of set of set support. --- docs/usage/PRODUCT_TYPE_SYNC.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/usage/PRODUCT_TYPE_SYNC.md b/docs/usage/PRODUCT_TYPE_SYNC.md index f2558bb36d..ef35391547 100644 --- a/docs/usage/PRODUCT_TYPE_SYNC.md +++ b/docs/usage/PRODUCT_TYPE_SYNC.md @@ -100,3 +100,4 @@ More examples of those utils for different fields can be found [here](https://gi ## Caveats 1. Syncing product types with an attribute of type [NestedType](https://docs.commercetools.com/http-api-projects-productTypes.html#nestedtype) is not supported yet. +1. Syncing product types with an attribute of type `Set` of `NestedType` attribute is supported. However, `Set` of (`Set` of `Set` of..) of `NestedType` is not yet supported. From eed41170cee47b87324c6960afaadda8679f8f99 Mon Sep 17 00:00:00 2001 From: Hesham Massoud Date: Thu, 8 Aug 2019 14:54:15 +0200 Subject: [PATCH 5/5] Bump assertJ dependency. --- gradle-scripts/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle-scripts/dependencies.gradle b/gradle-scripts/dependencies.gradle index 97ae19f1d5..27192fe327 100644 --- a/gradle-scripts/dependencies.gradle +++ b/gradle-scripts/dependencies.gradle @@ -2,7 +2,7 @@ ext{ commercetoolsJvmSdkVersion = '1.45.0' mockitoJunitJupiterVersion = '3.0.0' jupiterApiVersion = '5.5.1' - assertjVersion = '3.12.2' + assertjVersion = '3.13.2' checkstyleVersion = '8.2' pmdVersion = '6.14.0' jacocoVersion = '0.8.4'