Skip to content

Commit 3e2a770

Browse files
authored
Merge pull request #175 from oracle/standalone
Fixes to status processing and allow operator to run standalone
2 parents 966fc19 + 4f79647 commit 3e2a770

18 files changed

+2828
-677
lines changed

operator/pom.xml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@
127127
<version>${project.version}</version>
128128
<scope>test</scope>
129129
</dependency>
130-
131130
<dependency>
132131
<groupId>io.swagger</groupId>
133132
<artifactId>swagger-annotations</artifactId>
@@ -204,21 +203,18 @@
204203
<artifactId>jersey-hk2</artifactId>
205204
<version>${jersey-version}</version>
206205
</dependency>
207-
208206
<dependency>
209207
<groupId>com.fasterxml.jackson.dataformat</groupId>
210208
<artifactId>jackson-dataformat-yaml</artifactId>
211209
<version>2.9.2</version>
212210
<type>jar</type>
213211
</dependency>
214-
215212
<dependency>
216213
<groupId>commons-codec</groupId>
217214
<artifactId>commons-codec</artifactId>
218215
<version>1.11</version>
219216
<type>jar</type>
220217
</dependency>
221-
222218
<dependency>
223219
<groupId>org.codehaus.jackson</groupId>
224220
<artifactId>jackson-core-asl</artifactId>
@@ -245,13 +241,22 @@
245241
<groupId>org.slf4j</groupId>
246242
<artifactId>slf4j-api</artifactId>
247243
<version>1.7.25</version>
248-
</dependency>
244+
</dependency>
245+
249246
<!-- not included with jdk 9 -->
250247
<dependency>
251248
<groupId>javax.xml.bind</groupId>
252249
<artifactId>jaxb-api</artifactId>
253250
<version>2.3.0</version>
254251
</dependency>
252+
253+
<!-- for mvn exec:java -->
254+
<dependency>
255+
<groupId>org.yaml</groupId>
256+
<artifactId>snakeyaml</artifactId>
257+
<version>1.19</version>
258+
</dependency>
259+
255260
<!-- test dependencies -->
256261
<dependency>
257262
<!-- note: need to include this before junit since junit includes an obsolete version of hamcrest -->
@@ -266,12 +271,6 @@
266271
<version>${junit-version}</version>
267272
<scope>test</scope>
268273
</dependency>
269-
<dependency>
270-
<groupId>org.yaml</groupId>
271-
<artifactId>snakeyaml</artifactId>
272-
<version>1.19</version>
273-
<scope>test</scope>
274-
</dependency>
275274
<dependency>
276275
<groupId>org.apache.commons</groupId>
277276
<artifactId>commons-exec</artifactId>

0 commit comments

Comments
 (0)