Skip to content

Commit 1dc16ed

Browse files
rjeberhardrjeberhard
committed
Merge branch 'checkstyle-enforcement' of https://github.com/oracle/weblogic-kubernetes-operator into checkstyle-enforcement
2 parents d71ca1f + 81149f8 commit 1dc16ed

File tree

3 files changed

+825
-858
lines changed

3 files changed

+825
-858
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
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>-->
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>
3434

3535
<module name="TreeWalker">
3636
<module name="OuterTypeFilename"/>

‎model/pom.xml

Lines changed: 155 additions & 199 deletions
Original file line numberDiff line numberDiff line change
@@ -1,217 +1,173 @@
11
<!-- 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
33
http://oss.oracle.com/licenses/upl. -->
4-
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xmlns="http://maven.apache.org/POM/4.0.0"
4+
<project xmlns="http://maven.apache.org/POM/4.0.0"
5+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
66
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
7-
<modelVersion>4.0.0</modelVersion>
7+
<modelVersion>4.0.0</modelVersion>
88

9-
<parent>
10-
<groupId>oracle.kubernetes</groupId>
11-
<artifactId>operator-parent</artifactId>
12-
<version>2.3.0</version>
13-
</parent>
9+
<parent>
10+
<groupId>oracle.kubernetes</groupId>
11+
<artifactId>operator-parent</artifactId>
12+
<version>2.3.0</version>
13+
</parent>
1414

15-
<artifactId>operator-model</artifactId>
15+
<artifactId>operator-model</artifactId>
1616

17-
<description>Oracle Weblogic Server Kubernetes Operator</description>
18-
<name>operator-model</name>
19-
<packaging>jar</packaging>
17+
<description>Oracle Weblogic Server Kubernetes Operator</description>
18+
<name>operator-model</name>
19+
<packaging>jar</packaging>
2020

21-
<url>https://oracle.github.io/weblogic-kubernetes-operator</url>
22-
<inceptionYear>2017</inceptionYear>
23-
<licenses>
24-
<license>
25-
<name>The Universal Permissive License (UPL), Version 1.0</name>
26-
<url>https://github.com/oracle/weblogic-kubernetes-operator/blob/master/LICENSE</url>
27-
</license>
28-
</licenses>
21+
<url>https://oracle.github.io/weblogic-kubernetes-operator</url>
22+
<inceptionYear>2017</inceptionYear>
23+
<licenses>
24+
<license>
25+
<name>The Universal Permissive License (UPL), Version 1.0</name>
26+
<url>https://github.com/oracle/weblogic-kubernetes-operator/blob/master/LICENSE</url>
27+
</license>
28+
</licenses>
2929

30-
<build>
31-
<plugins>
32-
<plugin>
33-
<groupId>org.apache.maven.plugins</groupId>
34-
<artifactId>maven-enforcer-plugin</artifactId>
35-
<version>${maven-enforcer-plugin-version}</version>
36-
<executions>
37-
<execution>
38-
<id>enforce-maven</id>
39-
<goals>
40-
<goal>enforce</goal>
41-
</goals>
42-
<configuration>
43-
<rules>
44-
<requireMavenVersion>
45-
<version>${maven.version.range}</version>
46-
</requireMavenVersion>
47-
<requireJavaVersion>
48-
<version>${java.version.range}</version>
49-
</requireJavaVersion>
50-
<requirePluginVersions></requirePluginVersions>
51-
</rules>
52-
</configuration>
53-
</execution>
54-
</executions>
55-
</plugin>
56-
<plugin>
57-
<groupId>org.codehaus.mojo</groupId>
58-
<artifactId>build-helper-maven-plugin</artifactId>
59-
<version>3.0.0</version>
60-
<executions>
61-
<execution>
62-
<id>add-source</id>
63-
<phase>generate-sources</phase>
64-
<goals>
65-
<goal>add-source</goal>
66-
</goals>
67-
<configuration>
68-
<sources>
69-
<source>${src-generated-swagger}</source>
70-
<source>${project.build.sourceDirectory}</source>
71-
<source>${project.basedir}/src/build/java</source>
72-
</sources>
73-
</configuration>
74-
</execution>
75-
</executions>
76-
</plugin>
30+
<build>
31+
<plugins>
32+
<plugin>
33+
<groupId>org.codehaus.mojo</groupId>
34+
<artifactId>build-helper-maven-plugin</artifactId>
35+
<executions>
36+
<execution>
37+
<id>add-source</id>
38+
<phase>generate-sources</phase>
39+
<goals>
40+
<goal>add-source</goal>
41+
</goals>
42+
<configuration>
43+
<sources>
44+
<source>${src-generated-swagger}</source>
45+
<source>${project.build.sourceDirectory}</source>
46+
<source>${project.basedir}/src/build/java</source>
47+
</sources>
48+
</configuration>
49+
</execution>
50+
</executions>
51+
</plugin>
7752

