Skip to content

Commit 7d28fa6

Browse files
gkwan-ibmt27gupta
gkwan-ibm
and
t27gupta
authored
Version update mp5 (#148)
* update versions * update versions * linter fix * linter fix * updated readme * updated readme * updated readme * updated readme * Update README.adoc * Update pom.xml * Update pom.xml Co-authored-by: t27gupta <[email protected]>
1 parent ec679a1 commit 7d28fa6

File tree

14 files changed

+139
-251
lines changed

14 files changed

+139
-251
lines changed

‎README.adoc‎

Lines changed: 75 additions & 189 deletions
Large diffs are not rendered by default.

‎finish/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
<dependency>
2121
<groupId>jakarta.platform</groupId>
2222
<artifactId>jakarta.jakartaee-api</artifactId>
23-
<version>8.0.0</version>
23+
<version>9.1.0</version>
2424
<scope>provided</scope>
2525
</dependency>
2626
<dependency>
2727
<groupId>org.eclipse.microprofile</groupId>
2828
<!-- tag::microprofile[] -->
2929
<artifactId>microprofile</artifactId>
3030
<!-- end::microprofile[] -->
31-
<version>4.1</version>
31+
<version>5.0</version>
3232
<type>pom</type>
3333
<scope>provided</scope>
3434
</dependency>
@@ -52,7 +52,7 @@
5252
<plugin>
5353
<groupId>com.github.eirslett</groupId>
5454
<artifactId>frontend-maven-plugin</artifactId>
55-
<version>1.12.0</version>
55+
<version>1.12.1</version>
5656
<configuration>
5757
<!-- tag::working-dir[] -->
5858
<workingDirectory>src/main/frontend</workingDirectory>

‎finish/src/main/java/io/openliberty/guides/consumingrest/service/ArtistApplication.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
// tag::comment[]
1+
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2017 IBM Corporation and others.
3+
* Copyright (c) 2017, 2022 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
77
* http://www.eclipse.org/legal/epl-v10.html
88
*
99
* Contributors:
10-
* IBM Corporation - initial API and implementation
10+
* IBM Corporation - Initial implementation
1111
*******************************************************************************/
12-
// end::comment[]
12+
// end::copyright[]
1313
package io.openliberty.guides.consumingrest.service;
1414

15-
import javax.ws.rs.ApplicationPath;
16-
import javax.ws.rs.core.Application;
15+
import jakarta.ws.rs.ApplicationPath;
16+
import jakarta.ws.rs.core.Application;
1717

1818
@ApplicationPath("artists")
1919
public class ArtistApplication extends Application {

‎finish/src/main/java/io/openliberty/guides/consumingrest/service/ArtistResource.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
// tag::comment[]
1+
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2017 IBM Corporation and others.
3+
* Copyright (c) 2017, 2022 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
77
* http://www.eclipse.org/legal/epl-v10.html
88
*
99
* Contributors:
10-
* IBM Corporation - initial API and implementation
10+
* IBM Corporation - Initial implementation
1111
*******************************************************************************/
12-
// end::comment[]
12+
// end::copyright[]
1313
package io.openliberty.guides.consumingrest.service;
1414

15-
import javax.json.JsonArray;
16-
import javax.ws.rs.GET;
17-
import javax.ws.rs.Path;
18-
import javax.ws.rs.Produces;
19-
import javax.ws.rs.core.MediaType;
15+
import jakarta.json.JsonArray;
16+
import jakarta.ws.rs.GET;
17+
import jakarta.ws.rs.Path;
18+
import jakarta.ws.rs.Produces;
19+
import jakarta.ws.rs.core.MediaType;
2020

2121
@Path("")
2222
public class ArtistResource {
23-
23+
2424
@GET
2525
@Produces(MediaType.APPLICATION_JSON)
2626
public JsonArray getArtists() {

‎finish/src/main/java/io/openliberty/guides/consumingrest/service/Reader.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
// tag::comment[]
1+
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2017 IBM Corporation and others.
3+
* Copyright (c) 2017, 2022 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
77
* http://www.eclipse.org/legal/epl-v10.html
88
*
99
* Contributors:
10-
* IBM Corporation - initial API and implementation
10+
* IBM Corporation - Initial implementation
1111
*******************************************************************************/
12-
// end::comment[]
12+
// end::copyright[]
1313
package io.openliberty.guides.consumingrest.service;
1414

1515
import java.io.FileInputStream;
1616
import java.io.FileNotFoundException;
1717
import java.io.InputStream;
1818

19-
import javax.json.Json;
20-
import javax.json.JsonArray;
19+
import jakarta.json.Json;
20+
import jakarta.json.JsonArray;
2121

2222
public class Reader {
23-
23+
2424
public static JsonArray getArtists() {
25-
final String PATH = "./../../../../../../src/resources/artists.json";
25+
final String jsonFile = "./../../../../../../src/resources/artists.json";
2626
try {
2727
InputStream fis;
28-
fis = new FileInputStream(PATH);
28+
fis = new FileInputStream(jsonFile);
2929
return Json.createReader(fis).readArray();
3030
} catch (FileNotFoundException e) {
31-
System.err.println("File does not exist: " + PATH);
31+
System.err.println("File does not exist: " + jsonFile);
3232
return null;
3333
}
3434
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<server description="Sample Liberty server">
22

33
<featureManager>
4-
<feature>jaxrs-2.1</feature>
5-
<feature>jsonp-1.1</feature>
4+
<feature>restfulWS-3.0</feature>
5+
<feature>jsonb-2.0</feature>
6+
<feature>jsonp-2.0</feature>
67
</featureManager>
78

89
<variable name="default.http.port" defaultValue="9080"/>

‎start/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
<dependency>
2121
<groupId>jakarta.platform</groupId>
2222
<artifactId>jakarta.jakartaee-api</artifactId>
23-
<version>8.0.0</version>
23+
<version>9.1.0</version>
2424
<scope>provided</scope>
2525
</dependency>
2626
<dependency>
2727
<groupId>org.eclipse.microprofile</groupId>
2828
<!-- tag::microprofile[] -->
2929
<artifactId>microprofile</artifactId>
3030
<!-- end::microprofile[] -->
31-
<version>4.1</version>
31+
<version>5.0</version>
3232
<type>pom</type>
3333
<scope>provided</scope>
3434
</dependency>
@@ -51,7 +51,7 @@
5151
<plugin>
5252
<groupId>com.github.eirslett</groupId>
5353
<artifactId>frontend-maven-plugin</artifactId>
54-
<version>1.12.0</version>
54+
<version>1.12.1</version>
5555
<configuration>
5656
<workingDirectory>src/main/frontend</workingDirectory>
5757
</configuration>

‎start/src/main/java/io/openliberty/guides/consumingrest/service/ArtistApplication.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
// tag::comment[]
1+
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2017 IBM Corporation and others.
3+
* Copyright (c) 2017, 2022 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
77
* http://www.eclipse.org/legal/epl-v10.html
88
*
99
* Contributors:
10-
* IBM Corporation - initial API and implementation
10+
* IBM Corporation - Initial implementation
1111
*******************************************************************************/
12-
// end::comment[]
12+
// end::copyright[]
1313
package io.openliberty.guides.consumingrest.service;
1414

15-
import javax.ws.rs.ApplicationPath;
16-
import javax.ws.rs.core.Application;
15+
import jakarta.ws.rs.ApplicationPath;
16+
import jakarta.ws.rs.core.Application;
1717

1818
@ApplicationPath("artists")
1919
public class ArtistApplication extends Application {

‎start/src/main/java/io/openliberty/guides/consumingrest/service/ArtistResource.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
// tag::comment[]
1+
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2017 IBM Corporation and others.
3+
* Copyright (c) 2017, 2022 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
77
* http://www.eclipse.org/legal/epl-v10.html
88
*
99
* Contributors:
10-
* IBM Corporation - initial API and implementation
10+
* IBM Corporation - Initial implementation
1111
*******************************************************************************/
12-
// end::comment[]
12+
// end::copyright[]
1313
package io.openliberty.guides.consumingrest.service;
1414

15-
import javax.json.JsonArray;
16-
import javax.ws.rs.GET;
17-
import javax.ws.rs.Path;
18-
import javax.ws.rs.Produces;
19-
import javax.ws.rs.core.MediaType;
15+
import jakarta.json.JsonArray;
16+
import jakarta.ws.rs.GET;
17+
import jakarta.ws.rs.Path;
18+
import jakarta.ws.rs.Produces;
19+
import jakarta.ws.rs.core.MediaType;
2020

2121
@Path("")
2222
public class ArtistResource {
23-
23+
2424
@GET
2525
@Produces(MediaType.APPLICATION_JSON)
2626
public JsonArray getArtists() {

‎start/src/main/java/io/openliberty/guides/consumingrest/service/Reader.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
// tag::comment[]
1+
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2017 IBM Corporation and others.
3+
* Copyright (c) 2017, 2022 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
77
* http://www.eclipse.org/legal/epl-v10.html
88
*
99
* Contributors:
10-
* IBM Corporation - initial API and implementation
10+
* IBM Corporation - Initial implementation
1111
*******************************************************************************/
12-
// end::comment[]
12+
// end::copyright[]
1313
package io.openliberty.guides.consumingrest.service;
1414

1515
import java.io.FileInputStream;
1616
import java.io.FileNotFoundException;
1717
import java.io.InputStream;
1818

19-
import javax.json.Json;
20-
import javax.json.JsonArray;
19+
import jakarta.json.Json;
20+
import jakarta.json.JsonArray;
2121

2222
public class Reader {
23-
23+
2424
public static JsonArray getArtists() {
25-
final String PATH = "./../../../../../../src/resources/artists.json";
25+
final String jsonFile = "./../../../../../../src/resources/artists.json";
2626
try {
2727
InputStream fis;
28-
fis = new FileInputStream(PATH);
28+
fis = new FileInputStream(jsonFile);
2929
return Json.createReader(fis).readArray();
3030
} catch (FileNotFoundException e) {
31-
System.err.println("File does not exist: " + PATH);
31+
System.err.println("File does not exist: " + jsonFile);
3232
return null;
3333
}
3434
}

0 commit comments

Comments
 (0)