Upgrade to Quarkus 2.5.4.Final (#172)

* Save changes * Delete Not working test, assert() never works * Upgrade commons-rest version
migtools · Jan 10, 2022 · d16fcfd · d16fcfd
1 parent 1026362
commit d16fcfd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 145 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,12 +16,12 @@
     <maven.compiler.target>11</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <quarkus.platform.version>1.13.1.Final</quarkus.platform.version>
+    <quarkus.platform.version>2.5.4.Final</quarkus.platform.version>
     <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
 <!--    <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>-->
 <!--    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>-->
     <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-    <quarkus-plugin.version>1.13.1.Final</quarkus-plugin.version>
+    <quarkus-plugin.version>2.5.4.Final</quarkus-plugin.version>
     <surefire-plugin.version>2.22.2</surefire-plugin.version>
     <testcontainers.version>1.16.0</testcontainers.version>
     <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.github.konveyor.tackle-commons-rest</groupId>
       <artifactId>commons-rest</artifactId>
-      <version>0.0.1</version>
+      <version>0.0.2</version>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -72,6 +72,10 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-resteasy-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-links</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-resteasy-multipart</artifactId>
@@ -141,7 +145,7 @@
     <dependency>
       <groupId>com.github.konveyor.tackle-commons-rest</groupId>
       <artifactId>commons-rest-test</artifactId>
-      <version>0.0.1</version>
+      <version>0.0.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -289,7 +293,7 @@
       <properties>
         <quarkus.native.container-build>true</quarkus.native.container-build>
         <quarkus.package.type>native</quarkus.package.type>
-        <quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-mandrel:20.3-java11</quarkus.native.builder-image>
+        <quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-mandrel:21.3-java11</quarkus.native.builder-image>
       </properties>
     </profile>
     <profile>

diff --git a/src/main/java/io/tackle/applicationinventory/services/ReportService.java b/src/main/java/io/tackle/applicationinventory/services/ReportService.java
@@ -80,7 +80,7 @@ private Graph<Application, DefaultEdge> getApplicationsGraphFromDependencies() {
     }
 
     @Transactional
-    private AdoptionPlanAppDto buildAdoptionPlanAppDto(List<Long> applicationIds, EdgeReversedGraph<Application, DefaultEdge> graph, Application application) {
+    protected AdoptionPlanAppDto buildAdoptionPlanAppDto(List<Long> applicationIds, EdgeReversedGraph<Application, DefaultEdge> graph, Application application) {
         if (application.review == null) return null;
 
         AdoptionPlanAppDto planAppDto = new AdoptionPlanAppDto();

diff --git a/src/test/java/io/tackle/applicationinventory/services/CsvExportServiceExceptionTest.java b/src/test/java/io/tackle/applicationinventory/services/CsvExportServiceExceptionTest.java
diff --git a/src/test/java/io/tackle/applicationinventory/services/ReportTestUtil.java b/src/test/java/io/tackle/applicationinventory/services/ReportTestUtil.java
@@ -37,15 +37,15 @@ public void deleteDataForTests() {
     }
 
     @Transactional
-    private void createDependency(int from, int to) {
+    public void createDependency(int from, int to) {
         ApplicationsDependency dependency = new ApplicationsDependency();
         dependency.from = (Application) Application.find("name", "App" + from).firstResultOptional().orElseThrow();
         dependency.to = (Application) Application.find("name", "App" + to).firstResultOptional().orElseThrow();
         dependency.persist();
     }
 
     @Transactional
-    private static void createApplication(int i) {
+    public static void createApplication(int i) {
         Application app = new Application();
         app.name = "App" + i;
         app.businessService = "";