Skip to content

Commit 25973a5

Browse files
committed
Fix build failure
1 parent 9ed387c commit 25973a5

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,14 @@ apply from: "$rootDir/gradle-scripts/mkdocs.gradle"
4343
apply from: "$rootDir/gradle-scripts/spotless.gradle"
4444

4545
dependencies {
46-
implementation "com.commercetools.sdk:commercetools-http-client:${commercetoolsJavaSDK2Version}"
47-
implementation "com.commercetools.sdk:commercetools-sdk-java-api:${commercetoolsJavaSDK2Version}"
48-
46+
implementation "com.commercetools.sdk:commercetools-http-client:${commercetoolsJavaSdkV2Version}"
47+
implementation "com.commercetools.sdk:commercetools-sdk-java-api:${commercetoolsJavaSdkV2Version}"
4948
implementation "com.github.ben-manes.caffeine:caffeine:${caffeineVersion}"
5049
implementation "org.apache.commons:commons-text:${commonTextVersion}"
51-
api "com.commercetools.sdk:commercetools-sdk-compat-v1:${commercetoolsJavaSdkV2Version}"
52-
api "com.commercetools.sdk:commercetools-apachehttp-client:${commercetoolsJavaSdkV2Version}"
50+
api 'commons-io:commons-io:2.11.0'
51+
api 'commons-codec:commons-codec:1.16.0'
52+
api 'com.google.code.findbugs:annotations:3.0.1'
53+
api 'com.neovisionaries:nv-i18n:1.28'
5354
testImplementation "org.mockito:mockito-junit-jupiter:${mockitoJunitJupiterVersion}"
5455
testImplementation "org.junit.jupiter:junit-jupiter-api:${jupiterApiVersion}"
5556
testImplementation "org.junit.jupiter:junit-jupiter-params:${jupiterApiVersion}"

src/main/java/com/commercetools/sync/categories/helpers/AssetCustomActionBuilder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
import com.commercetools.api.models.category.CategoryUpdateAction;
66
import com.commercetools.sync.commons.helpers.GenericCustomActionBuilder;
77
import java.util.Map;
8+
import javax.annotation.Nonnull;
89
import javax.annotation.Nullable;
9-
import org.jetbrains.annotations.NotNull;
1010

1111
public class AssetCustomActionBuilder implements GenericCustomActionBuilder<CategoryUpdateAction> {
1212

13-
@NotNull
13+
@Nonnull
1414
@Override
1515
public CategoryUpdateAction buildRemoveCustomTypeAction(
1616
@Nullable final Long variantId, @Nullable final String assetKey) {
1717
return CategorySetAssetCustomTypeActionBuilder.of().build();
1818
}
1919

20-
@NotNull
20+
@Nonnull
2121
@Override
2222
public CategoryUpdateAction buildSetCustomTypeAction(
2323
@Nullable final Long variantId,
2424
@Nullable final String assetKey,
25-
@NotNull final String customTypeId,
25+
@Nonnull final String customTypeId,
2626
@Nullable final Map<String, Object> customFieldsJsonMap) {
2727
return CategorySetAssetCustomTypeActionBuilder.of()
2828
.assetKey(assetKey)
@@ -31,7 +31,7 @@ public CategoryUpdateAction buildSetCustomTypeAction(
3131
.build();
3232
}
3333

34-
@NotNull
34+
@Nonnull
3535
@Override
3636
public CategoryUpdateAction buildSetCustomFieldAction(
3737
@Nullable final Long variantId,

src/main/java/com/commercetools/sync/customobjects/CustomObjectSyncOptions.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
import java.util.List;
1313
import java.util.Optional;
1414
import java.util.function.Function;
15-
import org.jetbrains.annotations.NotNull;
16-
import org.jetbrains.annotations.Nullable;
15+
import javax.annotation.Nonnull;
16+
import javax.annotation.Nullable;
1717

1818
public final class CustomObjectSyncOptions
1919
extends BaseSyncOptions<CustomObject, CustomObjectDraft, NoopResourceUpdateAction> {
2020

2121
CustomObjectSyncOptions(
22-
@NotNull final ProjectApiRoot ctpClient,
22+
@Nonnull final ProjectApiRoot ctpClient,
2323
@Nullable
2424
final QuadConsumer<
2525
SyncException,

src/main/java/com/commercetools/sync/states/helpers/StateReferenceResolver.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Set;
2121
import java.util.concurrent.CompletionStage;
2222
import javax.annotation.Nonnull;
23-
import org.jetbrains.annotations.NotNull;
2423

2524
public final class StateReferenceResolver
2625
extends BaseReferenceResolver<StateDraft, StateSyncOptions> {
@@ -129,7 +128,7 @@ private CompletionStage<StateDraftBuilder> fetchAndResolveStateTransitions(
129128
});
130129
}
131130

132-
@NotNull
131+
@Nonnull
133132
private static List<StateResourceIdentifier> toStateResourceIdentifiers(
134133
final Set<StateReference> references) {
135134
return references.stream()

0 commit comments

Comments
 (0)