Skip to content

Commit e12fca7

Browse files
cthermolia-grnetcthermolia-grnet
committed
upgrade quarkus
1 parent d4b59f1 commit e12fca7

15 files changed

Lines changed: 129 additions & 82 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ According to [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) , the `Unr
7878
- [#559](https://github.com/FC4E-CAT/fc4e-cat-api/pull/559) CAT-1052 Add Zenodo DOI to dabatabase
7979
- [#561](https://github.com/FC4E-CAT/fc4e-cat-api/pull/561) CAT-1056 Add imageURL and targetURL
8080
- [#562](https://github.com/FC4E-CAT/fc4e-cat-api/pull/562) CAT-1055 Change file_url to deposit_url
81+
- [#565](https://github.com/FC4E-CAT/fc4e-cat-api/pull/565) CAT-1063 Quarkus upgrade to 3.27
8182

8283

8384
### Fix

‎Jenkinsfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ pipeline {
1313
stage('CAT API Packaging & Testing') {
1414
agent {
1515
docker {
16-
image 'argo.registry:5000/epel-7-java11-mvn384'
17-
args '-v $HOME/.m2:/root/.m2 -v /var/run/docker.sock:/var/run/docker.sock -u root:root'
16+
image 'argo.registry:5000/rocky9-java17-mvn3.9.9:latest'
17+
args '-v $HOME/.m2:/root/.m2 -v /var/run/docker.sock:/var/run/docker.sock -u root:root'
1818
}
1919
}
2020
steps {
@@ -51,4 +51,4 @@ pipeline {
5151
}
5252
}
5353
}
54-
}
54+
}

‎api/config/quarkus-realm.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@
989989
"ownerManagedAccess": false,
990990
"displayName": "Automated Check Resource",
991991
"attributes": {},
992-
"_id": "92j19ls10a-ded3-43de-99cc-24d6d8169653",
992+
"_id": "c9bb5be8-vcd6-43de-bb6f-24d6d8169653",
993993
"uris": [
994994
"/v1/automated/*"
995995
],

‎api/pom.xml‎

Lines changed: 61 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0"?>
2-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
3+
xmlns="http://maven.apache.org/POM/4.0.0"
34
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
45
<parent>
56
<groupId>org.grnet</groupId>
@@ -12,20 +13,25 @@
1213
<version>${revision}</version>
1314
<name>cat-api</name>
1415
<properties>
15-
<junit.vintage.engine.version>5.10.0</junit.vintage.engine.version>
16-
<mockito.core.version>5.5.0</mockito.core.version>
1716
</properties>
1817
<dependencies>
18+
1919
<dependency>
2020
<groupId>org.apache.pdfbox</groupId>
2121
<artifactId>pdfbox</artifactId>
2222
<version>2.0.27</version> <!-- Use the latest version -->
23+
<exclusions>
24+
<exclusion>
25+
<groupId>junit</groupId>
26+
<artifactId>junit</artifactId>
27+
</exclusion>
28+
</exclusions>
2329
</dependency>
2430

2531
<dependency>
26-
<groupId>io.quarkus</groupId>
27-
<artifactId>quarkus-resteasy-reactive-jackson</artifactId>
28-
</dependency>
32+
<groupId>io.quarkus</groupId>
33+
<artifactId>quarkus-rest-jackson</artifactId>
34+
</dependency>
2935
<dependency>
3036
<groupId>org.grnet</groupId>
3137
<artifactId>cat-validators</artifactId>
@@ -82,20 +88,36 @@
8288
<scope>test</scope>
8389
</dependency>
8490
<dependency>
85-
<groupId>org.junit.vintage</groupId>
86-
<artifactId>junit-vintage-engine</artifactId>
87-
<version>${junit.vintage.engine.version}</version>
91+
<groupId>io.rest-assured</groupId>
92+
<artifactId>rest-assured</artifactId>
93+
<scope>test</scope>
94+
<exclusions>
95+
<exclusion>
96+
<groupId>org.hamcrest</groupId>
97+
<artifactId>hamcrest-core</artifactId>
98+
</exclusion>
99+
<exclusion>
100+
<groupId>junit</groupId>
101+
<artifactId>junit</artifactId>
102+
</exclusion>
103+
</exclusions>
104+
</dependency>
105+
<dependency>
106+
<groupId>org.junit.jupiter</groupId>
107+
<artifactId>junit-jupiter-api</artifactId>
108+
<version>5.13.4</version>
88109
<scope>test</scope>
89110
</dependency>
90111
<dependency>
91-
<groupId>org.mockito</groupId>
92-
<artifactId>mockito-core</artifactId>
93-
<version>${mockito.core.version}</version>
112+
<groupId>org.junit.jupiter</groupId>
113+
<artifactId>junit-jupiter-engine</artifactId>
114+
<version>5.13.4</version>
94115
<scope>test</scope>
95116
</dependency>
96117
<dependency>
97-
<groupId>io.rest-assured</groupId>
98-
<artifactId>rest-assured</artifactId>
118+
<groupId>org.hamcrest</groupId>
119+
<artifactId>hamcrest</artifactId>
120+
<version>2.2</version>
99121
<scope>test</scope>
100122
</dependency>
101123
<dependency>
@@ -108,29 +130,29 @@
108130
<version>1.19.7</version>
109131
<scope>test</scope>
110132
</dependency>
111-
</dependencies>
112-
<build>
113-
<resources>
114-
<resource>
115-
<directory>src/main/resources</directory>
116-
</resource>
117-
<resource>
118-
<directory>config</directory>
119-
</resource>
120-
</resources>
121-
<plugins>
122-
<plugin>
123-
<groupId>${quarkus.platform.group-id}</groupId>
124-
<artifactId>quarkus-maven-plugin</artifactId>
125-
</plugin>
126-
<plugin>
127-
<groupId>org.jboss.jandex</groupId>
128-
<artifactId>jandex-maven-plugin</artifactId>
129-
</plugin>
130-
<plugin>
131-
<artifactId>maven-surefire-plugin</artifactId>
132-
<version>${surefire-plugin.version}</version>
133-
</plugin>
134-
</plugins>
135-
</build>
133+
</dependencies>
134+
<build>
135+
<resources>
136+
<resource>
137+
<directory>src/main/resources</directory>
138+
</resource>
139+
<resource>
140+
<directory>config</directory>
141+
</resource>
142+
</resources>
143+
<plugins>
144+
<plugin>
145+
<groupId>${quarkus.platform.group-id}</groupId>
146+
<artifactId>quarkus-maven-plugin</artifactId>
147+
</plugin>
148+
<plugin>
149+
<groupId>org.jboss.jandex</groupId>
150+
<artifactId>jandex-maven-plugin</artifactId>
151+
</plugin>
152+
<plugin>
153+
<artifactId>maven-surefire-plugin</artifactId>
154+
<version>${surefire-plugin.version}</version>
155+
</plugin>
156+
</plugins>
157+
</build>
136158
</project>

‎api/src/main/resources/META-INF/resources/js/keycloak.min.js‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/src/main/resources/application.properties‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,14 @@ quarkus.smallrye-openapi.path=/open-api
8686
# swagger
8787
quarkus.swagger-ui.always-include=true
8888
quarkus.swagger-ui.path=/swagger-ui
89+
quarkus.keycloak.devservices.enabled=true
8990

9091
# keycloak properties for feeding the oidc_client html template
9192
api.html.keycloak.url=http://localhost:58080
9293
api.html.keycloak.realm=quarkus
9394
api.html.keycloak.public.client.id=frontend-service
94-
api.html.keycloak.javascript.adapter=http://localhost:58080/js/keycloak.js
95+
//api.html.keycloak.javascript.adapter=http://localhost:58080/js/keycloak.js
96+
api.html.keycloak.javascript.adapter=/js/keycloak.min.js
9597
api.html.oidc.client.url=http://localhost:8080/oidc-client
9698
api.html.swagger.documentation=http://localhost:8080/swagger-ui
9799

@@ -159,3 +161,5 @@ zenodo.sandbox.doi.prefix=10.5072
159161
zenodo.sandbox.target.url.resolver=https://handle.test.datacite.org/
160162
zenodo.sandbox.url=https://sandbox.zenodo.org
161163
zenodo.prod.url=https://zenodo.org
164+
quarkus.hibernate-orm.mapping.format.global=ignore
165+
quarkus.datasource.db-version=11.16.0

‎api/src/test/java/org/grnet/cat/api/KeycloakTest.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
package org.grnet.cat.api;
33

44
import com.fasterxml.jackson.databind.ObjectMapper;
5-
import com.google.gson.Gson;
6-
import io.quarkus.test.InjectMock;
5+
import io.quarkus.test.common.http.TestHTTPResource;
76
import io.quarkus.test.junit.QuarkusMock;
87
import io.quarkus.test.junit.QuarkusTest;
8+
import io.quarkus.test.keycloak.client.KeycloakTestClient;
99
import io.restassured.RestAssured;
1010
import io.restassured.http.ContentType;
1111
import jakarta.inject.Inject;
12-
import io.quarkus.test.common.http.TestHTTPResource;
13-
import io.quarkus.test.keycloak.client.KeycloakTestClient;
1412
import org.eclipse.microprofile.rest.client.inject.RestClient;
1513
import org.grnet.cat.dtos.UpdateUserProfileDto;
1614
import org.grnet.cat.dtos.UserProfileDto;
@@ -26,23 +24,18 @@
2624
import org.grnet.cat.services.assessment.JsonAssessmentService;
2725
import org.grnet.cat.services.registry.CriterionService;
2826
import org.grnet.cat.services.zenodo.ZenodoClient;
29-
import org.junit.jupiter.api.*;
27+
import org.junit.jupiter.api.BeforeAll;
3028
import org.junit.jupiter.api.TestInstance;
3129
import org.mockito.Mockito;
3230
import org.slf4j.Logger;
3331
import org.slf4j.LoggerFactory;
3432

3533
import java.net.URI;
3634
import java.util.Collections;
37-
import java.util.HashMap;
3835
import java.util.List;
39-
import java.util.Map;
4036

4137
import static io.restassured.RestAssured.given;
42-
import static org.hamcrest.Matchers.anyOf;
43-
import static org.hamcrest.Matchers.is;
44-
import static org.junit.jupiter.api.Assertions.assertEquals;
45-
import static org.mockito.ArgumentMatchers.*;
38+
import static org.mockito.ArgumentMatchers.any;
4639
import static org.mockito.Mockito.when;
4740

4841
/**

‎api/src/test/java/org/grnet/cat/api/RolesEndpointTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import io.quarkus.test.common.http.TestHTTPEndpoint;
44
import io.quarkus.test.junit.QuarkusTest;
55
import io.restassured.http.ContentType;
6-
import org.grnet.cat.api.KeycloakTest;
76
import org.grnet.cat.api.endpoints.RolesEndpoint;
87
import org.grnet.cat.dtos.InformativeResponse;
98
import org.grnet.cat.dtos.RoleAssignmentRequest;

‎entity/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
<groupId>org.apache.commons</groupId>
4545
<artifactId>commons-math3</artifactId>
4646
</dependency>
47-
<dependency>
48-
<groupId>com.vladmihalcea</groupId>
49-
<artifactId>hibernate-types-60</artifactId> <!-- Adjust for Hibernate version -->
50-
<version>2.21.1</version>
51-
</dependency>
47+
<!-- <dependency>-->
48+
<!-- <groupId>com.vladmihalcea</groupId>-->
49+
<!-- <artifactId>hibernate-types-60</artifactId> &lt;!&ndash; Adjust for Hibernate version &ndash;&gt;-->
50+
<!-- <version>2.21.1</version>-->
51+
<!-- </dependency>-->
5252
</dependencies>
5353
<build>
5454
<plugins>

‎entity/src/main/java/org/grnet/cat/entities/MotivationAssessment.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.grnet.cat.entities;
22

33

4-
import com.vladmihalcea.hibernate.type.json.JsonType;
4+
//import com.vladmihalcea.hibernate.type.json.JsonType;
55
import jakarta.persistence.CascadeType;
66
import jakarta.persistence.Column;
77
import jakarta.persistence.Entity;
@@ -14,8 +14,10 @@
1414
import lombok.Getter;
1515
import lombok.Setter;
1616
import org.grnet.cat.entities.registry.Motivation;
17+
import org.hibernate.annotations.JdbcTypeCode;
1718
import org.hibernate.annotations.Type;
1819
import org.hibernate.annotations.UuidGenerator;
20+
import org.hibernate.type.SqlTypes;
1921

2022
import java.sql.Timestamp;
2123
import java.util.ArrayList;
@@ -37,7 +39,7 @@ public class MotivationAssessment {
3739
@UuidGenerator
3840
private String id;
3941

40-
@Type(JsonType.class)
42+
@JdbcTypeCode(SqlTypes.JSON)
4143
@NotNull
4244
@Column(name = "assessment_doc", columnDefinition = "json")
4345
private String assessmentDoc;

0 commit comments

Comments
 (0)