Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 13 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
id 'org.beryx.jlink' version '2.25.0'
id 'jacoco'
id 'net.ltgt.errorprone' version '2.0.2'
id 'org.sonarqube' version '3.3'
id 'org.sonarqube' version '3.4.0.2513'
id 'org.ysb33r.cloudci' version '3.0.0'
id 'com.github.hierynomus.license' version '0.16.1'
id 'io.miret.etienne.sass' version '1.4.1'
Expand Down Expand Up @@ -51,10 +51,10 @@ dependencies {
testImplementation 'org.hamcrest:hamcrest:2.2'

// Mockito https://mvnrepository.com/artifact/org.mockito/mockito-inline
testImplementation 'org.mockito:mockito-inline:4.6.1'
testImplementation 'org.mockito:mockito-inline:4.7.0'

// Mockito-Junit https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
testImplementation 'org.mockito:mockito-junit-jupiter:4.6.1'
testImplementation 'org.mockito:mockito-junit-jupiter:4.7.0'

// Commons Collections https://mvnrepository.com/artifact/org.apache.commons/commons-collections4
implementation 'org.apache.commons:commons-collections4:4.4'
Expand All @@ -77,22 +77,25 @@ dependencies {
implementation 'com.google.code.gson:gson:2.9.1'

// Jersey REST client https://mvnrepository.com/artifact/org.glassfish.jersey.core/jersey-client
implementation 'org.glassfish.jersey.core:jersey-client:2.32'
implementation 'org.glassfish.jersey.core:jersey-client:3.0.6'

// HK2 InjectionManager https://mvnrepository.com/artifact/org.glassfish.jersey.inject/jersey-hk2
implementation 'org.glassfish.jersey.inject:jersey-hk2:2.32'
implementation 'org.glassfish.jersey.inject:jersey-hk2:3.0.6'

// Jersey Multipart https://mvnrepository.com/artifact/org.glassfish.jersey.media/jersey-media-multipart
implementation 'org.glassfish.jersey.media:jersey-media-multipart:2.32'
implementation 'org.glassfish.jersey.media:jersey-media-multipart:3.0.6'

// Jaxb runtime https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime
implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.0'

// Mimepull https://mvnrepository.com/artifact/org.jvnet.mimepull/mimepull
implementation 'org.jvnet.mimepull:mimepull:1.9.13'
implementation 'org.jvnet.mimepull:mimepull:1.10.0'

// Xml bind https://mvnrepository.com/artifact/jakarta.xml.bind/jakarta.xml.bind-api
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.3'
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'

// Jaxb runtime https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime
implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.3'
// https://mvnrepository.com/artifact/jakarta.ws.rs/jakarta.ws.rs-api
implementation 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
}

javafx {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
import javafx.util.Pair;
import org.glassfish.jersey.media.multipart.MultiPartFeature;

import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.ClientBuilder;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package com.github.mfl28.boundingboxeditor.model.io.restclients;

import javax.ws.rs.client.Client;
import jakarta.ws.rs.client.Client;
import java.io.InputStream;
import java.security.InvalidParameterException;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
import com.google.gson.*;
import com.google.gson.reflect.TypeToken;

import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.MessageBodyWriter;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.ext.MessageBodyReader;
import jakarta.ws.rs.ext.MessageBodyWriter;
import java.io.*;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
import org.glassfish.jersey.media.multipart.MultiPart;
import org.glassfish.jersey.media.multipart.file.StreamDataBodyPart;

import javax.ws.rs.ProcessingException;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.Invocation;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.ProcessingException;
import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.Entity;
import jakarta.ws.rs.client.Invocation;
import jakarta.ws.rs.client.WebTarget;
import jakarta.ws.rs.core.GenericType;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import java.io.IOException;
import java.io.InputStream;
import java.net.ConnectException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -363,11 +363,11 @@ && getItem() instanceof Toggle && ((Toggle) getItem()).isSelected()) {

@SuppressWarnings("UnnecessaryLambda")
private ChangeListener<Boolean> createBoundingShapeVisibilityListener() {
return ((observable, oldValue, newValue) -> {
return (observable, oldValue, newValue) -> {
if(!Boolean.TRUE.equals(newValue)) {
contextMenu.hide();
}
});
};
}

private MenuItem createDeleteBoundingShapeMenuItem() {
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
requires com.google.gson;
requires jersey.client;
requires jersey.common;
requires java.ws.rs;
requires jakarta.ws.rs;
requires jakarta.inject;
requires jakarta.annotation;
requires jakarta.activation;
requires javafx.swing;
requires jersey.media.multipart;
requires org.jvnet.mimepull;
Expand All @@ -39,6 +42,6 @@
opens com.github.mfl28.boundingboxeditor.model.io to javafx.base, com.google.gson;
opens com.github.mfl28.boundingboxeditor.model.io.results to javafx.base, com.google.gson;
opens com.github.mfl28.boundingboxeditor.model.io.restclients to javafx.base, com.google.gson;
exports com.github.mfl28.boundingboxeditor.model.io.restclients to hk2.locator;
exports com.github.mfl28.boundingboxeditor.model.io.restclients to org.glassfish.hk2.locator;
exports com.github.mfl28.boundingboxeditor to javafx.graphics;
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
import org.testfx.matcher.control.TextInputControlMatchers;
import org.testfx.util.WaitForAsyncUtils;

import javax.ws.rs.ProcessingException;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.Invocation;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.ProcessingException;
import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.ClientBuilder;
import jakarta.ws.rs.client.Invocation;
import jakarta.ws.rs.client.WebTarget;
import jakarta.ws.rs.core.GenericType;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import java.io.File;
import java.net.ConnectException;
import java.util.ArrayList;
Expand Down