From 0c7b8333448314670f75b08bd3ce1ea0bb619340 Mon Sep 17 00:00:00 2001
From: Dasarathi Rout <dasarathi.rout@live.com>
Date: Fri, 18 Aug 2023 21:34:29 +0530
Subject: [PATCH] Issues-246 - Added attributes for generated pom.xml (#249)

---
 openapi/java.xml                              | 38 +++++++++++--------
 openapi/openapi-generator/client-generator.sh |  1 +
 .../generate_client_in_container.sh           |  6 ++-
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/openapi/java.xml b/openapi/java.xml
index a698bc4..c9095b8 100644
--- a/openapi/java.xml
+++ b/openapi/java.xml
@@ -3,9 +3,9 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.kubernetes</groupId>
-  <artifactId>client-java</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>client-java</name>
+  <artifactId>client-java-api</artifactId>
+  <version>${generator.client.version}</version>
+  <name>client-java-api</name>
   <url>http://kubernetes.io</url>
   <profiles>
     <profile>
@@ -70,23 +70,31 @@
               <httpUserAgent>Kubernetes Java Client/${generator.client.version}</httpUserAgent>
               <generatorName>java</generatorName>
               <gitUserId>kubernetes-client</gitUserId>
-              <gitRepoId>client-java</gitRepoId>
+              <gitRepoId>client-java-api</gitRepoId>
               <skipValidateSpec>true</skipValidateSpec>
               <generateApiTests>false</generateApiTests>
               <generateModelTests>false</generateModelTests>
               <configOptions>
+              <artifactDescription>Kubernetes Java Client API</artifactDescription>
+                <scmUrl>https://github.com/kubernetes-client/java</scmUrl>
+                <scmConnection>scm:git:git@github.com:kubernetes-client/java.git</scmConnection>
+                <scmDeveloperConnection>scm:git:git@github.com:kubernetes-client/java.git</scmDeveloperConnection>
+                <parentGroupId>io.kubernetes</parentGroupId>
+                <parentArtifactId>client-java-parent</parentArtifactId>
+                <parentVersion>${generator.client.version}</parentVersion>
                 <projectName>kubernetes-java-client</projectName>
-                <projectDescription>Java client for Kubernetes.</projectDescription>
+                <projectDescription>Java client API for Kubernetes.</projectDescription>
                 <projectVersion>${generator.client.version}</projectVersion>
-                <projectLicenseName>Apache V2</projectLicenseName>
+                <licenseName>Apache License 2.0</licenseName>
+                <licenseUrl>https://github.com/kubernetes-client/java/blob/master/LICENSE</licenseUrl>
                 <sortParamsByRequiredFlag>true</sortParamsByRequiredFlag>
                 <modelPackage>${generator.package.name}.models</modelPackage>
                 <apiPackage>${generator.package.name}.apis</apiPackage>
                 <invokerPackage>${generator.package.name}</invokerPackage>
                 <ensureUniqueParams>true</ensureUniqueParams>
                 <groupId>io.kubernetes</groupId>
-                <artifactId>client-java</artifactId>
-                <artifactVersion>1.0-SNAPSHOT</artifactVersion>
+                <artifactId>client-java-api</artifactId>
+                <artifactVersion>${generator.client.version}</artifactVersion>
                 <sourceFolder>src/main/java</sourceFolder>
                 <serializableModel>false</serializableModel>
                 <bigDecimalAsString>false</bigDecimalAsString>
@@ -109,24 +117,22 @@
   </build>
   <dependencies>
     <!-- dependencies are needed for the client being generated -->
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
-    </dependency>
     <dependency>
       <groupId>org.openapitools</groupId>
       <artifactId>openapi-generator-maven-plugin</artifactId>
       <version>${openapi-generator-version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openapitools</groupId>
+      <artifactId>client-java-api-openapi-generator</artifactId>
+      <version>${openapi-generator-version}</version>
+    </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.0</swagger-annotations-version>
-    <maven-plugin-version>1.0.0</maven-plugin-version>
     <!-- Default values for the generator parameters. -->
     <generator.output.path>.</generator.output.path>
     <generator.spec.path>swagger.json</generator.spec.path>
     <generator.package.name>client</generator.package.name>
-    <generator.client.version>1.0-snapshot</generator.client.version>
+    <generator.client.version>${generator.client.version}</generator.client.version>
   </properties>
 </project>
diff --git a/openapi/openapi-generator/client-generator.sh b/openapi/openapi-generator/client-generator.sh
index 57db4e7..9a9bec5 100755
--- a/openapi/openapi-generator/client-generator.sh
+++ b/openapi/openapi-generator/client-generator.sh
@@ -51,6 +51,7 @@ kubeclient::generator::generate_client() {
     HIDE_GENERATION_TIMESTAMP="${HIDE_GENERATION_TIMESTAMP:-false}"
     USERNAME="${USERNAME:-kubernetes}"
     REPOSITORY="${REPOSITORY:-kubernetes}"
+    CLIENT_VERSION="${CLIENT_VERSION}"
     # LIBRARY is used by Java client generation.
     LIBRARY="${LIBRARY:-okhttp-gson}"
 
diff --git a/openapi/openapi-generator/generate_client_in_container.sh b/openapi/openapi-generator/generate_client_in_container.sh
index f972c67..10eec10 100755
--- a/openapi/openapi-generator/generate_client_in_container.sh
+++ b/openapi/openapi-generator/generate_client_in_container.sh
@@ -74,6 +74,7 @@ shopt -u nullglob
 # To make sure we can reproduce generation, we would also log code-gen exact commit
 pushd /source/openapi-generator
   OPENAPI_GENERATOR_COMMIT_ACTUAL=$(git rev-parse HEAD)
+  OPENAPI_GENERATOR_COMMIT_TAG="$(git describe --tags --exact-match HEAD)"
 popd
 
 mkdir -p "${output_dir}"
@@ -97,7 +98,8 @@ mvn -f "${SCRIPT_ROOT}/generation_params.xml" clean generate-sources \
     -Duser.home=/root
 
 mkdir -p "${output_dir}/.openapi-generator"
-echo "Requested Commit: ${OPENAPI_GENERATOR_COMMIT}" > "${output_dir}/.openapi-generator/COMMIT"
-echo "Actual Commit: ${OPENAPI_GENERATOR_COMMIT_ACTUAL}" >> "${output_dir}/.openapi-generator/COMMIT"
+echo "Requested Commit/Tag : ${OPENAPI_GENERATOR_COMMIT}" > "${output_dir}/.openapi-generator/COMMIT"
+echo "Actual Commit        : ${OPENAPI_GENERATOR_COMMIT_ACTUAL}" >> "${output_dir}/.openapi-generator/COMMIT"
+echo "Actual Tag           : ${OPENAPI_GENERATOR_COMMIT_TAG}" >> "${output_dir}/.openapi-generator/COMMIT"
 
 echo "---Done."