eclipse-tractusx
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
@@ -233,9 +233,18 @@ jobs:
           git checkout main && git merge -X theirs releases --no-commit --no-ff
 
           # Extract release version
-          IFS=. read -r RELEASE_VERSION_MAJOR RELEASE_VERSION_MINOR RELEASE_VERSION_PATCH<<<"${{ env.RELEASE_VERSION }}"
-          # Compute new snapshot version
-          VERSION="$RELEASE_VERSION_MAJOR.$RELEASE_VERSION_MINOR.$((RELEASE_VERSION_PATCH+1))-SNAPSHOT"
+          IFS=.- read -r RELEASE_VERSION_MAJOR RELEASE_VERSION_MINOR RELEASE_VERSION_PATCH SNAPSHOT<<<"${{ env.RELEASE_VERSION }}"
+          INC=0
+          # Compute new snapshot version, do not increment snapshot on non-final releases, e.g. -rc1
+          if [ -z $SNAPSHOT ]; then
+            # snapshot
+            echo "${{ env.RELEASE_VERSION }} is a final release version, increase patch for next snapshot"
+            INC=1
+          else
+            echo "${{ env.RELEASE_VERSION }} is not a final release version (contains \"$SNAPSHOT\"), will not increase patch"
+          fi
+          
+          VERSION="$RELEASE_VERSION_MAJOR.$RELEASE_VERSION_MINOR.$((RELEASE_VERSION_PATCH+$INC))-SNAPSHOT"
           SNAPSHOT_VERSION=$VERSION
 
           # Persist the "version" in the gradle.properties

