Skip to content

Commit

Permalink
Merge pull request #19 from spaship/fix/pod-vulnerability
Browse files Browse the repository at this point in the history
feat(sidecar) : quarkus platform updated, vertx-web replaced with reactive-routes & jakarta
  • Loading branch information
arkaprovob committed Jan 16, 2024
2 parents 43d5297 + 6711669 commit acecd46
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 14 deletions.
10 changes: 8 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>2.16.3.Final</quarkus.platform.version>
<quarkus.platform.version>3.6.4</quarkus.platform.version>
<skipITs>true</skipITs>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
</properties>
Expand Down Expand Up @@ -43,12 +43,18 @@

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-web</artifactId>
<artifactId>quarkus-reactive-routes</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jackson</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/spaship/sidecar/api/SpaUploadController.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import java.util.Objects;

@Path("upload")
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/spaship/sidecar/api/SyncController.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/spaship/sidecar/config/RestConfig.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.spaship.sidecar.config;

import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;
import jakarta.ws.rs.ApplicationPath;
import jakarta.ws.rs.core.Application;

@ApplicationPath("/api")
public class RestConfig extends Application {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import io.spaship.sidecar.type.ErrorResponse;

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;
import java.util.Objects;

@Provider
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.event.Observes;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/spaship/sidecar/sync/SyncService.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.enterprise.event.Observes;
import jakarta.enterprise.event.Observes;
import java.io.File;
import java.io.IOException;
import java.net.URL;
Expand Down

0 comments on commit acecd46

Please sign in to comment.