Skip to content
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

Upgrade to Quarkus 2.5.4.Final #172

Merged
merged 3 commits into from
Jan 10, 2022
Merged

Upgrade to Quarkus 2.5.4.Final #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b11618
Save changes
carlosthe19916 Dec 21, 2021
daceaff
Delete Not working test, assert() never works
carlosthe19916 Dec 21, 2021
f7d929e
Upgrade commons-rest version
carlosthe19916 Jan 5, 2022
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
14 changes: 9 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/tackle/applicationinventory/services/ReportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
137 changes: 0 additions & 137 deletions src/test/java/io/tackle/applicationinventory/services/CsvExportServiceExceptionTest.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/test/java/io/tackle/applicationinventory/services/ReportTestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";
Expand Down