Skip to content

Commit de01d7b

Browse files
ddsharpeddsharpe
committed
Merge remote-tracking branch 'origin/checkstyle-enforcement' into checkstyle-enforcement
2 parents 3267021 + b85c522 commit de01d7b

File tree

258 files changed

+9433
-9554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

258 files changed

+9433
-9554
lines changed

‎build-tools/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<project>
2-
<modelVersion>4.0.0</modelVersion>
3-
<groupId>oracle.kubernetes</groupId>
4-
<artifactId>build-tools</artifactId>
5-
<version>1.0</version>
6-
<name>Build Tools</name>
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>oracle.kubernetes</groupId>
4+
<artifactId>build-tools</artifactId>
5+
<version>1.0</version>
6+
<name>Build Tools</name>
77
</project>

‎buildtime-reports/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="http://maven.apache.org/POM/4.0.0"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

@@ -48,7 +48,7 @@
4848
<id>reports</id>
4949
<activation>
5050
<property>
51-
<name>!no-reports</name>
51+
<name>!no-reports</name>
5252
</property>
5353
</activation>
5454
<build>

‎docs/domains/Domain.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,6 @@
145145
"description": "Unique, one-word, CamelCase reason for the condition\u0027s last transition.",
146146
"type": "string"
147147
},
148-
"lastTransitionTime": {
149-
"description": "Last time the condition transitioned from one status to another.",
150-
"$ref": "#/definitions/DateTime"
151-
},
152-
"message": {
153-
"description": "Human-readable message indicating details about last transition.",
154-
"type": "string"
155-
},
156148
"type": {
157149
"description": "The type of the condition. Valid types are Progressing, Available, and Failed. Required",
158150
"type": "string",
@@ -162,6 +154,14 @@
162154
"Failed"
163155
]
164156
},
157+
"lastTransitionTime": {
158+
"description": "Last time the condition transitioned from one status to another.",
159+
"$ref": "#/definitions/DateTime"
160+
},
161+
"message": {
162+
"description": "Human-readable message indicating details about last transition.",
163+
"type": "string"
164+
},
165165
"lastProbeTime": {
166166
"description": "Last time we probed the condition.",
167167
"$ref": "#/definitions/DateTime"
@@ -274,18 +274,18 @@
274274
"description": "If true (the default), the server .out file will be included in the pod\u0027s stdout.",
275275
"type": "boolean"
276276
},
277-
"managedServers": {
278-
"description": "Configuration for the managed servers.",
277+
"clusters": {
278+
"description": "Configuration for the clusters.",
279279
"type": "array",
280280
"items": {
281-
"$ref": "#/definitions/ManagedServer"
281+
"$ref": "#/definitions/Cluster"
282282
}
283283
},
284-
"clusters": {
285-
"description": "Configuration for the clusters.",
284+
"managedServers": {
285+
"description": "Configuration for the managed servers.",
286286
"type": "array",
287287
"items": {
288-
"$ref": "#/definitions/Cluster"
288+
"$ref": "#/definitions/ManagedServer"
289289
}
290290
}
291291
}

‎docs/domains/index.html

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,14 +1065,6 @@
10651065
"description": "Unique, one-word, CamelCase reason for the condition\u0027s last transition.",
10661066
"type": "string"
10671067
},
1068-
"lastTransitionTime": {
1069-
"description": "Last time the condition transitioned from one status to another.",
1070-
"$ref": "#/definitions/DateTime"
1071-
},
1072-
"message": {
1073-
"description": "Human-readable message indicating details about last transition.",
1074-
"type": "string"
1075-
},
10761068
"type": {
10771069
"description": "The type of the condition. Valid types are Progressing, Available, and Failed. Required",
10781070
"type": "string",
@@ -1082,6 +1074,14 @@
10821074
"Failed"
10831075
]
10841076
},
1077+
"lastTransitionTime": {
1078+
"description": "Last time the condition transitioned from one status to another.",
1079+
"$ref": "#/definitions/DateTime"
1080+
},
1081+
"message": {
1082+
"description": "Human-readable message indicating details about last transition.",
1083+
"type": "string"
1084+
},
10851085
"lastProbeTime": {
10861086
"description": "Last time we probed the condition.",
10871087
"$ref": "#/definitions/DateTime"
@@ -1194,18 +1194,18 @@
11941194
"description": "If true (the default), the server .out file will be included in the pod\u0027s stdout.",
11951195
"type": "boolean"
11961196
},
1197-
"managedServers": {
1198-
"description": "Configuration for the managed servers.",
1197+
"clusters": {
1198+
"description": "Configuration for the clusters.",
11991199
"type": "array",
12001200
"items": {
1201-
"$ref": "#/definitions/ManagedServer"
1201+
"$ref": "#/definitions/Cluster"
12021202
}
12031203
},
1204-
"clusters": {
1205-
"description": "Configuration for the clusters.",
1204+
"managedServers": {
1205+
"description": "Configuration for the managed servers.",
12061206
"type": "array",
12071207
"items": {
1208-
"$ref": "#/definitions/Cluster"
1208+
"$ref": "#/definitions/ManagedServer"
12091209
}
12101210
}
12111211
}

‎integration-tests/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ Failed run will have the output like
292292
[INFO] Finished at: 2019-02-11T09:42:08-08:00
293293
[INFO] Final Memory: 124M/1534M
294294
```
295-
JUnit test results can be seen at "integration-tests/target/failsafe-reports/TEST-oracle.kubernetes.operator.ITOperator.xml". This file shows how much time each test case took to run and the failed test results if any.
295+
JUnit test results can be seen at "integration-tests/target/failsafe-reports/TEST-oracle.kubernetes.operator.ItOperator.xml". This file shows how much time each test case took to run and the failed test results if any.
296296

297297
# How to run JRF domain In Operator related tests
298298
* Setup docker access to FMW Infrastructure 12c Image and Oracle Database 12c Image
@@ -318,11 +318,11 @@ mvn clean verify -P jrf-integration-tests 2>&1 | tee log.txt
318318
319319
# How to run a single test
320320
321-
mvn -Dit.test="ITOperator#testDomainOnPVUsingWLST" -DfailIfNoTests=false integration-test -P java-integration-tests
321+
mvn -Dit.test="ItOperator#testDomainOnPVUsingWLST" -DfailIfNoTests=false integration-test -P java-integration-tests
322322
323323
# How to run multiple tests
324324
325-
mvn -Dit.test="ITOperator#testDomainOnPVUsingWLST+testDomainOnPVUsingWDT" -DfailIfNoTests=false integration-test -P java-integration-tests
325+
mvn -Dit.test="ItOperator#testDomainOnPVUsingWLST+testDomainOnPVUsingWDT" -DfailIfNoTests=false integration-test -P java-integration-tests
326326
327327
# How to run cleanup script
328328

0 commit comments

Comments
 (0)