78-
<plugin>
79-
<groupId>org.apache.maven.plugins</groupId>
80-
<artifactId>maven-compiler-plugin</artifactId>
81-
<version>${maven-compiler-plugin-version}</version>
82-
<configuration>
83-
<release>11</release>
84-
<compilerArgs>
85-
<arg>-Xpkginfo:always</arg>
86-
</compilerArgs>
87-
</configuration>
88-
</plugin>
53+
<plugin>
54+
<groupId>org.apache.maven.plugins</groupId>
55+
<artifactId>maven-compiler-plugin</artifactId>
56+
</plugin>
8957

90-
<plugin>
91-
<groupId>${project.groupId}</groupId>
92-
<artifactId>jsonschema-maven-plugin</artifactId>
93-
<version>${project.version}</version>
94-
<executions>
95-
<execution>
96-
<phase>process-classes</phase>
97-
<goals>
98-
<goal>generate</goal>
99-
</goals>
100-
<configuration>
101-
<rootClass>oracle.kubernetes.weblogic.domain.model.Domain</rootClass>
102-
<kubernetesVersion>1.13.5</kubernetesVersion>
103-
<generateMarkdown>true</generateMarkdown>
104-
</configuration>
105-
</execution>
106-
</executions>
107-
</plugin>
58+
<plugin>
59+
<groupId>${project.groupId}</groupId>
60+
<artifactId>jsonschema-maven-plugin</artifactId>
61+
<version>${project.version}</version>
62+
<executions>
63+
<execution>
64+
<phase>process-classes</phase>
65+
<goals>
66+
<goal>generate</goal>
67+
</goals>
68+
<configuration>
69+
<rootClass>oracle.kubernetes.weblogic.domain.model.Domain</rootClass>
70+
<kubernetesVersion>1.13.5</kubernetesVersion>
71+
<generateMarkdown>true</generateMarkdown>
72+
</configuration>
73+
</execution>
74+
</executions>
75+
</plugin>
10876

109-
<plugin>
110-
<artifactId>maven-resources-plugin</artifactId>
111-
<version>${maven-resources-plugin-version}</version>
112-
<executions>
113-
<execution>
114-
<phase>install</phase>
115-
<goals>
116-
<goal>copy-resources</goal>
117-
</goals>
118-
<configuration>
119-
<resources>
120-
<resource>
121-
<directory>
122-
${project.build.outputDirectory}/schema/oracle/kubernetes/weblogic/domain/model
123-
</directory>
124-
</resource>
125-
</resources>
126-
<outputDirectory>
127-
${project.basedir}/../docs/domains
128-
</outputDirectory>
129-
</configuration>
130-
</execution>
131-
</executions>
132-
</plugin>
77+
<plugin>
78+
<artifactId>maven-resources-plugin</artifactId>
79+
<executions>
80+
<execution>
81+
<phase>install</phase>
82+
<goals>
83+
<goal>copy-resources</goal>
84+
</goals>
85+
<configuration>
86+
<resources>
87+
<resource>
88+
<directory>
89+
${project.build.outputDirectory}/schema/oracle/kubernetes/weblogic/domain/model
90+
</directory>
91+
</resource>
92+
</resources>
93+
<outputDirectory>
94+
${project.basedir}/../docs/domains
95+
</outputDirectory>
96+
</configuration>
97+
</execution>
98+
</executions>
99+
</plugin>
133100

134-
<plugin>
135-
<groupId>org.apache.maven.plugins</groupId>
136-
<artifactId>maven-checkstyle-plugin</artifactId>
137-
</plugin>
101+
</plugins>
102+
</build>
138103

