diff --git a/README.md b/README.md index 5296a7407f..98eb0f4643 100644 --- a/README.md +++ b/README.md @@ -25,12 +25,18 @@ Add this dependency to your project's POM: ```xml io.kubernetes - client-java - 1.0-SNAPSHOT + client-java-util + 0.1 compile ``` +### Gradle users + +```groovy +compile 'io.kubernetes:client-java-util:0.1' +``` + ### Others At first generate the JAR by executing: @@ -43,7 +49,7 @@ mvn package Then manually install the following JARs: -* target/client-java-1.0-SNAPSHOT.jar +* target/client-java-0.2-SNAPSHOT.jar * target/lib/*.jar ## Example diff --git a/examples/pom.xml b/examples/pom.xml index eae548a1f6..03bdf908de 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -1,23 +1,28 @@ - + 4.0.0 io.kubernetes client-java-examples - 1.0-SNAPSHOT + 0.2-SNAPSHOT jar client-java-examples https://github.com/kubernetes-client/java + + + io.kubernetes + client-java + 0.2-SNAPSHOT + + io.kubernetes client-java-api - 1.0-SNAPSHOT + 0.2-SNAPSHOT io.kubernetes client-java-util - 1.0-SNAPSHOT + 0.2-SNAPSHOT com.google.guava diff --git a/kubernetes/pom.xml b/kubernetes/pom.xml index 282b818eea..4b731c4bac 100644 --- a/kubernetes/pom.xml +++ b/kubernetes/pom.xml @@ -1,38 +1,21 @@ - + 4.0.0 io.kubernetes client-java-api jar client-java-api - 1.0-SNAPSHOT - https://github.com/swagger-api/swagger-codegen + 0.2-SNAPSHOT + https://github.com/kubernetes-client/java Swagger Java - - scm:git:git@github.com:kubernetes-client/java.git - scm:git:git@github.com:kubernetes-client/java.git - https://github.com/kubernetes-client/java - 2.2.0 - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - The Kubernetes Authors - kubernetes-dev@googlegroups.com - Kubernetes - https://kubernetes.io - - + + io.kubernetes + client-java + 0.2-SNAPSHOT + diff --git a/pom.xml b/pom.xml index 5527a8e0ca..6e15168886 100644 --- a/pom.xml +++ b/pom.xml @@ -1,23 +1,24 @@ - + 4.0.0 client-java io.kubernetes - 0.1-SNAPSHOT + 0.2-SNAPSHOT pom Kubernetes Client API + https://github.com/kubernetes-client/java + Kubernetes Client Library - kubernetes - examples util + examples + kubernetes scm:git:git@github.com:kubernetes-client/java.git scm:git:git@github.com:kubernetes-client/java.git https://github.com/kubernetes-client/java + HEAD @@ -45,10 +46,12 @@ ossrh https://oss.sonatype.org/content/repositories/snapshots + default ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://oss.sonatype.org/service/local/staging/deploy/maven2 + default @@ -60,7 +63,7 @@ 2.5.3 true - release + release-sign-artifacts deploy @@ -69,12 +72,6 @@ release-sign-artifacts - - - release - true - - diff --git a/util/pom.xml b/util/pom.xml index ada0bc304b..837eaf324b 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -1,18 +1,21 @@ - + 4.0.0 io.kubernetes client-java-util - 1.0-SNAPSHOT + 0.2-SNAPSHOT jar client-java-util https://github.com/kubernetes-client/java + + io.kubernetes + client-java + 0.2-SNAPSHOT + io.kubernetes client-java-api - 1.0-SNAPSHOT + 0.2-SNAPSHOT org.yaml diff --git a/util/src/main/java/io/kubernetes/client/Attach.java b/util/src/main/java/io/kubernetes/client/Attach.java index cb05116824..03c693c177 100644 --- a/util/src/main/java/io/kubernetes/client/Attach.java +++ b/util/src/main/java/io/kubernetes/client/Attach.java @@ -47,7 +47,7 @@ public Attach(ApiClient apiClient) { /** * Get the API client for these Attach operations. - * @returns The API client that will be used. + * @return The API client that will be used. */ public ApiClient getApiClient() { return apiClient; @@ -78,8 +78,7 @@ private String makePath(String namespace, String name, String container, boolean * * @param namespace The namespace of the Pod * @param name The name of the Pod - * @param command The command to run - * @param stdin If true, pass a stdin stream into the container + * @param stdin If true, pass a stdin stream into the container */ public AttachResult attach(String namespace, String name, boolean stdin) throws ApiException, IOException { return attach(namespace, name, null, stdin, false); diff --git a/util/src/main/java/io/kubernetes/client/Exec.java b/util/src/main/java/io/kubernetes/client/Exec.java index cdea49ac47..4d73704366 100644 --- a/util/src/main/java/io/kubernetes/client/Exec.java +++ b/util/src/main/java/io/kubernetes/client/Exec.java @@ -48,7 +48,7 @@ public Exec(ApiClient apiClient) { /** * Get the API client for these exec operations. - * @returns The API client that will be used. + * @return The API client that will be used. */ public ApiClient getApiClient() { return apiClient; diff --git a/util/src/main/java/io/kubernetes/client/util/Config.java b/util/src/main/java/io/kubernetes/client/util/Config.java index 6ba36348e5..4c6a5c9422 100644 --- a/util/src/main/java/io/kubernetes/client/util/Config.java +++ b/util/src/main/java/io/kubernetes/client/util/Config.java @@ -158,13 +158,13 @@ public static ApiClient fromConfig(Reader input) { /** * Easy client creation, follows this plan *
    - *
  • If $KUBECONFIG is defined, use that config file - *
  • If $HOME/.kube/confg can be found, use that. - *
  • If the in-cluster service account can be found, assume in cluster config. - *
  • Default to localhost:8080 as a last resort. - *
      + *
    • If $KUBECONFIG is defined, use that config file.
      • + *
    • If $HOME/.kube/confg can be found, use that.
      • + *
    • If the in-cluster service account can be found, assume in cluster config.
      • + *
    • Default to localhost:8080 as a last resort.
      • + *
    * - * @returns The best APIClient given the previously described rules + * @return The best APIClient given the previously described rules */ public static ApiClient defaultClient() throws IOException { String kubeConfig = System.getenv(ENV_KUBECONFIG); diff --git a/util/src/main/java/io/kubernetes/client/util/Watch.java b/util/src/main/java/io/kubernetes/client/util/Watch.java index 5d12d17ed3..e2c1b48649 100644 --- a/util/src/main/java/io/kubernetes/client/util/Watch.java +++ b/util/src/main/java/io/kubernetes/client/util/Watch.java @@ -60,8 +60,8 @@ public static class Response { * @param client the API client * @param call the call object returned by api.{ListOperation}Call(...) * method. Make sure watch flag is set in the call. - * @param watchType The type of the WatchResponse. Use something like - * new TypeToken>(){}.getType() + * @param watchType The type of the WatchResponse<T>. Use something like + * new TypeToken<Watch.Response<TYPENAME>>(){}.getType() * @param TYPENAME. * @return Watch object on TYPENAME * @throws ApiException on IO exceptions. diff --git a/util/src/main/java/io/kubernetes/client/util/WebSocketStreamHandler.java b/util/src/main/java/io/kubernetes/client/util/WebSocketStreamHandler.java index c4caf34bbd..48706ca6bd 100644 --- a/util/src/main/java/io/kubernetes/client/util/WebSocketStreamHandler.java +++ b/util/src/main/java/io/kubernetes/client/util/WebSocketStreamHandler.java @@ -108,7 +108,7 @@ public void close() { /** * Get a specific input stream using its identifier * @param stream The stream to return - * @returns The specified stream. + * @return The specified stream. */ public synchronized InputStream getInputStream(int stream) { if (!input.containsKey(stream)) { @@ -129,7 +129,7 @@ public synchronized InputStream getInputStream(int stream) { /** * Gets a specific output stream using it's identified * @param stream The stream to return - * @returns The specified stream. + * @return The specified stream. */ public OutputStream getOutputStream(int stream) { return new WebSocketOutputStream(stream); @@ -139,7 +139,7 @@ public OutputStream getOutputStream(int stream) { * Get the pipe to write data to a specific InputStream. This is called when * new data is read from the web socket, to send the data on to the right stream. * @param stream The stream to return - * @returns The specified stream. + * @return The specified stream. */ private synchronized OutputStream getSocketInputOutputStream(int stream) { if (!output.containsKey(stream)) { diff --git a/util/src/main/java/io/kubernetes/client/util/authenticators/Authenticator.java b/util/src/main/java/io/kubernetes/client/util/authenticators/Authenticator.java index 425b9e2f75..7a226f180a 100644 --- a/util/src/main/java/io/kubernetes/client/util/authenticators/Authenticator.java +++ b/util/src/main/java/io/kubernetes/client/util/authenticators/Authenticator.java @@ -28,7 +28,7 @@ public interface Authenticator { /** * Get a token from this authenticator. * @param config The configuration information for this authenticator - * @returns The new token, null of no such token can be found/generated + * @return The new token, null of no such token can be found/generated */ public String getToken(Map config);