Skip to content

Commit aaf1188

Browse files
authored
Merge pull request #1205 from oracle/merge_model_module
Merge model module into operator module
2 parents 7bc9a34 + 3aa549d commit aaf1188

File tree

123 files changed

+158
-302
lines changed

Some content is hidden

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

123 files changed

+158
-302
lines changed

model/pom.xml

Lines changed: 0 additions & 177 deletions
This file was deleted.

model/src/test/java/oracle/kubernetes/utils/TestUtils.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

operator/pom.xml

Lines changed: 67 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,77 @@
144144
<artifactId>maven-checkstyle-plugin</artifactId>
145145
</plugin>
146146

147+
<plugin>
148+
<groupId>org.codehaus.mojo</groupId>
149+
<artifactId>build-helper-maven-plugin</artifactId>
150+
<executions>
151+
<execution>
152+
<id>add-source</id>
153+
<phase>generate-sources</phase>
154+
<goals>
155+
<goal>add-source</goal>
156+
</goals>
157+
<configuration>
158+
<sources>
159+
<source>${src-generated-swagger}</source>
160+
<source>${project.build.sourceDirectory}</source>
161+
<source>${project.basedir}/src/build/java</source>
162+
</sources>
163+
</configuration>
164+
</execution>
165+
</executions>
166+
</plugin>
167+
168+
<plugin>
169+
<groupId>${project.groupId}</groupId>
170+
<artifactId>jsonschema-maven-plugin</artifactId>
171+
<version>${project.version}</version>
172+
<executions>
173+
<execution>
174+
<phase>process-classes</phase>
175+
<goals>
176+
<goal>generate</goal>
177+
</goals>
178+
<configuration>
179+
<rootClass>oracle.kubernetes.weblogic.domain.model.Domain</rootClass>
180+
<kubernetesVersion>1.13.5</kubernetesVersion>
181+
<generateMarkdown>true</generateMarkdown>
182+
</configuration>
183+
</execution>
184+
</executions>
185+
</plugin>
186+
187+
<plugin>
188+
<artifactId>maven-resources-plugin</artifactId>
189+
<executions>
190+
<execution>
191+
<phase>install</phase>
192+
<goals>
193+
<goal>copy-resources</goal>
194+
</goals>
195+
<configuration>
196+
<resources>
197+
<resource>
198+
<directory>
199+
${project.build.outputDirectory}/schema/oracle/kubernetes/weblogic/domain/model
200+
</directory>
201+
</resource>
202+
</resources>
203+
<outputDirectory>
204+
${project.basedir}/../docs/domains
205+
</outputDirectory>
206+
</configuration>
207+
</execution>
208+
</executions>
209+
</plugin>
210+
<plugin>
211+
<groupId>org.apache.maven.plugins</groupId>
212+
<artifactId>maven-checkstyle-plugin</artifactId>
213+
</plugin>
147214
</plugins>
148215
</build>
149216

150217
<dependencies>
151-
<dependency>
152-
<groupId>${project.groupId}</groupId>
153-
<artifactId>operator-model</artifactId>
154-
<version>${project.version}</version>
155-
</dependency>
156218
<dependency>
157219
<groupId>${project.groupId}</groupId>
158220
<artifactId>operator-swagger</artifactId>

operator/src/main/java/oracle/kubernetes/operator/DomainStatusUpdater.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import javax.annotation.Nonnull;
1919

2020
import io.kubernetes.client.models.V1ObjectMeta;
21-
import io.kubernetes.client.models.V1Pod;
2221
import oracle.kubernetes.operator.calls.CallResponse;
2322
import oracle.kubernetes.operator.helpers.CallBuilder;
2423
import oracle.kubernetes.operator.helpers.DomainPresenceInfo;

0 commit comments

Comments
 (0)