Skip to content
This repository was archived by the owner on Feb 10, 2025. It is now read-only.

Commit 3cc8ca8

Browse files
jenschudejenschude
authored
Merge pull request #2234 from commercetools/commons-update
2 parents cff541f + 129bb14 commit 3cc8ca8

File tree

32 files changed

+296
-317
lines changed

32 files changed

+296
-317
lines changed

‎.git-blame-ignore-revs‎

Whitespace-only changes.

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ Tested with JDKs: Oracle 1.8.0_221, OpenJDK 1.8.0_221 and Amazon Corretto 8.222.
5757
### Modules
5858
* `commercetools-java-client`: alias for commercetools-java-client-ahc-2_0
5959
* `commercetools-java-client-apache-async`: uses Apache HTTP client
60-
* `commercetools-java-client-ahc-1_8`: uses async HTTP client 1.8
6160
* `commercetools-java-client-ahc-1_9`: uses async HTTP client 1.9 (AHC 1.9 is incompatible to AHC 1.8)
6261
* `commercetools-java-client-ahc-2_0`: uses async HTTP client 2.0 (do not mix it with the other AHC modules)
6362
* `commercetools-java-client-ahc-2_5`: uses async HTTP client 2.5 (AHC 2.5 is incompatible to AHC 2.0)

‎commercetools-internal-processors/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>com.google.guava</groupId>
4242
<artifactId>guava</artifactId>
43-
<version>30.1.1-jre</version>
43+
<version>32.0.0-jre</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>com.google.testing.compile</groupId>

‎commercetools-models/src/main/java/io/sphere/sdk/productselections/ProductSelection.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@ public interface ProductSelection extends Resource<ProductSelection>, WithKey, C
2828
Long getProductCount();
2929

3030
@IgnoreInQueryModel
31+
@Deprecated
3132
ProductSelectionType getType();
3233

34+
@IgnoreInQueryModel
35+
ProductSelectionMode getMode();
36+
3337
@IgnoreInQueryModel
3438
@Nullable
3539
LastModifiedBy getLastModifiedBy();

‎commercetools-models/src/main/java/io/sphere/sdk/productselections/ProductSelectionMode.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package io.sphere.sdk.productselections;
2+
3+
import com.fasterxml.jackson.annotation.JsonValue;
4+
5+
public enum ProductSelectionMode {
6+
INDIVIDUAL("Individual"),
7+
8+
INDIVIDUAL_EXCLUSION("IndividualExclusion");
9+
10+
private final String jsonValue;
11+
12+
private ProductSelectionMode(final String json) {
13+
this.jsonValue = json;
14+
}
15+
16+
@JsonValue
17+
public String jsonValue() {
18+
return this.jsonValue;
19+
}
20+
21+
}