diff --git a/edc-dataplane/edc-dataplane-base/build.gradle.kts b/edc-dataplane/edc-dataplane-base/build.gradle.kts
@@ -25,9 +25,9 @@ plugins {
 dependencies {
     runtimeOnly(project(":core:edr-cache-core"))
     runtimeOnly(project(":edc-extensions:observability-api-customization"))
-    runtimeOnly(project(":edc-dataplane:edc-dataplane-proxy-consumer-api"))
-    runtimeOnly(project(":edc-dataplane:edc-dataplane-proxy-provider-api"))
-    runtimeOnly(project(":edc-dataplane:edc-dataplane-proxy-provider-core"))
+    runtimeOnly(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-consumer-api"))
+    runtimeOnly(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-api"))
+    runtimeOnly(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-core"))
 
     runtimeOnly(libs.edc.config.filesystem)
     runtimeOnly(libs.edc.dpf.awss3)

diff --git a/...plane-proxy-consumer-api/build.gradle.kts → ...plane-proxy-consumer-api/build.gradle.kts b/...plane-proxy-consumer-api/build.gradle.kts → ...plane-proxy-consumer-api/build.gradle.kts
diff --git a/...i/DataPlaneProxyConsumerApiExtension.java → ...i/DataPlaneProxyConsumerApiExtension.java b/...i/DataPlaneProxyConsumerApiExtension.java → ...i/DataPlaneProxyConsumerApiExtension.java
diff --git a/...api/asset/ClientErrorExceptionMapper.java → ...api/asset/ClientErrorExceptionMapper.java b/...api/asset/ClientErrorExceptionMapper.java → ...api/asset/ClientErrorExceptionMapper.java
diff --git a/...er/api/asset/ConsumerAssetRequestApi.java → ...er/api/asset/ConsumerAssetRequestApi.java b/...er/api/asset/ConsumerAssetRequestApi.java → ...er/api/asset/ConsumerAssetRequestApi.java
diff --git a/...asset/ConsumerAssetRequestController.java → ...asset/ConsumerAssetRequestController.java b/...asset/ConsumerAssetRequestController.java → ...asset/ConsumerAssetRequestController.java
diff --git a/...pi/asset/PreconditionFailedException.java → ...pi/asset/PreconditionFailedException.java b/...pi/asset/PreconditionFailedException.java → ...pi/asset/PreconditionFailedException.java
diff --git a/...onsumer/api/asset/model/AssetRequest.java → ...onsumer/api/asset/model/AssetRequest.java b/...onsumer/api/asset/model/AssetRequest.java → ...onsumer/api/asset/model/AssetRequest.java
diff --git a/...g.eclipse.edc.spi.system.ServiceExtension → ...g.eclipse.edc.spi.system.ServiceExtension b/...g.eclipse.edc.spi.system.ServiceExtension → ...g.eclipse.edc.spi.system.ServiceExtension
diff --git a/...mer/api/asset/model/AssetRequestTest.java → ...mer/api/asset/model/AssetRequestTest.java b/...mer/api/asset/model/AssetRequestTest.java → ...mer/api/asset/model/AssetRequestTest.java
diff --git a/...plane-proxy-provider-api/build.gradle.kts → ...plane-proxy-provider-api/build.gradle.kts b/...plane-proxy-provider-api/build.gradle.kts → ...plane-proxy-provider-api/build.gradle.kts
@@ -30,6 +30,6 @@ dependencies {
     implementation(libs.jakarta.rsApi)
     implementation(libs.nimbus.jwt)
 
-    implementation(project(":edc-dataplane:edc-dataplane-proxy-provider-spi"))
+    implementation(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-spi"))
 }
 
diff --git a/...i/DataPlaneProxyProviderApiExtension.java → ...i/DataPlaneProxyProviderApiExtension.java b/...i/DataPlaneProxyProviderApiExtension.java → ...i/DataPlaneProxyProviderApiExtension.java
diff --git a/...vider/api/gateway/ProviderGatewayApi.java → ...vider/api/gateway/ProviderGatewayApi.java b/...vider/api/gateway/ProviderGatewayApi.java → ...vider/api/gateway/ProviderGatewayApi.java
diff --git a/...pi/gateway/ProviderGatewayController.java → ...pi/gateway/ProviderGatewayController.java b/...pi/gateway/ProviderGatewayController.java → ...pi/gateway/ProviderGatewayController.java
diff --git a/...provider/api/response/ResponseHelper.java → ...provider/api/response/ResponseHelper.java b/...provider/api/response/ResponseHelper.java → ...provider/api/response/ResponseHelper.java
diff --git a/...g.eclipse.edc.spi.system.ServiceExtension → ...g.eclipse.edc.spi.system.ServiceExtension b/...g.eclipse.edc.spi.system.ServiceExtension → ...g.eclipse.edc.spi.system.ServiceExtension
diff --git a/...ider/api/response/ResponseHelperTest.java → ...ider/api/response/ResponseHelperTest.java b/...ider/api/response/ResponseHelperTest.java → ...ider/api/response/ResponseHelperTest.java
diff --git a/...lane-proxy-provider-core/build.gradle.kts → ...lane-proxy-provider-core/build.gradle.kts b/...lane-proxy-provider-core/build.gradle.kts → ...lane-proxy-provider-core/build.gradle.kts
@@ -30,6 +30,6 @@ dependencies {
     implementation(libs.jakarta.rsApi)
     implementation(libs.nimbus.jwt)
 
-    implementation(project(":edc-dataplane:edc-dataplane-proxy-provider-spi"))
+    implementation(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-spi"))
 }
 
diff --git a/...ider/core/ProxyProviderCoreExtension.java → ...ider/core/ProxyProviderCoreExtension.java b/...ider/core/ProxyProviderCoreExtension.java → ...ider/core/ProxyProviderCoreExtension.java
diff --git a/...uth/AuthorizationHandlerRegistryImpl.java → ...uth/AuthorizationHandlerRegistryImpl.java b/...uth/AuthorizationHandlerRegistryImpl.java → ...uth/AuthorizationHandlerRegistryImpl.java
diff --git a/...gateway/auth/JwtAuthorizationHandler.java → ...gateway/auth/JwtAuthorizationHandler.java b/...gateway/auth/JwtAuthorizationHandler.java → ...gateway/auth/JwtAuthorizationHandler.java
diff --git a/...core/gateway/auth/RsaPublicKeyParser.java → ...core/gateway/auth/RsaPublicKeyParser.java b/...core/gateway/auth/RsaPublicKeyParser.java → ...core/gateway/auth/RsaPublicKeyParser.java
diff --git a/...iguration/GatewayConfigurationLoader.java → ...iguration/GatewayConfigurationLoader.java b/...iguration/GatewayConfigurationLoader.java → ...iguration/GatewayConfigurationLoader.java
diff --git a/...ion/GatewayConfigurationRegistryImpl.java → ...ion/GatewayConfigurationRegistryImpl.java b/...ion/GatewayConfigurationRegistryImpl.java → ...ion/GatewayConfigurationRegistryImpl.java
diff --git a/...g.eclipse.edc.spi.system.ServiceExtension → ...g.eclipse.edc.spi.system.ServiceExtension b/...g.eclipse.edc.spi.system.ServiceExtension → ...g.eclipse.edc.spi.system.ServiceExtension
diff --git a/...AuthorizationHandlerRegistryImplTest.java → ...AuthorizationHandlerRegistryImplTest.java b/...AuthorizationHandlerRegistryImplTest.java → ...AuthorizationHandlerRegistryImplTest.java
diff --git a/...way/auth/JwtAuthorizationHandlerTest.java → ...way/auth/JwtAuthorizationHandlerTest.java b/...way/auth/JwtAuthorizationHandlerTest.java → ...way/auth/JwtAuthorizationHandlerTest.java
diff --git a/.../gateway/auth/RsaPublicKeyParserTest.java → .../gateway/auth/RsaPublicKeyParserTest.java b/.../gateway/auth/RsaPublicKeyParserTest.java → .../gateway/auth/RsaPublicKeyParserTest.java
diff --git a/...rovider/core/gateway/auth/TestTokens.java → ...rovider/core/gateway/auth/TestTokens.java b/...rovider/core/gateway/auth/TestTokens.java → ...rovider/core/gateway/auth/TestTokens.java
diff --git a/...ation/GatewayConfigurationLoaderTest.java → ...ation/GatewayConfigurationLoaderTest.java b/...ation/GatewayConfigurationLoaderTest.java → ...ation/GatewayConfigurationLoaderTest.java
diff --git a/...GatewayConfigurationRegistryImplTest.java → ...GatewayConfigurationRegistryImplTest.java b/...GatewayConfigurationRegistryImplTest.java → ...GatewayConfigurationRegistryImplTest.java
diff --git a/...plane-proxy-provider-spi/build.gradle.kts → ...plane-proxy-provider-spi/build.gradle.kts b/...plane-proxy-provider-spi/build.gradle.kts → ...plane-proxy-provider-spi/build.gradle.kts
diff --git a/...authorization/AuthorizationExtension.java → ...authorization/AuthorizationExtension.java b/...authorization/AuthorizationExtension.java → ...authorization/AuthorizationExtension.java
diff --git a/...y/authorization/AuthorizationHandler.java → ...y/authorization/AuthorizationHandler.java b/...y/authorization/AuthorizationHandler.java → ...y/authorization/AuthorizationHandler.java
diff --git a/...ization/AuthorizationHandlerRegistry.java → ...ization/AuthorizationHandlerRegistry.java b/...ization/AuthorizationHandlerRegistry.java → ...ization/AuthorizationHandlerRegistry.java
diff --git a/...y/configuration/GatewayConfiguration.java → ...y/configuration/GatewayConfiguration.java b/...y/configuration/GatewayConfiguration.java → ...y/configuration/GatewayConfiguration.java
diff --git a/...uration/GatewayConfigurationRegistry.java → ...uration/GatewayConfigurationRegistry.java b/...uration/GatewayConfigurationRegistry.java → ...uration/GatewayConfigurationRegistry.java
diff --git a/edc-extensions/postgresql-migration/build.gradle.kts b/edc-extensions/postgresql-migration/build.gradle.kts
@@ -30,5 +30,5 @@ dependencies {
     implementation(libs.edc.sql.core)
     runtimeOnly(libs.postgres)
 
-    implementation("org.flywaydb:flyway-core:9.19.4")
+    implementation("org.flywaydb:flyway-core:9.20.0")
 }
diff --git a/edc-tests/edc-dataplane-proxy-e2e/build.gradle.kts b/edc-tests/edc-dataplane-proxy-e2e/build.gradle.kts
@@ -27,9 +27,9 @@ dependencies {
     testImplementation(libs.edc.dpf.http)
     testImplementation(project(":spi:edr-cache-spi"))
     testImplementation(project(":core:edr-cache-core"))
-    testImplementation(project(":edc-dataplane:edc-dataplane-proxy-consumer-api"))
-    testImplementation(project(":edc-dataplane:edc-dataplane-proxy-provider-api"))
-    testImplementation(project(":edc-dataplane:edc-dataplane-proxy-provider-core"))
+    testImplementation(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-consumer-api"))
+    testImplementation(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-api"))
+    testImplementation(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-core"))
 
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.1"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.3"
-aws = "2.20.87"
+aws = "2.20.89"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -73,10 +73,10 @@ include(":edc-dataplane")
 include(":edc-dataplane:edc-dataplane-azure-vault")
 include(":edc-dataplane:edc-dataplane-base")
 include(":edc-dataplane:edc-dataplane-hashicorp-vault")
-include(":edc-dataplane:edc-dataplane-proxy-consumer-api")
-include(":edc-dataplane:edc-dataplane-proxy-provider-spi")
-include(":edc-dataplane:edc-dataplane-proxy-provider-core")
-include(":edc-dataplane:edc-dataplane-proxy-provider-api")
+include(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-consumer-api")
+include(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-spi")
+include(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-core")
+include(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-api")
 include(":edc-tests:edc-dataplane-proxy-e2e")