Skip to content
Snippets Groups Projects
Commit 119e38c0 authored by Emmanuel Bruno's avatar Emmanuel Bruno
Browse files

upgrades jdk & mvn versions.

parent 0c2a9d68
Branches
No related tags found
No related merge requests found
......@@ -13,5 +13,5 @@ docker run \
--rm \
--env PUID="$(id -u)" -e PGID="$(id -g)" \
--env MAVEN_CONFIG=/var/maven/.m2 \
brunoe/maven:3.6.3-jdk-15 \
brunoe/maven:3.8.1-jdk-16 \
runuser --user user --group user -- mvn -B -e -T 1C -Duser.home=/var/maven --settings /usr/src/mymaven/.github/ci-settings.xml "$@"
\ No newline at end of file
......@@ -31,6 +31,21 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
<version>4.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>2.0.1</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
......@@ -61,6 +76,7 @@
<version>3.0.0</version>
<scope>runtime</scope>
</dependency>
<!--dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy</artifactId>
......@@ -139,14 +155,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.11</version>
<version>3.12.0</version>
<scope>test</scope>
</dependency>
......@@ -340,7 +356,7 @@
<version>3.5.4</version>
</requireMavenVersion>
<requireJavaVersion>
<version>15</version>
<version>16</version>
</requireJavaVersion>
<DependencyConvergence />
</rules>
......
### Get a Hello message
GET http://localhost:9998/mylibrary/library/hello
Accept: text/plain
### Get the whole library
GET http://localhost:9998/mylibrary/library
### Init the database with two authors
......
......@@ -30,6 +30,7 @@ public class LibraryResource {
*/
@SuppressWarnings("SameReturnValue")
@GET
@Path("hello")
@Produces(MediaType.TEXT_PLAIN)
public String sayHello() {
return "hello";
......
......@@ -75,7 +75,7 @@ public class ServerIT {
@Test
public void testHello() {
String hello = webTarget.path("library").request(MediaType.TEXT_PLAIN).get(String.class);
String hello = webTarget.path("library/hello").request(MediaType.TEXT_PLAIN).get(String.class);
assertEquals("hello", hello);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment