Skip to content

Upgrade dependencies to be compatible with Jakarta EE 9 #2

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

Open
mederel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade dependencies to be compatible with Jakarta EE 9 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@ Add this dependency to your `pom.xml`
<dependency>
<groupId>org.valid4j</groupId>
<artifactId>http-matchers</artifactId>
<version>1.1</version>
<version>2.0</version>
</dependency>

The [JAX-RS client API (javax.ws.rs.client)](https://docs.oracle.com/javaee/7/api/index.html?javax/ws/rs/client/package-summary.html)
can be downloaded from here, but is usually bundled with the client implementation you are using, e.g Jersey.


<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0.1</version>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.1.0</version>
</dependency>

## Usage guide
Expand Down
89 changes: 66 additions & 23 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,14 @@

<groupId>org.valid4j</groupId>
<artifactId>http-matchers</artifactId>
<version>1.2-SNAPSHOT</version>
<version>2.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>${project.groupId}:${project.artifactId}</name>
<url>https://github.com/valid4j/http-matchers</url>
<description>A set of hamcrest-matchers for JAX-RS</description>
<inceptionYear>2016</inceptionYear>

<prerequisites>
<maven>2.2.1</maven>
</prerequisites>

<licenses>
<license>
<name>Apache Software License, Version 2.0</name>
Expand All @@ -42,6 +38,11 @@
<name>Göran Persson</name>
<email>guranxp@gmail.com</email>
</developer>
<developer>
<id>mederel</id>
<name>Emile de Weerd</name>
<email>emile@deweerd.fr</email>
</developer>
</developers>

<scm>
Expand Down Expand Up @@ -69,21 +70,33 @@
<properties>
<github.global.server>github</github.global.server>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.version>1.7</jdk.version>
<hamcrest.version>1.3</hamcrest.version>
<javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version>
<jdk.version>17</jdk.version>
<hamcrest.version>2.2</hamcrest.version>
<jakartaee.version>3.1.0</jakartaee.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.9.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>${hamcrest.version}</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>${javax.ws.rs-api.version}</version>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jakartaee.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -95,31 +108,41 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.2</version>
<version>1.4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.22.1</version>
<version>3.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-testing</artifactId>
<version>0.9.2</version>
<version>4.0.0-beta.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
<version>31.1-jre</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -129,7 +152,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<version>3.10.1</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<source>${jdk.version}</source>
Expand All @@ -145,7 +168,27 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<version>3.0.0-M7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.8</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand All @@ -158,7 +201,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -171,7 +214,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>3.4.1</version>
<configuration>
<quiet>true</quiet>
</configuration>
Expand All @@ -187,7 +230,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/valid4j/matchers/http/HasContentLengthMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.hamcrest.FeatureMatcher;
import org.hamcrest.Matcher;

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

class HasContentLengthMatcher extends FeatureMatcher<Response, Integer> {
public HasContentLengthMatcher(Matcher<? super Integer> lengthMatcher) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/valid4j/matchers/http/HasContentTypeMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import org.hamcrest.FeatureMatcher;
import org.hamcrest.Matcher;

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

class HasContentTypeMatcher extends FeatureMatcher<Response, MediaType> {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/valid4j/matchers/http/HasCookieMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import org.hamcrest.Description;
import org.hamcrest.TypeSafeMatcher;

import javax.ws.rs.core.NewCookie;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.core.NewCookie;
import jakarta.ws.rs.core.Response;
import java.util.Map;

class HasCookieMatcher extends TypeSafeMatcher<Response> {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/valid4j/matchers/http/HasCookieWithValueMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeDiagnosingMatcher;

import javax.ws.rs.core.NewCookie;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.core.NewCookie;
import jakarta.ws.rs.core.Response;
import java.util.Map;

class HasCookieWithValueMatcher extends TypeSafeDiagnosingMatcher<Response> {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/valid4j/matchers/http/HasEntityMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.hamcrest.Description;
import org.hamcrest.TypeSafeMatcher;

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

class HasEntityMatcher extends TypeSafeMatcher<Response> {
public void describeTo(Description description) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/valid4j/matchers/http/HasEntityWithValueMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeDiagnosingMatcher;

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

class HasEntityWithValueMatcher<T> extends TypeSafeDiagnosingMatcher<Response> {
private final Class<T> entityClass;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/valid4j/matchers/http/HasGenericEntityWithValueMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeDiagnosingMatcher;

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

class HasGenericEntityWithValueMatcher<T> extends TypeSafeDiagnosingMatcher<Response> {
private final GenericType<T> entityType;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/valid4j/matchers/http/HasHeaderMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import org.hamcrest.Description;
import org.hamcrest.TypeSafeDiagnosingMatcher;

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

class HasHeaderMatcher extends TypeSafeDiagnosingMatcher<Response> {
private final String headerName;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/valid4j/matchers/http/HasHeaderWithValueMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeDiagnosingMatcher;

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

class HasHeaderWithValueMatcher extends TypeSafeDiagnosingMatcher<Response> {
private final String headerName;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/valid4j/matchers/http/HasHeaderWithValuesMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeDiagnosingMatcher;

import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.Response;
import java.util.List;

class HasHeaderWithValuesMatcher extends TypeSafeDiagnosingMatcher<Response> {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/valid4j/matchers/http/HasLastModifiedDate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.hamcrest.FeatureMatcher;
import org.hamcrest.Matcher;

import javax.ws.rs.core.Response;
import jakarta.ws.rs.core.Response;
import java.util.Date;

class HasLastModifiedDate extends FeatureMatcher<Response, Date> {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/valid4j/matchers/http/HasLocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.hamcrest.FeatureMatcher;
import org.hamcrest.Matcher;

import javax.ws.rs.core.Response;
import jakarta.ws.rs.core.Response;
import java.net.URI;

class HasLocation extends FeatureMatcher<Response, URI> {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/valid4j/matchers/http/HasStatusCodeMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.hamcrest.FeatureMatcher;
import org.hamcrest.Matcher;

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

class HasStatusCodeMatcher extends FeatureMatcher<Response, Integer> {
public HasStatusCodeMatcher(Matcher<Integer> statusCodeMatcher) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/valid4j/matchers/http/HasStatusMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.hamcrest.Description;
import org.hamcrest.TypeSafeMatcher;

import javax.ws.rs.core.Response;
import jakarta.ws.rs.core.Response;
import java.util.Objects;

class HasStatusMatcher extends TypeSafeMatcher<Response> {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/valid4j/matchers/http/HttpResponseMatchers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import org.hamcrest.Matcher;

import javax.ws.rs.core.*;
import javax.ws.rs.core.Response.Status.Family;
import javax.ws.rs.core.Response.StatusType;
import jakarta.ws.rs.core.*;
import jakarta.ws.rs.core.Response.Status.Family;
import jakarta.ws.rs.core.Response.StatusType;
import java.net.URI;
import java.util.Date;
import java.util.Locale;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/valid4j/matchers/http/MediaTypeCompatibleWithMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.hamcrest.Description;
import org.hamcrest.TypeSafeMatcher;

import javax.ws.rs.core.MediaType;
import jakarta.ws.rs.core.MediaType;

class MediaTypeCompatibleWithMatcher extends TypeSafeMatcher<MediaType> {
private final MediaType compatibleMediaType;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/valid4j/matchers/http/NewCookieMatchers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;

import javax.ws.rs.core.NewCookie;
import jakarta.ws.rs.core.NewCookie;
import java.util.Date;

import static org.hamcrest.CoreMatchers.equalTo;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/valid4j/matchers/http/OfFamilyMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.hamcrest.Description;
import org.hamcrest.TypeSafeMatcher;

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

class OfFamilyMatcher extends TypeSafeMatcher<Integer> {
private final Response.Status.Family family;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/valid4j/matchers/http/OfLanguageMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.hamcrest.FeatureMatcher;
import org.hamcrest.Matcher;

import javax.ws.rs.core.Response;
import jakarta.ws.rs.core.Response;
import java.util.Locale;

class OfLanguageMatcher extends FeatureMatcher<Response, Locale> {
Expand Down
Loading