Merge branch 'main' into gen-sdk-updates

Author: jenschude

README.md

@@ -86,6 +86,10 @@ dependencies {
 To migrate from the 1.x to the 2.x, there is a guideline below:
 * [Migration guidelines from v1 to v2](https://commercetools.github.io/commercetools-sdk-java-v2/javadoc/com/commercetools/docs/meta/Migration.html)
 
+# Support
+
+Please see our [support policy](SUPPORT.md)
+
 ## Documentation
 
 * [Documentation](https://commercetools.github.io/commercetools-sdk-java-v2/javadoc)

SUPPORT.md

@@ -0,0 +1,36 @@
+# General Support
+
+We will try to align our support strategy with the supported platforms original support policy, in practice this means
+that if the Java Development Kit provides support only to version X and newer, we will align our support practices with it.
+
+Unless decided otherwise by our case-by-case analysis, we will adhere to the following principles:
+
+* We provide support for the current and two previous major versions of our SDKs.
+* We will provide bug fixes and security patches for older versions of our SDKs on a case-by-case basis.
+* We will provide support for versions of our SDKs with the first major version being released a year ago or not older
+  than two major versions.
+
+## Extraordinary Circumstances
+
+In extraordinary circumstances, we may provide support for older versions of our SDKs.
+Examples of extraordinary circumstances include:
+
+* A critical security vulnerability that affects an older version of our SDK.
+* A major change in the underlying platform that requires us to update an older version of our SDK.
+
+We will evaluate requests for support in extraordinary circumstances on a case-by-case basis.
+
+## Enforcement
+
+We will enforce this policy unless a situation is extraordinary.
+
+If we determine that a situation is extraordinary, we will provide support for the older version of our SDK for a limited time.
+
+We will communicate the end of support for the older version of our SDK to users in advance.
+
+## Contacting Support
+
+To get help, please reach out through our official support channels:
+
+- [Support portal](https://support.commercetools.com)
+- [support@commercetools.com](mailto:support@commercetools.com)

commercetools/commercetools-sdk-java-api/src/integrationTest/java/commercetools/cart/CartQueryTests.java

@@ -15,7 +15,7 @@
 import commercetools.discount_code.DiscountCodeFixtures;
 import commercetools.utils.CommercetoolsTestUtils;
 
-import io.vrap.rmf.base.client.error.ForbiddenException;
+import io.vrap.rmf.base.client.error.NotFoundException;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -156,7 +156,7 @@ public void expandDiscountCodeReference() {
     @Test
     public void pathTraversal() {
         CartsFixtures.withCart(cart -> {
-            ForbiddenException e = org.junit.jupiter.api.Assertions.assertThrows(ForbiddenException.class, () -> {
+            NotFoundException e = org.junit.jupiter.api.Assertions.assertThrows(NotFoundException.class, () -> {
                 CommercetoolsTestUtils.getProjectApiRoot().carts().withId("../categories").get().executeBlocking();
             });
             Assertions.assertThat(e.getMessage()).contains("..%2Fcategories");