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 \ ...@@ -13,5 +13,5 @@ docker run \
--rm \ --rm \
--env PUID="$(id -u)" -e PGID="$(id -g)" \ --env PUID="$(id -u)" -e PGID="$(id -g)" \
--env MAVEN_CONFIG=/var/maven/.m2 \ --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 "$@" 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 @@ ...@@ -31,6 +31,21 @@
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </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> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>
...@@ -61,6 +76,7 @@ ...@@ -61,6 +76,7 @@
<version>3.0.0</version> <version>3.0.0</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<!--dependency> <!--dependency>
<groupId>org.eclipse.persistence</groupId> <groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy</artifactId> <artifactId>org.eclipse.persistence.moxy</artifactId>
...@@ -139,14 +155,14 @@ ...@@ -139,14 +155,14 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.13.1</version> <version>4.13.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 --> <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>3.11</version> <version>3.12.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
...@@ -340,7 +356,7 @@ ...@@ -340,7 +356,7 @@
<version>3.5.4</version> <version>3.5.4</version>
</requireMavenVersion> </requireMavenVersion>
<requireJavaVersion> <requireJavaVersion>
<version>15</version> <version>16</version>
</requireJavaVersion> </requireJavaVersion>
<DependencyConvergence /> <DependencyConvergence />
</rules> </rules>
......
### Get a Hello message ### Get a Hello message
GET http://localhost:9998/mylibrary/library/hello
Accept: text/plain
### Get the whole library
GET http://localhost:9998/mylibrary/library GET http://localhost:9998/mylibrary/library
### Init the database with two authors ### Init the database with two authors
......
...@@ -30,6 +30,7 @@ public class LibraryResource { ...@@ -30,6 +30,7 @@ public class LibraryResource {
*/ */
@SuppressWarnings("SameReturnValue") @SuppressWarnings("SameReturnValue")
@GET @GET
@Path("hello")
@Produces(MediaType.TEXT_PLAIN) @Produces(MediaType.TEXT_PLAIN)
public String sayHello() { public String sayHello() {
return "hello"; return "hello";
......
...@@ -75,7 +75,7 @@ public class ServerIT { ...@@ -75,7 +75,7 @@ public class ServerIT {
@Test @Test
public void testHello() { 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); assertEquals("hello", hello);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment