Fix version mess & adjust for changes in main SDK

SAP · Aug 11, 2023 · 2e0cbea · 2e0cbea
1 parent 75470ef
commit 2e0cbea
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 21 deletions.
diff --git a/datamodel/openapi/openapi-api-sample/pom.xml b/datamodel/openapi/openapi-api-sample/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>openapi-parent</artifactId>
-		<version>5.0.0-alpha-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>openapi-api-sample</artifactId>
 	<name>Data Model - OpenAPI Services - Sample API</name>

diff --git a/...pi-api-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/sample/api/OrdersApi.java b/...pi-api-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/sample/api/OrdersApi.java
@@ -19,7 +19,7 @@
 
 import com.google.common.annotations.Beta;
 import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestinationProperties;
-import com.sap.cloud.sdk.datamodel.openapi.sample.model.Order; //NOPMD
+import com.sap.cloud.sdk.datamodel.openapi.sample.model.Order; // NOPMD
 import com.sap.cloud.sdk.services.openapi.apiclient.ApiClient;
 import com.sap.cloud.sdk.services.openapi.core.AbstractOpenApiService;
 import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;

diff --git a/...api-api-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/sample/api/SodasApi.java b/...api-api-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/sample/api/SodasApi.java
@@ -21,8 +21,8 @@
 
 import com.google.common.annotations.Beta;
 import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestinationProperties;
-import com.sap.cloud.sdk.datamodel.openapi.sample.model.Soda; //NOPMD
-import com.sap.cloud.sdk.datamodel.openapi.sample.model.SodaWithId; //NOPMD
+import com.sap.cloud.sdk.datamodel.openapi.sample.model.Soda; // NOPMD
+import com.sap.cloud.sdk.datamodel.openapi.sample.model.SodaWithId; // NOPMD
 import com.sap.cloud.sdk.services.openapi.apiclient.ApiClient;
 import com.sap.cloud.sdk.services.openapi.core.AbstractOpenApiService;
 import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;

diff --git a/datamodel/openapi/openapi-core/pom.xml b/datamodel/openapi/openapi-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>openapi-parent</artifactId>
-		<version>5.0.0-alpha-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>openapi-core</artifactId>
 	<name>Data Model - OpenAPI Services - Core</name>
@@ -43,10 +43,12 @@
 		<dependency>
 			<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 			<artifactId>cloudplatform-connectivity</artifactId>
+			<version>5.0.0-alpha-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sap.cloud.sdk.frameworks</groupId>
 			<artifactId>apache-httpclient5</artifactId>
+			<version>5.0.0-alpha-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>

diff --git a/datamodel/openapi/openapi-generator-cli/pom.xml b/datamodel/openapi/openapi-generator-cli/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>openapi-parent</artifactId>
-		<version>5.0.0-alpha-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>openapi-generator-cli</artifactId>
 	<packaging>jar</packaging>

diff --git a/datamodel/openapi/openapi-generator-maven-plugin/pom.xml b/datamodel/openapi/openapi-generator-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>openapi-parent</artifactId>
-		<version>5.0.0-alpha-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>openapi-generator-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>

diff --git a/...n-plugin/src/test/resources/DataModelGeneratorMojoIntegrationTest/sodastore/input/pom.xml b/...n-plugin/src/test/resources/DataModelGeneratorMojoIntegrationTest/sodastore/input/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.0.0-alpha-SNAPSHOT</version>
+	<version>0.0.1-SNAPSHOT</version>
 
 	<build>
 		<plugins>

diff --git a/...plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testAdditionalProperties/pom.xml b/...plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testAdditionalProperties/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.0.0-alpha-SNAPSHOT</version>
+	<version>0.0.1-SNAPSHOT</version>
 
 	<build>
 		<plugins>

diff --git a/...ugin/src/test/resources/DataModelGeneratorMojoUnitTest/testEmptyRequiredParameter/pom.xml b/...ugin/src/test/resources/DataModelGeneratorMojoUnitTest/testEmptyRequiredParameter/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.0.0-alpha-SNAPSHOT</version>
+	<version>0.0.1-SNAPSHOT</version>
 
 	<build>
 		<plugins>

diff --git a/...src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithAllParameters/pom.xml b/...src/test/resources/DataModelGeneratorMojoUnitTest/testInvocationWithAllParameters/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.0.0-alpha-SNAPSHOT</version>
+	<version>0.0.1-SNAPSHOT</version>
 
 	<build>
 		<plugins>

diff --git a/...st/resources/DataModelGeneratorMojoUnitTest/testInvocationWithMandatoryParameters/pom.xml b/...st/resources/DataModelGeneratorMojoUnitTest/testInvocationWithMandatoryParameters/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.0.0-alpha-SNAPSHOT</version>
+	<version>0.0.1-SNAPSHOT</version>
 
 	<build>
 		<plugins>

diff --git a/.../resources/DataModelGeneratorMojoUnitTest/testInvocationWithUnexpectedApiMaturity/pom.xml b/.../resources/DataModelGeneratorMojoUnitTest/testInvocationWithUnexpectedApiMaturity/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.0.0-alpha-SNAPSHOT</version>
+	<version>0.0.1-SNAPSHOT</version>
 
 	<build>
 		<plugins>

diff --git a/...-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testSkipExecution/pom.xml b/...-maven-plugin/src/test/resources/DataModelGeneratorMojoUnitTest/testSkipExecution/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.company</groupId>
 	<artifactId>application</artifactId>
-	<version>5.0.0-alpha-SNAPSHOT</version>
+	<version>0.0.1-SNAPSHOT</version>
 
 	<build>
 		<plugins>

diff --git a/datamodel/openapi/openapi-generator/pom.xml b/datamodel/openapi/openapi-generator/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>openapi-parent</artifactId>
-		<version>5.0.0-alpha-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>openapi-generator</artifactId>
 	<packaging>jar</packaging>

diff --git a/datamodel/openapi/pom.xml b/datamodel/openapi/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.datamodel</groupId>
 		<artifactId>datamodel-parent</artifactId>
-		<version>5.0.0-alpha-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>openapi-parent</artifactId>
 	<packaging>pom</packaging>

diff --git a/pom.xml b/pom.xml
@@ -151,14 +151,15 @@
 		<byte-buddy.version>1.14.4</byte-buddy.version>
 		<hamcrest-core.version>2.2</hamcrest-core.version>
 		<snakeyaml.version>1.33</snakeyaml.version>
+		<jsr305.optional>true</jsr305.optional>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
 			<!--Dependencies with import scope-->
 			<dependency>
 				<groupId>com.sap.cloud.sdk</groupId>
 				<artifactId>sdk-bom</artifactId>
-				<version>4.12.0</version>
+				<version>5.0.0-alpha-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -832,6 +833,11 @@
 			<artifactId>junit-vintage-engine</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>jsr305</artifactId>
+			<optional>${jsr305.optional}</optional>
+		</dependency>
 	</dependencies>
 	<build>
 		<resources>

diff --git a/testutil/testutil-core/pom.xml b/testutil/testutil-core/pom.xml
@@ -102,10 +102,6 @@
 			<groupId>com.sap.cloud.sdk.s4hana</groupId>
 			<artifactId>s4hana-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.sap.cloud.sdk.s4hana</groupId>
-			<artifactId>s4hana-connectivity</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>