Skip to content

Commit 7fe082a

Browse files
jus-chengkwan-ibm
jus-chen
authored and
gkwan-ibm
committed
Multipane (#37)
* Starting to implement multipane * Converting to multipane * Added titles above code_columns * Trying to add a blank file for earlier sections of guide * Playing with blank.txt as a placeholder * Added linenums * Updated line nums and added hotspots * Updated commands and cleaning up previous hotspots * Added attributions * Updated multipane * Updated multipane * Updated multipane * README changes * Changed hotspot * Pom and travis.yml changes * Updated README * Update README.adoc * Update README.adoc * Added import statements to start dir pingresource.java file * Addressed post review * Updated cxf-rt-rs.. versions and added guide-author in front matter * Added hashtags to readme * Removed finish.adoc include from README.adoc * Updating pom.xml * Updating pom * Updated README * Updated README * Updated README * Updated README with [hotspot] changes * Updated README with link in new tab changes * Updated README with link in new tab changes * Updated README.adoc * Fix hotspots * Remove period * Change the guide attribution to point to master * Update copyright year for PingResource * Update copyright year for PingResource * Remove mpConfig-1.2 from pom * Remove mpConfig-1.2 from start/name/pom.xml * Update copyright year in README
1 parent c34f522 commit 7fe082a

9 files changed

Lines changed: 113 additions & 106 deletions

File tree

‎README.adoc‎

Lines changed: 71 additions & 44 deletions
Large diffs are not rendered by default.

‎finish/name/pom.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@
3737
<groupId>org.eclipse.microprofile.rest.client</groupId>
3838
<artifactId>microprofile-rest-client-api</artifactId>
3939
</dependency>
40-
<dependency>
41-
<groupId>io.openliberty.features</groupId>
42-
<artifactId>mpConfig-1.2</artifactId>
43-
<type>esa</type>
44-
<scope>provided</scope>
45-
</dependency>
4640
<dependency>
4741
<groupId>junit</groupId>
4842
<artifactId>junit</artifactId>
@@ -116,14 +110,7 @@
116110
<plugin>
117111
<groupId>net.wasdev.wlp.maven.plugins</groupId>
118112
<artifactId>liberty-maven-plugin</artifactId>
119-
<version>2.3</version>
120113
<configuration>
121-
<assemblyArtifact>
122-
<groupId>io.openliberty</groupId>
123-
<artifactId>openliberty-runtime</artifactId>
124-
<version>${version.openliberty-runtime}</version>
125-
<type>zip</type>
126-
</assemblyArtifact>
127114
<configFile>src/main/liberty/config/server.xml</configFile>
128115
<include>usr</include>
129116
<bootstrapProperties>

‎finish/ping/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,7 @@
114114
<plugin>
115115
<groupId>net.wasdev.wlp.maven.plugins</groupId>
116116
<artifactId>liberty-maven-plugin</artifactId>
117-
<version>2.3</version>
118117
<configuration>
119-
<assemblyArtifact>
120-
<groupId>io.openliberty</groupId>
121-
<artifactId>openliberty-runtime</artifactId>
122-
<version>${version.openliberty-runtime}</version>
123-
<type>zip</type>
124-
</assemblyArtifact>
125118
<configFile>src/main/liberty/config/server.xml</configFile>
126119
<include>usr</include>
127120
<bootstrapProperties>

‎finish/ping/src/main/java/io/openliberty/guides/ping/PingResource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 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

‎finish/pom.xml‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55

66
<modelVersion>4.0.0</modelVersion>
7+
8+
<parent>
9+
<groupId>net.wasdev.wlp.maven.parent</groupId>
10+
<artifactId>liberty-maven-app-parent</artifactId>
11+
<version>RELEASE</version>
12+
</parent>
713

814
<groupId>io.openliberty.guides</groupId>
915
<artifactId>kube-demo</artifactId>
@@ -48,12 +54,6 @@
4854
<version>1.0.1</version>
4955
<scope>provided</scope>
5056
</dependency>
51-
<dependency>
52-
<groupId>org.apache.commons</groupId>
53-
<artifactId>commons-lang3</artifactId>
54-
<version>3.0</version>
55-
<scope>compile</scope>
56-
</dependency>
5757
<dependency>
5858
<groupId>junit</groupId>
5959
<artifactId>junit</artifactId>
@@ -63,9 +63,15 @@
6363
<dependency>
6464
<groupId>org.apache.cxf</groupId>
6565
<artifactId>cxf-rt-rs-client</artifactId>
66-
<version>3.1.11</version>
66+
<version>3.2.6</version>
6767
<scope>test</scope>
6868
</dependency>
69+
<dependency>
70+
<groupId>org.apache.commons</groupId>
71+
<artifactId>commons-lang3</artifactId>
72+
<version>3.0</version>
73+
<scope>compile</scope>
74+
</dependency>
6975
<!-- Support for JDK 9 and above -->
7076
<dependency>
7177
<groupId>javax.xml.bind</groupId>
@@ -126,10 +132,13 @@
126132
<plugin>
127133
<groupId>net.wasdev.wlp.maven.plugins</groupId>
128134
<artifactId>liberty-maven-plugin</artifactId>
129-
<version>2.3</version>
130-
<inherited>false</inherited>
131135
<configuration>
132-
<skip>true</skip>
136+
<assemblyArtifact>
137+
<groupId>io.openliberty</groupId>
138+
<artifactId>openliberty-runtime</artifactId>
139+
<version>RELEASE</version>
140+
<type>zip</type>
141+
</assemblyArtifact>
133142
</configuration>
134143
</plugin>
135144
<plugin>

‎start/name/pom.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@
3737
<groupId>org.eclipse.microprofile.rest.client</groupId>
3838
<artifactId>microprofile-rest-client-api</artifactId>
3939
</dependency>
40-
<dependency>
41-
<groupId>io.openliberty.features</groupId>
42-
<artifactId>mpConfig-1.2</artifactId>
43-
<type>esa</type>
44-
<scope>provided</scope>
45-
</dependency>
4640
<dependency>
4741
<groupId>junit</groupId>
4842
<artifactId>junit</artifactId>
@@ -116,14 +110,7 @@
116110
<plugin>
117111
<groupId>net.wasdev.wlp.maven.plugins</groupId>
118112
<artifactId>liberty-maven-plugin</artifactId>
119-
<version>2.3</version>
120113
<configuration>
121-
<assemblyArtifact>
122-
<groupId>io.openliberty</groupId>
123-
<artifactId>openliberty-runtime</artifactId>
124-
<version>${version.openliberty-runtime}</version>
125-
<type>zip</type>
126-
</assemblyArtifact>
127114
<configFile>src/main/liberty/config/server.xml</configFile>
128115
<include>usr</include>
129116
<bootstrapProperties>

‎start/ping/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,7 @@
114114
<plugin>
115115
<groupId>net.wasdev.wlp.maven.plugins</groupId>
116116
<artifactId>liberty-maven-plugin</artifactId>
117-
<version>2.3</version>
118117
<configuration>
119-
<assemblyArtifact>
120-
<groupId>io.openliberty</groupId>
121-
<artifactId>openliberty-runtime</artifactId>
122-
<version>${version.openliberty-runtime}</version>
123-
<type>zip</type>
124-
</assemblyArtifact>
125118
<configFile>src/main/liberty/config/server.xml</configFile>
126119
<include>usr</include>
127120
<bootstrapProperties>

‎start/ping/src/main/java/io/openliberty/guides/ping/PingResource.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 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
@@ -18,6 +18,7 @@
1818
import java.util.Base64;
1919

2020
import javax.enterprise.context.RequestScoped;
21+
import javax.inject.Inject;
2122
import javax.ws.rs.GET;
2223
import javax.ws.rs.Path;
2324
import javax.ws.rs.PathParam;
@@ -26,6 +27,7 @@
2627
import javax.ws.rs.core.MediaType;
2728

2829
import org.apache.commons.lang3.exception.ExceptionUtils;
30+
import org.eclipse.microprofile.config.inject.ConfigProperty;
2931
import org.eclipse.microprofile.rest.client.RestClientBuilder;
3032

3133
import io.openliberty.guides.ping.client.NameClient;

‎start/pom.xml‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55

66
<modelVersion>4.0.0</modelVersion>
7+
8+
<parent>
9+
<groupId>net.wasdev.wlp.maven.parent</groupId>
10+
<artifactId>liberty-maven-app-parent</artifactId>
11+
<version>RELEASE</version>
12+
</parent>
713

814
<groupId>io.openliberty.guides</groupId>
915
<artifactId>kube-demo</artifactId>
@@ -48,12 +54,6 @@
4854
<version>1.0.1</version>
4955
<scope>provided</scope>
5056
</dependency>
51-
<dependency>
52-
<groupId>org.apache.commons</groupId>
53-
<artifactId>commons-lang3</artifactId>
54-
<version>3.0</version>
55-
<scope>compile</scope>
56-
</dependency>
5757
<dependency>
5858
<groupId>junit</groupId>
5959
<artifactId>junit</artifactId>
@@ -63,9 +63,15 @@
6363
<dependency>
6464
<groupId>org.apache.cxf</groupId>
6565
<artifactId>cxf-rt-rs-client</artifactId>
66-
<version>3.1.11</version>
66+
<version>3.2.6</version>
6767
<scope>test</scope>
6868
</dependency>
69+
<dependency>
70+
<groupId>org.apache.commons</groupId>
71+
<artifactId>commons-lang3</artifactId>
72+
<version>3.0</version>
73+
<scope>compile</scope>
74+
</dependency>
6975
<!-- Support for JDK 9 and above -->
7076
<dependency>
7177
<groupId>javax.xml.bind</groupId>
@@ -126,10 +132,13 @@
126132
<plugin>
127133
<groupId>net.wasdev.wlp.maven.plugins</groupId>
128134
<artifactId>liberty-maven-plugin</artifactId>
129-
<version>2.3</version>
130-
<inherited>false</inherited>
131135
<configuration>
132-
<skip>true</skip>
136+
<assemblyArtifact>
137+
<groupId>io.openliberty</groupId>
138+
<artifactId>openliberty-runtime</artifactId>
139+
<version>RELEASE</version>
140+
<type>zip</type>
141+
</assemblyArtifact>
133142
</configuration>
134143
</plugin>
135144
<plugin>

0 commit comments

Comments
 (0)