Skip to content

Commit 9e68a18

Browse files
andrewdesevelinec
andrewdes
authored and
evelinec
committed
Multipane (#70)
* Formatting files, update travis & plugins, use parent pom * Converting to multipane * Fixing commands * fixing hotspots * Adding file names above include * Fixing tags * adding hotspots to testing files * Adding line numbers * Fixing tags * Fixing tag name in file * fixing tags * Add guide author * Post review update * 2nd round review * Bolding code commands * Removed finish.adoc include from README.adoc * Adjusting order of dependencies * Updating dependency versions * Updated README with [hotspot] changes * Updated README with link in new tab changes * Updated README with link in new tab changes * Updated README and formatted server.xml * Update server.xml * Update server.xml * Change the guide attribution to point to master * Update copyright year in InventoryHealth * Update copyright year in SystemHealth * Update copyright year in HealthTest * Update copyright year in SystemEndpointTest * Update copyright year in SystemEndpointTest (start) * Update copyright year in README
1 parent 3893098 commit 9e68a18

File tree

11 files changed

+229
-213
lines changed

11 files changed

+229
-213
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ before_script:
33
- unset _JAVA_OPTIONS
44
- cd finish
55
script:
6-
- mvn clean install
6+
- mvn -q clean install
77
- serverName=$(target/liberty/wlp/bin/server list | cut -d '.' -f2| tr -d '\n');
88
- build=$(grep "Open Liberty" target/liberty/wlp/usr/servers/"$serverName"/logs/console.log
99
| cut -d' ' -f5 | cut -d')' -f1 ); release=$( echo "$build" | cut -d'/' -f1); number=$(

‎README.adoc

Lines changed: 133 additions & 69 deletions
Large diffs are not rendered by default.

‎finish/pom.xml

Lines changed: 38 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33

44
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>net.wasdev.wlp.maven.parent</groupId>
7+
<artifactId>liberty-maven-app-parent</artifactId>
8+
<version>RELEASE</version>
9+
</parent>
510

611
<groupId>io.openliberty.guides</groupId>
712
<artifactId>microprofile-health</artifactId>
@@ -35,31 +40,6 @@
3540
</dependencyManagement>
3641

3742
<dependencies>
38-
<!-- For tests -->
39-
<dependency>
40-
<groupId>junit</groupId>
41-
<artifactId>junit</artifactId>
42-
<version>4.12</version>
43-
<scope>test</scope>
44-
</dependency>
45-
<dependency>
46-
<groupId>org.apache.cxf</groupId>
47-
<artifactId>cxf-rt-rs-client</artifactId>
48-
<version>3.1.11</version>
49-
<scope>test</scope>
50-
</dependency>
51-
<dependency>
52-
<groupId>org.apache.cxf</groupId>
53-
<artifactId>cxf-rt-rs-extension-providers</artifactId>
54-
<version>3.1.11</version>
55-
<scope>test</scope>
56-
</dependency>
57-
<dependency>
58-
<groupId>org.glassfish</groupId>
59-
<artifactId>javax.json</artifactId>
60-
<version>1.0.4</version>
61-
<scope>test</scope>
62-
</dependency>
6343
<!-- Open Liberty features -->
6444
<dependency>
6545
<groupId>io.openliberty.features</groupId>
@@ -99,27 +79,52 @@
9979
<scope>provided</scope>
10080
</dependency>
10181
<!-- end::health[] -->
82+
<!-- For tests -->
83+
<dependency>
84+
<groupId>junit</groupId>
85+
<artifactId>junit</artifactId>
86+
<version>4.12</version>
87+
<scope>test</scope>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.apache.cxf</groupId>
91+
<artifactId>cxf-rt-rs-client</artifactId>
92+
<version>3.2.6</version>
93+
<scope>test</scope>
94+
</dependency>
95+
<dependency>
96+
<groupId>org.apache.cxf</groupId>
97+
<artifactId>cxf-rt-rs-extension-providers</artifactId>
98+
<version>3.2.6</version>
99+
<scope>test</scope>
100+
</dependency>
101+
<dependency>
102+
<groupId>org.glassfish</groupId>
103+
<artifactId>javax.json</artifactId>
104+
<version>1.0.4</version>
105+
<scope>test</scope>
106+
</dependency>
102107
<!-- Java utility classes -->
103108
<dependency>
104109
<groupId>org.apache.commons</groupId>
105110
<artifactId>commons-lang3</artifactId>
106111
<version>3.0</version>
107112
</dependency>
108-
<!-- For JDK 9 & 10 support -->
113+
<!-- Support for JDK 9 and above -->
109114
<dependency>
110115
<groupId>javax.xml.bind</groupId>
111116
<artifactId>jaxb-api</artifactId>
112-
<version>2.2.11</version>
117+
<version>2.3.1</version>
113118
</dependency>
114119
<dependency>
115120
<groupId>com.sun.xml.bind</groupId>
116121
<artifactId>jaxb-core</artifactId>
117-
<version>2.2.11</version>
122+
<version>2.3.0.1</version>
118123
</dependency>
119124
<dependency>
120125
<groupId>com.sun.xml.bind</groupId>
121126
<artifactId>jaxb-impl</artifactId>
122-
<version>2.2.11</version>
127+
<version>2.3.2</version>
123128
</dependency>
124129
<dependency>
125130
<groupId>javax.activation</groupId>
@@ -143,7 +148,7 @@
143148
<plugin>
144149
<groupId>org.apache.maven.plugins</groupId>
145150
<artifactId>maven-surefire-plugin</artifactId>
146-
<version>2.18.1</version>
151+
<version>3.0.0-M1</version>
147152
<executions>
148153
<execution>
149154
<phase>test</phase>
@@ -161,7 +166,6 @@
161166
<plugin>
162167
<groupId>net.wasdev.wlp.maven.plugins</groupId>
163168
<artifactId>liberty-maven-plugin</artifactId>
164-
<version>2.6.1</version>
165169
<configuration>
166170
<assemblyArtifact>
167171
<groupId>io.openliberty</groupId>
@@ -179,44 +183,15 @@
179183
</configuration>
180184
<executions>
181185
<execution>
182-
<id>install-liberty</id>
183-
<phase>prepare-package</phase>
184-
<goals>
185-
<goal>install-server</goal>
186-
</goals>
187-
</execution>
188-
<execution>
189-
<id>install-app</id>
190-
<phase>pre-integration-test</phase>
191-
<goals>
192-
<goal>install-apps</goal>
193-
</goals>
186+
<id>install-apps</id>
194187
<configuration>
195188
<looseApplication>true</looseApplication>
196189
<stripVersion>true</stripVersion>
197190
<installAppPackages>project</installAppPackages>
198191
</configuration>
199192
</execution>
200193
<execution>
201-
<id>start-server</id>
202-
<phase>pre-integration-test</phase>
203-
<goals>
204-
<goal>start-server</goal>
205-
</goals>
206-
</execution>
207-
<execution>
208-
<id>stop-server</id>
209-
<phase>post-integration-test</phase>
210-
<goals>
211-
<goal>stop-server</goal>
212-
</goals>
213-
</execution>
214-
<execution>
215-
<id>package-app</id>
216-
<phase>package</phase>
217-
<goals>
218-
<goal>package-server</goal>
219-
</goals>
194+
<id>package-server</id>
220195
<configuration>
221196
<outputDirectory>target/wlp-package</outputDirectory>
222197
</configuration>
@@ -227,7 +202,7 @@
227202
<plugin>
228203
<groupId>org.apache.maven.plugins</groupId>
229204
<artifactId>maven-failsafe-plugin</artifactId>
230-
<version>2.18.1</version>
205+
<version>3.0.0-M1</version>
231206
<executions>
232207
<execution>
233208
<phase>integration-test</phase>

‎finish/src/main/java/io/openliberty/guides/inventory/InventoryHealth.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// tag::comment[]
1+
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2018 IBM Corporation and others.
3+
* Copyright (c) 2018, 2019 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License v1.0
66
* which accompanies this distribution, and is available at
@@ -9,7 +9,7 @@
99
* Contributors:
1010
* IBM Corporation - Initial implementation
1111
*******************************************************************************/
12-
// end::comment[]
12+
// end::copyright[]
1313
// tag::InventoryHealth[]
1414
package io.openliberty.guides.inventory;
1515

‎finish/src/main/java/io/openliberty/guides/system/SystemHealth.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// tag::comment[]
1+
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2018 IBM Corporation and others.
3+
* Copyright (c) 2018, 2019 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License v1.0
66
* which accompanies this distribution, and is available at
@@ -9,7 +9,7 @@
99
* Contributors:
1010
* IBM Corporation - Initial implementation
1111
*******************************************************************************/
12-
// end::comment[]
12+
// end::copyright[]
1313
// tag::SystemHealth[]
1414
package io.openliberty.guides.system;
1515

‎finish/src/main/liberty/config/server.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
<feature>mpHealth-1.0</feature>
1010
</featureManager>
1111

12-
<httpEndpoint host="*" httpPort="${default.http.port}" httpsPort="${default.https.port}" id="defaultHttpEndpoint"/>
12+
<httpEndpoint host="*" httpPort="${default.http.port}"
13+
httpsPort="${default.https.port}" id="defaultHttpEndpoint"/>
1314

1415
<webApplication location="microprofile-health.war" contextRoot="/"/>
1516
</server>

‎finish/src/test/java/it/io/openliberty/guides/health/HealthTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// tag::comment[]
1+
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2018 IBM Corporation and others.
3+
* Copyright (c) 2018, 2019 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License v1.0
66
* which accompanies this distribution, and is available at
@@ -9,7 +9,7 @@
99
* Contributors:
1010
* IBM Corporation - Initial implementation
1111
*******************************************************************************/
12-
// end::comment[]
12+
// end::copyright[]
1313
// tag::HealthTest[]
1414
package it.io.openliberty.guides.health;
1515

‎finish/src/test/java/it/io/openliberty/guides/system/SystemEndpointTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
//tag::comment[]
1+
//tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2017 IBM Corporation and others.
3+
* Copyright (c) 2017, 2019 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License v1.0
66
* which accompanies this distribution, and is available at
@@ -9,7 +9,7 @@
99
* Contributors:
1010
* IBM Corporation - initial API and implementation
1111
*******************************************************************************/
12-
// end::comment[]
12+
// end::copyright[]
1313
package it.io.openliberty.guides.system;
1414

1515
import static org.junit.Assert.assertEquals;

0 commit comments

Comments
 (0)