Regenerate client and fix incorrect groupId (#6)

jetmuffin · gaocegege · commit 38b7f1698f35 · 2018-07-18T14:58:33.000+08:00
Signed-off-by: JetMuffin &lt;mofeng.cj@alibaba-inc.com&gt;
diff --git a/kubernetes/README.md b/kubernetes/README.md
@@ -1,4 +1,4 @@
-# client-java
+# client-java-api
 
 ## Requirements
 
@@ -26,9 +26,9 @@ Add this dependency to your project's POM:
 
 ```xml
 <dependency>
-    <groupId>io.kubernetes</groupId>
-    <artifactId>client-java</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <groupId>org.kubeflow.client</groupId>
+    <artifactId>client-java-api</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -38,7 +38,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "io.kubernetes:client-java:1.0-SNAPSHOT"
+compile "org.kubeflow.client:client-java-api:0.1.0-SNAPSHOT"
 ```
 
 ### Others
@@ -49,7 +49,7 @@ At first generate the JAR by executing:
 
 Then manually install the following JARs:
 
-* target/client-java-1.0-SNAPSHOT.jar
+* target/client-java-api-0.1.0-SNAPSHOT.jar
 * target/lib/*.jar
 
 ## Getting Started
diff --git a/kubernetes/build.gradle b/kubernetes/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'idea'
 apply plugin: 'eclipse'
 
-group = 'io.kubernetes'
-version = '1.0-SNAPSHOT'
+group = 'org.kubeflow.client'
+version = '0.1.0-SNAPSHOT'
 
 buildscript {
     repositories {
@@ -83,7 +83,7 @@ if(hasProperty('target') && target == 'android') {
 
     install {
         repositories.mavenInstaller {
-            pom.artifactId = 'client-java'
+            pom.artifactId = 'client-java-api'
         }
     }
 
diff --git a/kubernetes/build.sbt b/kubernetes/build.sbt
@@ -1,8 +1,8 @@
 lazy val root = (project in file(".")).
   settings(
-    organization := "io.kubernetes",
-    name := "client-java",
-    version := "1.0-SNAPSHOT",
+    organization := "org.kubeflow.client",
+    name := "client-java-api",
+    version := "0.1.0-SNAPSHOT",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),
diff --git a/kubernetes/git_push.sh b/kubernetes/git_push.sh
@@ -8,12 +8,12 @@ git_repo_id=$2
 release_note=$3
 
 if [ "$git_user_id" = "" ]; then
-    git_user_id="kubernetes-client"
+    git_user_id="kubeflow-incubator"
     echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
 fi
 
 if [ "$git_repo_id" = "" ]; then
-    git_repo_id="client-java"
+    git_repo_id="tfjob-java-client"
     echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
 fi
 
diff --git a/kubernetes/pom.xml b/kubernetes/pom.xml
@@ -179,7 +179,6 @@
       <groupId>io.kubernetes</groupId>
       <artifactId>client-java</artifactId>
       <version>1.0.0</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.swagger</groupId>
diff --git a/kubernetes/settings.gradle b/kubernetes/settings.gradle
@@ -1 +1 @@
-rootProject.name = "client-java"
+rootProject.name = "client-java-api"
diff --git a/kubernetes/src/main/java/org/kubeflow/client/ApiCallback.java b/kubernetes/src/main/java/org/kubeflow/client/ApiCallback.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/ApiClient.java b/kubernetes/src/main/java/org/kubeflow/client/ApiClient.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
@@ -85,12 +85,10 @@ public ApiClient() {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("Swagger-Codegen/1.0-SNAPSHOT/java");
+        setUserAgent("Swagger-Codegen/0.1.0-SNAPSHOT/java");
 
         // Setup authentications (key: authentication name, value: authentication).
         authentications = new HashMap<String, Authentication>();
-        authentications.put("BearerToken", new ApiKeyAuth("header", "authorization"));
-        authentications.put("BasicAuth", new HttpBasicAuth());
         // Prevent the authentications from being modified.
         authentications = Collections.unmodifiableMap(authentications);
     }
diff --git a/kubernetes/src/main/java/org/kubeflow/client/ApiException.java b/kubernetes/src/main/java/org/kubeflow/client/ApiException.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/ApiResponse.java b/kubernetes/src/main/java/org/kubeflow/client/ApiResponse.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/Configuration.java b/kubernetes/src/main/java/org/kubeflow/client/Configuration.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/GzipRequestInterceptor.java b/kubernetes/src/main/java/org/kubeflow/client/GzipRequestInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/JSON.java b/kubernetes/src/main/java/org/kubeflow/client/JSON.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
@@ -117,7 +117,6 @@ public <T> T deserialize(String body, Type returnType) {
      * Gson TypeAdapter for Joda DateTime type
      */
     public static class DateTimeTypeAdapter extends TypeAdapter<DateTime> {
-
         private DateTimeFormatter formatter;
 
         private final DateTimeFormatter parseFormatter = ISODateTimeFormat.dateOptionalTimeParser();
diff --git a/kubernetes/src/main/java/org/kubeflow/client/Pair.java b/kubernetes/src/main/java/org/kubeflow/client/Pair.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/ProgressRequestBody.java b/kubernetes/src/main/java/org/kubeflow/client/ProgressRequestBody.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/ProgressResponseBody.java b/kubernetes/src/main/java/org/kubeflow/client/ProgressResponseBody.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/StringUtil.java b/kubernetes/src/main/java/org/kubeflow/client/StringUtil.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/apis/ApisApi.java b/kubernetes/src/main/java/org/kubeflow/client/apis/ApisApi.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/apis/KubeflowOrgApi.java b/kubernetes/src/main/java/org/kubeflow/client/apis/KubeflowOrgApi.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/apis/KubeflowOrgV1alpha2Api.java b/kubernetes/src/main/java/org/kubeflow/client/apis/KubeflowOrgV1alpha2Api.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/auth/ApiKeyAuth.java b/kubernetes/src/main/java/org/kubeflow/client/auth/ApiKeyAuth.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/auth/Authentication.java b/kubernetes/src/main/java/org/kubeflow/client/auth/Authentication.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/auth/HttpBasicAuth.java b/kubernetes/src/main/java/org/kubeflow/client/auth/HttpBasicAuth.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/auth/OAuth.java b/kubernetes/src/main/java/org/kubeflow/client/auth/OAuth.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/auth/OAuthFlow.java b/kubernetes/src/main/java/org/kubeflow/client/auth/OAuthFlow.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/models/V1alpha2TFJob.java b/kubernetes/src/main/java/org/kubeflow/client/models/V1alpha2TFJob.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/models/V1alpha2TFJobCondition.java b/kubernetes/src/main/java/org/kubeflow/client/models/V1alpha2TFJobCondition.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/models/V1alpha2TFJobList.java b/kubernetes/src/main/java/org/kubeflow/client/models/V1alpha2TFJobList.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/models/V1alpha2TFJobSpec.java b/kubernetes/src/main/java/org/kubeflow/client/models/V1alpha2TFJobSpec.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/models/V1alpha2TFJobStatus.java b/kubernetes/src/main/java/org/kubeflow/client/models/V1alpha2TFJobStatus.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/models/V1alpha2TFReplicaSpec.java b/kubernetes/src/main/java/org/kubeflow/client/models/V1alpha2TFReplicaSpec.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/main/java/org/kubeflow/client/models/V1alpha2TFReplicaStatus.java b/kubernetes/src/main/java/org/kubeflow/client/models/V1alpha2TFReplicaStatus.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/test/java/org/kubeflow/client/apis/ApisApiTest.java b/kubernetes/src/test/java/org/kubeflow/client/apis/ApisApiTest.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/test/java/org/kubeflow/client/apis/KubeflowOrgApiTest.java b/kubernetes/src/test/java/org/kubeflow/client/apis/KubeflowOrgApiTest.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/kubernetes/src/test/java/org/kubeflow/client/apis/KubeflowOrgV1alpha2ApiTest.java b/kubernetes/src/test/java/org/kubeflow/client/apis/KubeflowOrgV1alpha2ApiTest.java
@@ -1,5 +1,5 @@
 /*
- * kubeflow
+ * 
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: v1alpha2
diff --git a/settings b/settings
@@ -1,5 +1,17 @@
+# Which language to generate client.
+LANGUAGE=java
+
+# Branch to get the OpenAPI spec from.
 KUBERNETES_BRANCH=master
-CLIENT_VERSION=v1alpha2
+
+# Client version for packaging and releasing.
+CLIENT_VERSION=0.2.0-SNAPSHOT
+
+# Name of the release package
 PACKAGE_NAME=org.kubeflow.client
+
+# Name of the Github repo username to get OpenAPI spec from.
 USERNAME=kubeflow-incubator
-REPOSITORY=tfjob-java-client
+
+# Name of the Github repository to get OpenAPI spec from.
+REPOSITORY=genspec

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-rootProject.name = "client-java"`
	`1`	`+rootProject.name = "client-java-api"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * kubeflow`
	`2`	`+ *`
`3`	`3`	`* No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)`
`4`	`4`	`*`
`5`	`5`	`* OpenAPI spec version: v1alpha2`