Skip to content

Commit 4b1b54b

Browse files
rjeberhardrjeberhard
authored
Merge pull request #168 from oracle/refactor
Refactor poms to make later work to add utility jars easier
2 parents 5edddb8 + 9262700 commit 4b1b54b

File tree

214 files changed

+567
-368
lines changed

Some content is hidden

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

214 files changed

+567
-368
lines changed

‎Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
FROM store/oracle/serverjre:8
55

66
RUN mkdir /operator
7+
RUN mkdir /operator/lib
78
ENV PATH=$PATH:/operator
89

9-
COPY src/main/scripts/* /operator/
10-
COPY target/weblogic-kubernetes-operator-0.1.0.jar /operator/weblogic-kubernetes-operator.jar
10+
COPY src/scripts/* /operator/
11+
COPY operator/target/weblogic-kubernetes-operator-0.1.0.jar /operator/weblogic-kubernetes-operator.jar
12+
COPY operator/target/lib/*.jar /operator/lib/
1113

1214
HEALTHCHECK --interval=1m --timeout=10s \
1315
CMD /operator/livenessProbe.sh
1416

1517
WORKDIR /operator/
1618

17-
CMD ["operator.sh"]
19+
CMD ["/operator/operator.sh"]

‎model/pom.xml

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
<!-- Copyright 2017, Oracle Corporation. All Rights Reserved. -->
2+
<!-- This is unreleased proprietary source code of Oracle Corporation -->
3+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>oracle.kubernetes</groupId>
9+
<artifactId>operator-parent</artifactId>
10+
<version>0.1.0</version>
11+
</parent>
12+
13+
<groupId>oracle.kubernetes</groupId>
14+
<artifactId>operator-model</artifactId>
15+
<version>0.1.0</version>
16+
17+
<description>Oracle Weblogic Server Kubernetes Operator</description>
18+
<name>operator-model</name>
19+
<packaging>jar</packaging>
20+
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>
29+
30+
<build>
31+
<plugins>
32+
<plugin>
33+
<groupId>org.codehaus.mojo</groupId>
34+
<artifactId>build-helper-maven-plugin</artifactId>
35+
<version>3.0.0</version>
36+
<executions>
37+
<execution>
38+
<id>add-source</id>
39+
<phase>generate-sources</phase>
40+
<goals>
41+
<goal>add-source</goal>
42+
</goals>
43+
<configuration>
44+
<sources>
45+
<source>${src-generated-swagger}</source>
46+
<source>${project.build.sourceDirectory}</source>
47+
<source>${project.basedir}/src/build/java</source>
48+
</sources>
49+
</configuration>
50+
</execution>
51+
</executions>
52+
</plugin>
53+
54+
<plugin>
55+
<groupId>org.apache.maven.plugins</groupId>
56+
<artifactId>maven-compiler-plugin</artifactId>
57+
<version>3.7.0</version>
58+
<configuration>
59+
<compilerArgs>
60+
<arg>-Xpkginfo:always</arg>
61+
</compilerArgs>
62+
</configuration>
63+
</plugin>
64+
65+
<plugin>
66+
<groupId>org.apache.maven.plugins</groupId>
67+
<artifactId>maven-javadoc-plugin</artifactId>
68+
<version>3.0.0</version>
69+
<configuration>
70+
<show>public</show>
71+
<author>false</author>
72+
<!-- later Copyright 2018, {currentYear} -->
73+
<bottom><![CDATA[<p>Copyright 2018, <a href="http://www.oracle.com">Oracle Corporation</a> and/or its affiliates. All rights reserved. <br />Licensed under the Universal Permissive License v 1.0 as shown at <a href="http://oss.oracle.com/licenses/upl">http://oss.oracle.com/licenses/upl</a>.<p>]]></bottom>
74+
<doctitle>Oracle WebLogic Server Kubernetes Operator v 0.1 Technology Preview API</doctitle>
75+
</configuration>
76+
</plugin>
77+
78+
</plugins>
79+
</build>
80+
81+
<dependencies>
82+
<dependency>
83+
<groupId>io.kubernetes</groupId>
84+
<artifactId>client-java</artifactId>
85+
<version>1.0.0-beta3</version>
86+
</dependency>
87+
<dependency>
88+
<groupId>javax</groupId>
89+
<artifactId>javaee-web-api</artifactId>
90+
<version>7.0</version>
91+
<type>jar</type>
92+
</dependency>
93+
</dependencies>
94+
95+
<profiles>
96+
97+
<profile>
98+
<id>generate-model</id>
99+
<build>
100+
<plugins>
101+
<plugin>
102+
<groupId>org.jsonschema2pojo</groupId>
103+
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
104+
<version>0.5.1</version>
105+
<configuration>
106+
<sourceDirectory>${basedir}/src/main/resources/schema</sourceDirectory>
107+
<targetPackage>oracle.kubernetes.operator.domain.model.v1</targetPackage>
108+
<targetVersion>1.8</targetVersion>
109+
<annotationStyle>gson</annotationStyle>
110+
<includeJsr303Annotations>true</includeJsr303Annotations>
111+
<generateBuilders>true</generateBuilders>
112+
<useJodaDates>true</useJodaDates>
113+
<useCommonsLang3>true</useCommonsLang3>
114+
<removeOldOutput>true</removeOldOutput>
115+
</configuration>
116+
<executions>
117+
<execution>
118+
<goals>
119+
<goal>generate</goal>
120+
</goals>
121+
</execution>
122+
</executions>
123+
</plugin>
124+
</plugins>
125+
</build>
126+
</profile>
127+
128+
<profile>
129+
<id>sign-artifacts</id>
130+
<build>
131+
<plugins>
132+
<plugin>
133+
<groupId>org.apache.maven.plugins</groupId>
134+
<artifactId>maven-gpg-plugin</artifactId>
135+
<version>1.5</version>
136+
<executions>
137+
<execution>
138+
<id>sign-artifacts</id>
139+
<phase>verify</phase>
140+
<goals>
141+
<goal>sign</goal>
142+
</goals>
143+
</execution>
144+
</executions>
145+
</plugin>
146+
</plugins>
147+
</build>
148+
</profile>
149+
150+
<profile>
151+
<id>default</id>
152+
<activation>
153+
<activeByDefault>true</activeByDefault>
154+
</activation>
155+
<properties>
156+
<surefireArgLine></surefireArgLine>
157+
<failsafeArgLine></failsafeArgLine>
158+
</properties>
159+
</profile>
160+
</profiles>
161+
162+
</project>

‎src-generated-swagger/main/java/oracle/kubernetes/weblogic/domain/v1/ClusterStartup.java renamed to ‎model/src/main/java/oracle/kubernetes/weblogic/domain/v1/ClusterStartup.java

File renamed without changes.

‎src-generated-swagger/main/java/oracle/kubernetes/weblogic/domain/v1/Domain.java renamed to ‎model/src/main/java/oracle/kubernetes/weblogic/domain/v1/Domain.java

File renamed without changes.

‎src-generated-swagger/main/java/oracle/kubernetes/weblogic/domain/v1/DomainCondition.java renamed to ‎model/src/main/java/oracle/kubernetes/weblogic/domain/v1/DomainCondition.java

File renamed without changes.

‎src-generated-swagger/main/java/oracle/kubernetes/weblogic/domain/v1/DomainList.java renamed to ‎model/src/main/java/oracle/kubernetes/weblogic/domain/v1/DomainList.java

File renamed without changes.

‎src-generated-swagger/main/java/oracle/kubernetes/weblogic/domain/v1/DomainSpec.java renamed to ‎model/src/main/java/oracle/kubernetes/weblogic/domain/v1/DomainSpec.java

File renamed without changes.

‎src-generated-swagger/main/java/oracle/kubernetes/weblogic/domain/v1/DomainStatus.java renamed to ‎model/src/main/java/oracle/kubernetes/weblogic/domain/v1/DomainStatus.java

File renamed without changes.

‎src-generated-swagger/main/java/oracle/kubernetes/weblogic/domain/v1/ServerHealth.java renamed to ‎model/src/main/java/oracle/kubernetes/weblogic/domain/v1/ServerHealth.java

File renamed without changes.

‎src-generated-swagger/main/java/oracle/kubernetes/weblogic/domain/v1/ServerStartup.java renamed to ‎model/src/main/java/oracle/kubernetes/weblogic/domain/v1/ServerStartup.java

File renamed without changes.

0 commit comments

Comments
 (0)