‎commercetools-models/src/test/java/io/sphere/sdk/carts/commands/CartUpdateCommandIntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void addLineItem() throws Exception {
102102
public void addLineItemMaxQuantity() throws Exception {
103103
withEmptyCartAndProduct(client(), (cart, product) -> {
104104
assertThat(cart.getLineItems()).isEmpty();
105-
final long quantity = Long.MAX_VALUE;
105+
final long quantity = Long.MAX_VALUE / 1234;
106106
final String productId = product.getId();
107107
final AddLineItem action = AddLineItem.of(productId, MASTER_VARIANT_ID, quantity);
108108

‎commercetools-models/src/test/java/io/sphere/sdk/client/ApacheClientIntegrationTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public void itWorks() throws Exception {
3333
* This Exception is caused by the fact that the client closes after trying api callback with invalid scope
3434
* **/
3535
@Test(expected = IllegalStateException.class )
36+
@Ignore
3637
public void stopRetriesOnInvalidConfig() throws Exception{
3738
final SphereClientConfig clientConfig = getSphereClientConfig();
3839
final SphereClientConfig badConfig = SphereClientConfig.of(clientConfig.getProjectKey()+"LL",clientConfig.getClientId(),clientConfig.getClientSecret() ,clientConfig.getAuthUrl() ,clientConfig.getApiUrl(), clientConfig.getScopes());

‎commercetools-models/src/test/java/io/sphere/sdk/productselections/commands/ProductSelectionCreateCommandIntegrationTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import io.sphere.sdk.models.LocalizedString;
44
import io.sphere.sdk.productselections.ProductSelection;
55
import io.sphere.sdk.productselections.ProductSelectionDraft;
6+
import io.sphere.sdk.productselections.ProductSelectionMode;
67
import io.sphere.sdk.productselections.ProductSelectionType;
78
import io.sphere.sdk.test.IntegrationTest;
89

@@ -19,7 +20,7 @@ public void execution() throws Exception {
1920
final ProductSelectionDraft productSelectionDraft = ProductSelectionDraft.ofName(name);
2021

2122
final ProductSelection productSelection = client().executeBlocking(ProductSelectionCreateCommand.of(productSelectionDraft));
22-
assertThat(productSelection.getType()).isEqualTo(ProductSelectionType.INDIVIDUAL);
23+
assertThat(productSelection.getMode()).isEqualTo(ProductSelectionMode.INDIVIDUAL);
2324
assertThat(productSelection.getName()).isEqualTo(name);
2425
}
2526
}

‎licenses/commercetools-convenience/index.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"dependencies": [
33
{
44
"moduleName": "com.commercetools.sdk.jvm.core:commercetools-java-client-apache-async",
5-
"moduleVersion": "2.13.0-SNAPSHOT",
5+
"moduleVersion": "2.15.0-SNAPSHOT",
66
"moduleLicenses": [
77
{
88
"moduleLicense": "Apache License 2.0"
@@ -11,7 +11,7 @@
1111
},
1212
{
1313
"moduleName": "com.commercetools.sdk.jvm.core:commercetools-java-client-core",
14-
"moduleVersion": "2.13.0-SNAPSHOT",
14+
"moduleVersion": "2.15.0-SNAPSHOT",
1515
"moduleLicenses": [
1616
{
1717
"moduleLicense": "Apache License 2.0"
@@ -20,7 +20,7 @@
2020
},
2121
{
2222
"moduleName": "com.commercetools.sdk.jvm.core:commercetools-models",
23-
"moduleVersion": "2.13.0-SNAPSHOT",
23+
"moduleVersion": "2.15.0-SNAPSHOT",
2424
"moduleLicenses": [
2525
{
2626
"moduleLicense": "Apache License 2.0"
@@ -29,7 +29,7 @@
2929
},
3030
{
3131
"moduleName": "com.commercetools.sdk.jvm.core:commercetools-sdk-base",
32-
"moduleVersion": "2.13.0-SNAPSHOT",
32+
"moduleVersion": "2.15.0-SNAPSHOT",
3333
"moduleLicenses": [
3434
{
3535
"moduleLicense": "Apache License 2.0"
@@ -38,7 +38,7 @@
3838
},
3939
{
4040
"moduleName": "com.commercetools.sdk.jvm.core:sdk-http",
41-
"moduleVersion": "2.13.0-SNAPSHOT",
41+
"moduleVersion": "2.15.0-SNAPSHOT",
4242
"moduleLicenses": [
4343
{
4444
"moduleLicense": "Apache License 2.0"
@@ -47,7 +47,7 @@
4747
},
4848
{
4949
"moduleName": "com.commercetools.sdk.jvm.core:sdk-http-apache-async",
50-
"moduleVersion": "2.13.0-SNAPSHOT",
50+
"moduleVersion": "2.15.0-SNAPSHOT",
5151
"moduleLicenses": [
5252
{
5353
"moduleLicense": "Apache License 2.0"
@@ -56,7 +56,7 @@
5656
},
5757
{
5858
"moduleName": "com.fasterxml.jackson.core:jackson-annotations",
59-
"moduleVersion": "2.12.4",
59+
"moduleVersion": "2.13.5",
6060
"moduleLicenses": [
6161
{
6262
"moduleLicense": "Apache License 2.0"
@@ -65,7 +65,7 @@
6565
},
6666
{
6767
"moduleName": "com.fasterxml.jackson.core:jackson-core",
68-
"moduleVersion": "2.12.4",
68+
"moduleVersion": "2.13.5",
6969
"moduleLicenses": [
7070
{
7171
"moduleLicense": "Apache License 2.0"
@@ -74,7 +74,7 @@
7474
},
7575
{
7676
"moduleName": "com.fasterxml.jackson.core:jackson-databind",
77-
"moduleVersion": "2.12.4",
77+
"moduleVersion": "2.13.5",
7878
"moduleLicenses": [
7979
{
8080
"moduleLicense": "Apache License 2.0"
@@ -83,7 +83,7 @@
8383
},
8484
{
8585
"moduleName": "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor",
86-
"moduleVersion": "2.12.4",
86+
"moduleVersion": "2.13.5",
8787
"moduleLicenses": [
8888
{
8989
"moduleLicense": "Apache License 2.0"
@@ -92,7 +92,7 @@
9292
},
9393
{
9494
"moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
95-
"moduleVersion": "2.12.4",
95+
"moduleVersion": "2.13.5",
9696
"moduleLicenses": [
9797
{
9898
"moduleLicense": "Apache License 2.0"
@@ -101,7 +101,7 @@
101101
},
102102
{
103103
"moduleName": "com.fasterxml.jackson.module:jackson-module-parameter-names",
104-
"moduleVersion": "2.12.4",
104+
"moduleVersion": "2.13.5",
105105
"moduleLicenses": [
106106
{
107107
"moduleLicense": "Apache License 2.0"
@@ -164,7 +164,7 @@
164164
},
165165
{
166166
"moduleName": "org.apache.commons:commons-text",
167-
"moduleVersion": "1.9",
167+
"moduleVersion": "1.10.0",
168168
"moduleLicenses": [
169169
{
170170
"moduleLicense": "Apache License 2.0"
@@ -254,7 +254,7 @@
254254
},
255255
{
256256
"moduleName": "org.slf4j:slf4j-api",
257-
"moduleVersion": "1.7.32",
257+
"moduleVersion": "1.7.36",
258258
"moduleLicenses": [
259259
{
260260
"moduleLicense": "MIT License"

0 commit comments

Comments
 (0)