Skip to content

Commit fd07810

Browse files
mbohloolmbohlool
authored
Merge pull request #63 from lwander/release-0.1
Release 0.1
2 parents 6fa7ecd + 5366a67 commit fd07810

File tree

11 files changed

+62
-69
lines changed

11 files changed

+62
-69
lines changed

‎README.md‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,18 @@ Add this dependency to your project's POM:
2525
```xml
2626
<dependency>
2727
<groupId>io.kubernetes</groupId>
28-
<artifactId>client-java</artifactId>
29-
<version>1.0-SNAPSHOT</version>
28+
<artifactId>client-java-util</artifactId>
29+
<version>0.1</version>
3030
<scope>compile</scope>
3131
</dependency>
3232
```
3333

34+
### Gradle users
35+
36+
```groovy
37+
compile 'io.kubernetes:client-java-util:0.1'
38+
```
39+
3440
### Others
3541

3642
At first generate the JAR by executing:
@@ -43,7 +49,7 @@ mvn package
4349

4450
Then manually install the following JARs:
4551

46-
* target/client-java-1.0-SNAPSHOT.jar
52+
* target/client-java-0.2-SNAPSHOT.jar
4753
* target/lib/*.jar
4854

4955
## Example

‎examples/pom.xml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
1-
<project
2-
xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
42
<modelVersion>4.0.0</modelVersion>
53
<groupId>io.kubernetes</groupId>
64
<artifactId>client-java-examples</artifactId>
7-
<version>1.0-SNAPSHOT</version>
5+
<version>0.2-SNAPSHOT</version>
86
<packaging>jar</packaging>
97
<name>client-java-examples</name>
108
<url>https://github.com/kubernetes-client/java</url>
9+
10+
<parent>
11+
<groupId>io.kubernetes</groupId>
12+
<artifactId>client-java</artifactId>
13+
<version>0.2-SNAPSHOT</version>
14+
</parent>
15+
1116
<dependencies>
1217
<dependency>
1318
<groupId>io.kubernetes</groupId>
1419
<artifactId>client-java-api</artifactId>
15-
<version>1.0-SNAPSHOT</version>
20+
<version>0.2-SNAPSHOT</version>
1621
</dependency>
1722
<dependency>
1823
<groupId>io.kubernetes</groupId>
1924
<artifactId>client-java-util</artifactId>
20-
<version>1.0-SNAPSHOT</version>
25+
<version>0.2-SNAPSHOT</version>
2126
</dependency>
2227
<dependency>
2328
<groupId>com.google.guava</groupId>

‎kubernetes/pom.xml‎

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,21 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
32
<modelVersion>4.0.0</modelVersion>
43
<groupId>io.kubernetes</groupId>
54
<artifactId>client-java-api</artifactId>
65
<packaging>jar</packaging>
76
<name>client-java-api</name>
8-
<version>1.0-SNAPSHOT</version>
9-
<url>https://github.com/swagger-api/swagger-codegen</url>
7+
<version>0.2-SNAPSHOT</version>
8+
<url>https://github.com/kubernetes-client/java</url>
109
<description>Swagger Java</description>
11-
<scm>
12-
<connection>scm:git:git@github.com:kubernetes-client/java.git</connection>
13-
<developerConnection>scm:git:git@github.com:kubernetes-client/java.git</developerConnection>
14-
<url>https://github.com/kubernetes-client/java</url>
15-
</scm>
1610
<prerequisites>
1711
<maven>2.2.0</maven>
1812
</prerequisites>
1913

20-
<licenses>
21-
<license>
22-
<name>The Apache Software License, Version 2.0</name>
23-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
24-
<distribution>repo</distribution>
25-
</license>
26-
</licenses>
27-
28-
<developers>
29-
<developer>
30-
<name>The Kubernetes Authors</name>
31-
<email>kubernetes-dev@googlegroups.com</email>
32-
<organization>Kubernetes</organization>
33-
<organizationUrl>https://kubernetes.io</organizationUrl>
34-
</developer>
35-
</developers>
14+
<parent>
15+
<groupId>io.kubernetes</groupId>
16+
<artifactId>client-java</artifactId>
17+
<version>0.2-SNAPSHOT</version>
18+
</parent>
3619

3720
<build>
3821
<plugins>

‎pom.xml‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1-
<project
2-
xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
42
<modelVersion>4.0.0</modelVersion>
53
<artifactId>client-java</artifactId>
64
<groupId>io.kubernetes</groupId>
7-
<version>0.1-SNAPSHOT</version>
5+
<version>0.2-SNAPSHOT</version>
86
<packaging>pom</packaging>
97
<name>Kubernetes Client API</name>
8+
<url>https://github.com/kubernetes-client/java</url>
9+
<description>Kubernetes Client Library</description>
1010

1111
<modules>
12-
<module>kubernetes</module>
13-
<module>examples</module>
1412
<module>util</module>
13+
<module>examples</module>
14+
<module>kubernetes</module>
1515
</modules>
1616

1717
<scm>
1818
<connection>scm:git:git@github.com:kubernetes-client/java.git</connection>
1919
<developerConnection>scm:git:git@github.com:kubernetes-client/java.git</developerConnection>
2020
<url>https://github.com/kubernetes-client/java</url>
21+
<tag>HEAD</tag>
2122
</scm>
2223

2324
<prerequisites>
@@ -45,10 +46,12 @@
4546
<snapshotRepository>
4647
<id>ossrh</id>
4748
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
49+
<layout>default</layout>
4850
</snapshotRepository>
4951
<repository>
5052
<id>ossrh</id>
51-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
53+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
54+
<layout>default</layout>
5255
</repository>
5356
</distributionManagement>
5457

@@ -60,7 +63,7 @@
6063
<version>2.5.3</version>
6164
<configuration>
6265
<autoVersionSubmodules>true</autoVersionSubmodules>
63-
<releaseProfiles>release</releaseProfiles>
66+
<releaseProfiles>release-sign-artifacts</releaseProfiles>
6467
<goals>deploy</goals>
6568
</configuration>
6669
</plugin>
@@ -69,12 +72,6 @@
6972
<profiles>
7073
<profile>
7174
<id>release-sign-artifacts</id>
72-
<activation>
73-
<property>
74-
<name>release</name>
75-
<value>true</value>
76-
</property>
77-
</activation>
7875
<build>
7976
<plugins>
8077
<plugin>

‎util/pom.xml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
<project
2-
xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
42
<modelVersion>4.0.0</modelVersion>
53
<groupId>io.kubernetes</groupId>
64
<artifactId>client-java-util</artifactId>
7-
<version>1.0-SNAPSHOT</version>
5+
<version>0.2-SNAPSHOT</version>
86
<packaging>jar</packaging>
97
<name>client-java-util</name>
108
<url>https://github.com/kubernetes-client/java</url>
9+
<parent>
10+
<groupId>io.kubernetes</groupId>
11+
<artifactId>client-java</artifactId>
12+
<version>0.2-SNAPSHOT</version>
13+
</parent>
1114
<dependencies>
1215
<dependency>
1316
<groupId>io.kubernetes</groupId>
1417
<artifactId>client-java-api</artifactId>
15-
<version>1.0-SNAPSHOT</version>
18+
<version>0.2-SNAPSHOT</version>
1619
</dependency>
1720
<dependency>
1821
<groupId>org.yaml</groupId>

‎util/src/main/java/io/kubernetes/client/Attach.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public Attach(ApiClient apiClient) {
4747

4848
/**
4949
* Get the API client for these Attach operations.
50-
* @returns The API client that will be used.
50+
* @return The API client that will be used.
5151
*/
5252
public ApiClient getApiClient() {
5353
return apiClient;
@@ -78,8 +78,7 @@ private String makePath(String namespace, String name, String container, boolean
7878
*
7979
* @param namespace The namespace of the Pod
8080
* @param name The name of the Pod
81-
* @param command The command to run
82-
* @param stdin If true, pass a stdin stream into the container
81+
* @param stdin If true, pass a stdin stream into the container
8382
*/
8483
public AttachResult attach(String namespace, String name, boolean stdin) throws ApiException, IOException {
8584
return attach(namespace, name, null, stdin, false);

‎util/src/main/java/io/kubernetes/client/Exec.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public Exec(ApiClient apiClient) {
4848

4949
/**
5050
* Get the API client for these exec operations.
51-
* @returns The API client that will be used.
51+
* @return The API client that will be used.
5252
*/
5353
public ApiClient getApiClient() {
5454
return apiClient;

‎util/src/main/java/io/kubernetes/client/util/Config.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,13 @@ public static ApiClient fromConfig(Reader input) {
158158
/**
159159
* Easy client creation, follows this plan
160160
* <ul>
161-
* <li>If $KUBECONFIG is defined, use that config file
162-
* <li>If $HOME/.kube/confg can be found, use that.
163-
* <li>If the in-cluster service account can be found, assume in cluster config.
164-
* <li>Default to localhost:8080 as a last resort.
165-
* <ul>
161+
* <li>If $KUBECONFIG is defined, use that config file.</li>
162+
* <li>If $HOME/.kube/confg can be found, use that.</li>
163+
* <li>If the in-cluster service account can be found, assume in cluster config.</li>
164+
* <li>Default to localhost:8080 as a last resort.</li>
165+
* </ul>
166166
*
167-
* @returns The best APIClient given the previously described rules
167+
* @return The best APIClient given the previously described rules
168168
*/
169169
public static ApiClient defaultClient() throws IOException {
170170
String kubeConfig = System.getenv(ENV_KUBECONFIG);

‎util/src/main/java/io/kubernetes/client/util/Watch.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public static class Response<T> {
6060
* @param client the API client
6161
* @param call the call object returned by api.{ListOperation}Call(...)
6262
* method. Make sure watch flag is set in the call.
63-
* @param watchType The type of the WatchResponse<T>. Use something like
64-
* new TypeToken<Watch.Response<TYPENAME>>(){}.getType()
63+
* @param watchType The type of the WatchResponse&lt;T&gt;. Use something like
64+
* new TypeToken&lt;Watch.Response&lt;TYPENAME&gt;&gt;(){}.getType()
6565
* @param <T> TYPENAME.
6666
* @return Watch object on TYPENAME
6767
* @throws ApiException on IO exceptions.

‎util/src/main/java/io/kubernetes/client/util/WebSocketStreamHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void close() {
108108
/**
109109
* Get a specific input stream using its identifier
110110
* @param stream The stream to return
111-
* @returns The specified stream.
111+
* @return The specified stream.
112112
*/
113113
public synchronized InputStream getInputStream(int stream) {
114114
if (!input.containsKey(stream)) {
@@ -129,7 +129,7 @@ public synchronized InputStream getInputStream(int stream) {
129129
/**
130130
* Gets a specific output stream using it's identified
131131
* @param stream The stream to return
132-
* @returns The specified stream.
132+
* @return The specified stream.
133133
*/
134134
public OutputStream getOutputStream(int stream) {
135135
return new WebSocketOutputStream(stream);
@@ -139,7 +139,7 @@ public OutputStream getOutputStream(int stream) {
139139
* Get the pipe to write data to a specific InputStream. This is called when
140140
* new data is read from the web socket, to send the data on to the right stream.
141141
* @param stream The stream to return
142-
* @returns The specified stream.
142+
* @return The specified stream.
143143
*/
144144
private synchronized OutputStream getSocketInputOutputStream(int stream) {
145145
if (!output.containsKey(stream)) {

0 commit comments

Comments
 (0)