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

SCRUM-4335: MaTI - bump quarkus to 3.13.2 #76

Merged
merged 1 commit into from
Aug 15, 2024
Merged

SCRUM-4335: MaTI - bump quarkus to 3.13.2 #76

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
2 changes: 1 addition & 1 deletion .ebignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# The precense of this file tells the AWS EB CLI to not use git for deployment as per
# The presence of this file tells the AWS EB CLI to not use git for deployment as per
# https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/eb3-deploy.html
#
.git
Expand Down
18 changes: 15 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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>3.7.3</quarkus.platform.version>
<quarkus.platform.version>3.13.2</quarkus.platform.version>
<surefire-plugin.version>3.1.2</surefire-plugin.version>
</properties>

Expand Down Expand Up @@ -122,7 +122,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.30</version>
<version>1.18.34</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -137,6 +137,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-test-common</artifactId>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-postgresql</artifactId>
</dependency>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be added?

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>jdbc</artifactId>
Expand Down Expand Up @@ -260,6 +264,13 @@
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>maven_central</id>
<name>Maven Central</name>
<url>https://repo.maven.apache.org/maven2/</url>
</repository>
</repositories>
<profiles>
<profile>
<id>native</id>
Expand All @@ -270,7 +281,8 @@
</activation>
<properties>
<skipITs>false</skipITs>
<quarkus.package.type>native</quarkus.package.type>
<quarkus.native.enabled>true</quarkus.native.enabled>
<quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
</properties>
</profile>
</profiles>
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/alliancegenome/mati/controller/AdminResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import org.alliancegenome.mati.interfaces.AdminRESTInterface;
import org.alliancegenome.mati.repository.SubdomainSequenceRepository;
import org.alliancegenome.mati.rolldownrepository.DBRoller;
import org.eclipse.microprofile.config.inject.ConfigProperty;

import java.util.List;
import java.util.Map;
Expand All @@ -27,7 +26,7 @@ public class AdminResource implements AdminRESTInterface {
@Inject
DBRoller dbRoller;

private static final String NET = System.getenv("NET");;
private static final String NET = System.getenv("NET");

public Response getCounters() {
Map<String,Long> counters = subdomainSequenceRepository.getSubdomainCounters();
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/alliancegenome/mati/repository/SubdomainSequenceRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.alliancegenome.mati.repository;

import io.quarkus.hibernate.orm.PersistenceUnit;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.persistence.EntityManager;
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/alliancegenome/mati/controller/AdminResourceITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.alliancegenome.mati.controller;

import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.common.WithTestResource;
import io.quarkus.test.junit.QuarkusIntegrationTest;
import org.alliancegenome.mati.configuration.PostgresResource;
import org.junit.jupiter.api.*;
Expand All @@ -16,14 +16,14 @@
* that mint some identifiers
*/
@QuarkusIntegrationTest
@QuarkusTestResource(PostgresResource.class)
@WithTestResource(value = PostgresResource.class, restrictToAnnotatedClass = false)
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@Order(3)
public class AdminResourceITCase {

@Test
public void getCounters() {
Map<String,Integer> counters = given().
Map counters = given().
contentType(JSON).
header("Accept", "application/json").
when().
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/alliancegenome/mati/controller/IdentifierResourceITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.alliancegenome.mati.controller;

import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.common.WithTestResource;
import io.quarkus.test.junit.QuarkusIntegrationTest;
import io.restassured.http.ContentType;

Expand All @@ -15,7 +15,7 @@
* for minting identifiers
*/
@QuarkusIntegrationTest
@QuarkusTestResource(PostgresResource.class)
@WithTestResource(value = PostgresResource.class, restrictToAnnotatedClass = false)
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@Order(2)
class IdentifierResourceITCase {
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/alliancegenome/mati/controller/SubdomainResourceITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import static org.hamcrest.MatcherAssert.assertThat;

import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.common.WithTestResource;
import io.quarkus.test.junit.QuarkusIntegrationTest;
import io.restassured.common.mapper.TypeRef;
import org.alliancegenome.mati.configuration.PostgresResource;
Expand All @@ -18,7 +18,7 @@
import static org.hamcrest.Matchers.is;

@QuarkusIntegrationTest
@QuarkusTestResource(PostgresResource.class)
@WithTestResource(value = PostgresResource.class, restrictToAnnotatedClass = false)
@Order(1)
class SubdomainResourceITCase {

Expand Down Expand Up @@ -52,7 +52,7 @@ public void getOne() {
}

private TypeRef<List<SubdomainEntity>> getSubdomainEntityTypeRef() {
return new TypeRef<List<SubdomainEntity>>() {
return new TypeRef<>() {
};
}
}
Loading