139-
</plugins>
140-
</build>
104+
<dependencies>
105+
<dependency>
106+
<groupId>${project.groupId}</groupId>
107+
<artifactId>json-schema</artifactId>
108+
<version>${project.version}</version>
109+
</dependency>
110+
<dependency>
111+
<groupId>io.kubernetes</groupId>
112+
<artifactId>client-java</artifactId>
113+
</dependency>
114+
<dependency>
115+
<groupId>javax</groupId>
116+
<artifactId>javaee-web-api</artifactId>
117+
<type>jar</type>
118+
</dependency>
119+
<dependency>
120+
<groupId>com.fasterxml.jackson.core</groupId>
121+
<artifactId>jackson-annotations</artifactId>
122+
</dependency>
123+
<dependency>
124+
<groupId>org.hamcrest</groupId>
125+
<artifactId>hamcrest-junit</artifactId>
126+
<scope>test</scope>
127+
</dependency>
128+
<dependency>
129+
<groupId>junit</groupId>
130+
<artifactId>junit</artifactId>
131+
<scope>test</scope>
132+
</dependency>
133+
<dependency>
134+
<groupId>com.meterware.simplestub</groupId>
135+
<artifactId>simplestub</artifactId>
136+
<scope>test</scope>
137+
</dependency>
138+
<dependency>
139+
<groupId>com.fasterxml.jackson.core</groupId>
140+
<artifactId>jackson-databind</artifactId>
141+
<scope>test</scope>
142+
</dependency>
143+
<dependency>
144+
<groupId>org.yaml</groupId>
145+
<artifactId>snakeyaml</artifactId>
146+
<scope>test</scope>
147+
</dependency>
148+
<dependency>
149+
<groupId>com.fasterxml.jackson.dataformat</groupId>
150+
<artifactId>jackson-dataformat-yaml</artifactId>
151+
<scope>test</scope>
152+
</dependency>
153+
<dependency>
154+
<groupId>com.kjetland</groupId>
155+
<artifactId>mbknor-jackson-jsonschema_2.12</artifactId>
156+
</dependency>
157+
</dependencies>
141158

142-
<dependencies>
143-
<dependency>
144-
<groupId>${project.groupId}</groupId>
145-
<artifactId>json-schema</artifactId>
146-
<version>${project.version}</version>
147-
</dependency>
148-
<dependency>
149-
<groupId>io.kubernetes</groupId>
150-
<artifactId>client-java</artifactId>
151-
</dependency>
152-
<dependency>
153-
<groupId>javax</groupId>
154-
<artifactId>javaee-web-api</artifactId>
155-
<version>7.0</version>
156-
<type>jar</type>
157-
</dependency>
158-
<dependency>
159-
<groupId>com.fasterxml.jackson.core</groupId>
160-
<artifactId>jackson-annotations</artifactId>
161-
<version>${jackson-version}</version>
162-
</dependency>
163-
<dependency>
164-
<groupId>org.hamcrest</groupId>
165-
<artifactId>hamcrest-junit</artifactId>
166-
<scope>test</scope>
167-
</dependency>
168-
<dependency>
169-
<groupId>junit</groupId>
170-
<artifactId>junit</artifactId>
171-
<scope>test</scope>
172-
</dependency>
173-
<dependency>
174-
<groupId>com.meterware.simplestub</groupId>
175-
<artifactId>simplestub</artifactId>
176-
<scope>test</scope>
177-
</dependency>
178-
<dependency>
179-
<groupId>com.fasterxml.jackson.core</groupId>
180-
<artifactId>jackson-databind</artifactId>
181-
<version>${jackson-version}</version>
182-
<scope>test</scope>
183-
</dependency>
184-
<dependency>
185-
<groupId>org.yaml</groupId>
186-
<artifactId>snakeyaml</artifactId>
187-
<version>${snakeyaml-version}</version>
188-
<scope>test</scope>
189-
</dependency>
190-
<dependency>
191-
<groupId>com.fasterxml.jackson.dataformat</groupId>
192-
<artifactId>jackson-dataformat-yaml</artifactId>
193-
<version>${jackson-version}</version>
194-
<scope>test</scope>
195-
</dependency>
196-
<dependency>
197-
<groupId>com.kjetland</groupId>
198-
<artifactId>mbknor-jackson-jsonschema_2.12</artifactId>
199-
<version>1.0.34</version>
200-
</dependency>
201-
</dependencies>
159+
<profiles>
202160

203-
<profiles>
204-
205-
<profile>
206-
<id>default</id>
207-
<activation>
208-
<activeByDefault>true</activeByDefault>
209-
</activation>
210-
<properties>
211-
<surefireArgLine></surefireArgLine>
212-
<failsafeArgLine></failsafeArgLine>
213-
</properties>
214-
</profile>
215-
</profiles>
161+
<profile>
162+
<id>default</id>
163+
<activation>
164+
<activeByDefault>true</activeByDefault>
165+
</activation>
166+
<properties>
167+
<surefireArgLine></surefireArgLine>
168+
<failsafeArgLine></failsafeArgLine>
169+
</properties>
170+
</profile>
171+
</profiles>
216172

217173
</project>

0 commit comments

Comments
 (0)