Skip to content

Upgrade dependencies and their versions #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Upgrade dependencies and their versions #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
99f0cef
WIP_GUAVA
pathob Feb 29, 2024
ba1a2bc
WIP_VALIDATION_API
pathob Feb 29, 2024
61db3ea
WIP_JACKSON
pathob Feb 29, 2024
97fd85d
WIP_WS_RS_AND_APACHE_WINK
pathob Feb 29, 2024
83b6224
WIP_JUNIT
pathob Feb 29, 2024
f58297f
WIP
pathob Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/CODE_CONVENTIONS.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ common API for all ConfAPI products.

==== Annotations

Resource interfaces have to contain all necessary `javax.ws.rs` and Swagger annotations (used for automated
Resource interfaces have to contain all necessary `jakarta.ws.rs` and Swagger annotations (used for automated
documentation generation).
The only exception is the `@Path` annotation for the resource class itself as otherwise the framework will try to
instantiate the resource interface.
Expand Down Expand Up @@ -189,7 +189,7 @@ public class EntitiesResourceImpl implements EntitiesResource {

@Inject
public EntitiesResourceImpl(EntitiesService entitiesService) {
this.entitiesService = checkNotNull(entitiesService);
this.entitiesService = entitiesService;
}

@Override
Expand Down
178 changes: 58 additions & 120 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>

<artifactId>confapi-commons</artifactId>
<version>0.3.1-SNAPSHOT</version>
<version>0.4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>ConfAPI Commons</name>
Expand Down Expand Up @@ -56,25 +56,19 @@
</developers>

<properties>
<commons-lang3.version>3.9</commons-lang3.version>
<guava.version>30.0-jre</guava.version>
<hamcrest.version>2.2</hamcrest.version>
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
<jackson-jaxrs.version>1.9.13-atlassian-5</jackson-jaxrs.version>
<javax.el-api.version>2.2.4</javax.el-api.version>
<javax.inject.version>1</javax.inject.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<jersey-client.version>1.12</jersey-client.version>
<jsr311-api.version>1.1.1</jsr311-api.version>
<junit.version>4.13.1</junit.version>
<log4j.version>2.17.1</log4j.version>
<lombok.version>1.18.28</lombok.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
<jackson.version>2.16.1</jackson.version>
<jakarta.el-api.version>6.0.0-M2</jakarta.el-api.version>
<jakarta.validation-api.version>3.1.0-M1</jakarta.validation-api.version>
<jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
<jersey-client.version>3.1.5</jersey-client.version>
<junit.version>5.10.2</junit.version>
<lombok.version>1.18.30</lombok.version>
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
<mockito.version>2.28.2</mockito.version>
<spring-context.version>5.2.4.RELEASE</spring-context.version>
<swagger.version>2.1.1</swagger.version>
<validation-api.version>1.1.0.Final</validation-api.version>
<wink-client.version>1.4</wink-client.version>
<mockito.version>5.10.0</mockito.version>
<spring-context.version>5.3.32</spring-context.version>
<swagger.version>2.2.20</swagger.version>
<!-- Compiler must be 8 so that the plugin can run on Atlassian instances using Java 8 -->
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
Expand All @@ -84,6 +78,7 @@

<dependencyManagement>
<dependencies>

<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
Expand All @@ -97,9 +92,11 @@
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
Expand All @@ -109,13 +106,13 @@
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>${hamcrest.version}</version>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.version}</version>
</dependency>

<dependency>
<groupId>com.sun.jersey</groupId>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey-client.version}</version>
</dependency>
Expand All @@ -133,47 +130,45 @@
</dependency>

<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<version>${javax.el-api.version}</version>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>${jakarta.el-api.version}</version>
</dependency>

<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>javax.el</artifactId>
<version>${javax.el-api.version}</version>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>${jakarta.validation-api.version}</version>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
<scope>test</scope>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
<scope>test</scope>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jakarta.ws.rs-api.version}</version>
</dependency>

<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-client</artifactId>
<version>${wink-client.version}</version>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring-context.version}</version>
</dependency>

<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>${jackson-jaxrs.version}</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>${jackson-jaxrs.version}</version>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
</dependency>

</dependencies>
Expand All @@ -199,79 +194,46 @@
<!-- provided dependencies -->

<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>${javax.inject.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>${jsr311-api.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${validation-api.version}</version>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring-context.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<scope>provided</scope>
</dependency>

<!-- needs to be of scope 'provided' as implicitly used for 'checkNotNull' -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<scope>provided</scope>
</dependency>

<!-- test dependencies -->

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>

Expand All @@ -282,13 +244,13 @@
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.sun.jersey</groupId>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<scope>test</scope>
</dependency>
Expand All @@ -306,32 +268,8 @@
</dependency>

<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>javax.el</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-client</artifactId>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<scope>test</scope>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/de/aservo/confapi/commons/exception/BadRequestException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.aservo.confapi.commons.exception;

import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Response;

import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;

public class BadRequestException extends WebApplicationException {

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/de/aservo/confapi/commons/exception/InternalServerErrorException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.aservo.confapi.commons.exception;

import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Response;

import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;

public class InternalServerErrorException extends WebApplicationException {

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/de/aservo/confapi/commons/exception/NotFoundException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package de.aservo.confapi.commons.exception;

import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Response;

import static javax.ws.rs.core.Response.Status.NOT_FOUND;
import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;

public class NotFoundException extends WebApplicationException {

private static final Response.Status STATUS = NOT_FOUND;

public NotFoundException(String message) {
super(new Exception(message), STATUS);
super(message, STATUS);
}

public NotFoundException(Throwable cause) {
super(cause, STATUS);
super(cause.getMessage(), STATUS);
}

}
6 changes: 3 additions & 3 deletions src/main/java/de/aservo/confapi/commons/exception/ServiceUnavailableException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.aservo.confapi.commons.exception;

import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Response;

import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE;
import static jakarta.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE;

public class ServiceUnavailableException extends WebApplicationException {

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/de/aservo/confapi/commons/exception/mapper/JsonMappingExceptionMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package de.aservo.confapi.commons.exception.mapper;

import com.fasterxml.jackson.databind.JsonMappingException;
import de.aservo.confapi.commons.model.ErrorCollection;
import org.codehaus.jackson.map.JsonMappingException;

import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.ext.ExceptionMapper;
import jakarta.ws.rs.ext.Provider;

@Provider
public class JsonMappingExceptionMapper implements ExceptionMapper<JsonMappingException> {
Expand Down
Loading