Skip to content

Commit fc3c277

Browse files
rjeberhardrjeberhard
committed
Merge remote-tracking branch 'origin/develop' into cluster-template
2 parents f16d743 + eaa5ed3 commit fc3c277

File tree

551 files changed

+12127
-11934
lines changed

Some content is hidden

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

551 files changed

+12127
-11934
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.
1+
# Copyright 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
22
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
33
#
44
# HOW TO BUILD THIS IMAGE

‎LICENSE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
1+
Copyright (c) 2017, 2019, Oracle Corporation Oracle and/or its affiliates. All rights reserved.
22

3-
The Universal Permissive License (UPL), Version 1.0
3+
Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
44

55
Subject to the condition set forth below, permission is hereby granted to any person obtaining a copy of this
66
software, associated documentation and/or data (collectively the "Software"), free of charge and under any and

‎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>

‎build-tools/src/main/resources/weblogic-kubernetes-operator/checkstyle/customized_google_checks.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
<property name="eachLine" value="true"/>
2828
</module>
2929

30+
<module name="RegexpHeader">
31+
<property name="headerFile" value="build-tools/src/main/resources/weblogic-kubernetes-operator/checkstyle/java.header"/>
32+
<property name="fileExtensions" value="java"/>
33+
</module>
34+
3035
<module name="TreeWalker">
3136
<module name="OuterTypeFilename"/>
3237
<module name="IllegalTokenText">
@@ -42,7 +47,7 @@
4247
<property name="allowNonPrintableEscapes" value="true"/>
4348
</module>
4449
<module name="LineLength">
45-
<property name="max" value="100"/>
50+
<property name="max" value="120"/>
4651
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
4752
</module>
4853
<module name="AvoidStarImport"/>
@@ -193,7 +198,7 @@
193198
<module name="CustomImportOrder">
194199
<property name="sortImportsInGroupAlphabetically" value="true"/>
195200
<property name="separateLineBetweenGroups" value="true"/>
196-
<property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
201+
<property name="customImportOrderRules" value="STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE###STATIC"/>
197202
</module>
198203
<module name="MethodParamPad"/>
199204
<module name="NoWhitespaceBefore">

‎build-tools/src/main/resources/weblogic-kubernetes-operator/checkstyle/java.header

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
^// Copyright (\d\d\d\d, )+Oracle Corporation and\/or its affiliates\. All rights reserved\.$
2+
^// Licensed under the Universal Permissive License v 1\.0 as shown at$
3+
^// http://oss\.oracle\.com/licenses/upl\.$

‎build-tools/src/main/resources/weblogic-kubernetes-operator/spotbugs/exclude-common.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
44
5-
Copyright (c) 2011-2013 Oracle and/or its affiliates. All rights reserved.
5+
Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
66
77
The contents of this file are subject to the terms of either the GNU
88
General Public License Version 2 only ("GPL") or the Common Development

‎buildtime-reports/pom.xml

Lines changed: 3 additions & 23 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

@@ -19,26 +19,6 @@
1919
<plugin>
2020
<groupId>org.apache.maven.plugins</groupId>
2121
<artifactId>maven-enforcer-plugin</artifactId>
22-
<version>${maven-enforcer-plugin-version}</version>
23-
<executions>
24-
<execution>
25-
<id>enforce-maven</id>
26-
<goals>
27-
<goal>enforce</goal>
28-
</goals>
29-
<configuration>
30-
<rules>
31-
<requireMavenVersion>
32-
<version>${maven.version.range}</version>
33-
</requireMavenVersion>
34-
<requireJavaVersion>
35-
<version>${java.version.range}</version>
36-
</requireJavaVersion>
37-
<requirePluginVersions></requirePluginVersions>
38-
</rules>
39-
</configuration>
40-
</execution>
41-
</executions>
4222
</plugin>
4323
</plugins>
4424
</build>
@@ -48,7 +28,7 @@
4828
<id>reports</id>
4929
<activation>
5030
<property>
51-
<name>!no-reports</name>
31+
<name>!no-reports</name>
5232
</property>
5333
</activation>
5434
<build>

‎deploy.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
2-
# Copyright 2017, 2018, Oracle Corporation and/or affiliates. All rights reserved.
2+
# Copyright 2017, 2019, Oracle Corporation and/or affiliates. All rights reserved.
3+
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
34

45
IMAGE="container-registry.oracle.com/middleware/weblogic-kubernetes-operator:latest"
56

‎docs-source/content/developerguide/building.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ $ mvn clean install
1616

1717
This will compile the source files, build JAR files containing the compiled classes and libraries needed to run the operator, and will also execute all of the unit tests.
1818

19-
Contributions must conform to [coding and formatting standards]({{< relref "/developerguide/coding-standards.md" >}}). To automatically update local code to conform to formatting standards, issue the following command:
20-
21-
```
22-
$ mvn fmt:format
23-
```
19+
Contributions must conform to [coding and formatting standards]({{< relref "/developerguide/coding-standards.md" >}}).
2420

2521
#### Building Javadoc
2622

‎docs-source/content/samples/simple/storage/_index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ The create script will verify that the PV and PVC were created, and will report
8181
The content of the generated `weblogic-sample-pvc.yaml`:
8282

8383
```
84-
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
84+
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
8585
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
8686
8787
kind: PersistentVolumeClaim
@@ -102,7 +102,7 @@ metadata:
102102

103103
The content of the generated `weblogic-sample-pv.yaml`:
104104
```
105-
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
105+
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
106106
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
107107
108108
apiVersion: v1
@@ -132,7 +132,7 @@ spec:
132132
The content of the generated `domain1-weblogic-sample-pvc.yaml` when `domainUID` is set to `domain1`:
133133

134134
```
135-
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
135+
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
136136
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
137137
138138
kind: PersistentVolumeClaim
@@ -154,7 +154,7 @@ spec:
154154

155155
The content of the generated `domain1-weblogic-sample-pv.yaml` when `domainUID` is set to `domain1`:
156156
```
157-
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
157+
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
158158
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
159159
160160
apiVersion: v1

0 commit comments

Comments
 (0)