Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 715126b

Browse files
committedNov 5, 2021
fix: parent version update from master
1 parent 95b4985 commit 715126b

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed
 

‎sample-operators/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
<parent>
88
<groupId>io.javaoperatorsdk</groupId>
99
<artifactId>java-operator-sdk</artifactId>
10-
<version>1.9.11-SNAPSHOT</version>
11-
<relativePath>../pom.xml</relativePath>
10+
<version>1.9.12-SNAPSHOT</version>
1211
</parent>
1312

1413
<artifactId>sample-operators</artifactId>

‎sample-operators/tomcat-operator/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
<parent>
88
<groupId>io.javaoperatorsdk</groupId>
99
<artifactId>sample-operators</artifactId>
10-
<version>1.9.11-SNAPSHOT</version>
11-
<relativePath>../pom.xml</relativePath>
10+
<version>1.9.12-SNAPSHOT</version>
1211
</parent>
1312

1413
<artifactId>sample-tomcat-operator</artifactId>
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package io.javaoperatorsdk.operator.sample;
22

3+
import org.apache.commons.lang3.builder.ToStringBuilder;
4+
import org.apache.commons.lang3.builder.ToStringStyle;
5+
36
import io.fabric8.kubernetes.api.model.Namespaced;
47
import io.fabric8.kubernetes.client.CustomResource;
58
import io.fabric8.kubernetes.model.annotation.Group;
69
import io.fabric8.kubernetes.model.annotation.Version;
7-
import org.apache.commons.lang3.builder.ToStringBuilder;
8-
import org.apache.commons.lang3.builder.ToStringStyle;
910

1011
@Group("tomcatoperator.io")
1112
@Version("v1")
1213
public class Tomcat extends CustomResource<TomcatSpec, TomcatStatus> implements Namespaced {
1314

14-
public String toString() {
15-
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
16-
}
15+
public String toString() {
16+
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
17+
}
1718
}
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package io.javaoperatorsdk.operator.sample;
22

3+
import org.apache.commons.lang3.builder.ToStringBuilder;
4+
import org.apache.commons.lang3.builder.ToStringStyle;
5+
36
import io.fabric8.kubernetes.api.model.Namespaced;
47
import io.fabric8.kubernetes.client.CustomResource;
58
import io.fabric8.kubernetes.model.annotation.Group;
69
import io.fabric8.kubernetes.model.annotation.Version;
7-
import org.apache.commons.lang3.builder.ToStringBuilder;
8-
import org.apache.commons.lang3.builder.ToStringStyle;
910

1011
/**
1112
* Represents a web application deployed in a Tomcat deployment
@@ -14,7 +15,7 @@
1415
@Version("v1")
1516
public class Webapp extends CustomResource<WebappSpec, WebappStatus> implements Namespaced {
1617

17-
public String toString() {
18-
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
19-
}
18+
public String toString() {
19+
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
20+
}
2021
}

‎sample-operators/tomcat-operator/src/test/java/io/javaoperatorsdk/operator/sample/TomcatOperatorE2E.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ public void test() {
6666
if (testNs != null) {
6767
// We perform a pre-run cleanup instead of a post-run cleanup. This is to help with debugging
6868
// test results when running against a persistent cluster. The test namespace would stay
69-
// after the test run so we can check what's there, but it would be cleaned up during the next test run.
69+
// after the test run so we can check what's there, but it would be cleaned up during the next
70+
// test run.
7071
log.info("Cleanup: deleting test namespace {}", TEST_NS);
7172
client.namespaces().delete(testNs);
7273
await().atMost(5, MINUTES)
@@ -112,7 +113,8 @@ public void test() {
112113
log.info("Waiting for curl Pod to finish running");
113114
await("wait-for-curl-pod-run").atMost(2, MINUTES)
114115
.until(() -> {
115-
String phase = client.pods().inNamespace(TEST_NS).withName("curl").get().getStatus().getPhase();
116+
String phase =
117+
client.pods().inNamespace(TEST_NS).withName("curl").get().getStatus().getPhase();
116118
return phase.equals("Succeeded") || phase.equals("Failed");
117119
});
118120

0 commit comments

Comments
 (0)
Please sign in to comment.