diff --git a/pom.xml b/pom.xml index fdbc5129e28093b384ff43bf50b980149fc5d265..a29a9667633a6122797b9bad12f5d8a514abc849 100644 --- a/pom.xml +++ b/pom.xml @@ -5,17 +5,17 @@ <artifactId>eclipsefdn-downloads-api</artifactId> <version>1.0.0-SNAPSHOT</version> <properties> - <compiler-plugin.version>3.11.0</compiler-plugin.version> + <compiler-plugin.version>3.13.0</compiler-plugin.version> <maven.compiler.source>17</maven.compiler.source> <maven.compiler.target>17</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <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.8.6</quarkus.platform.version> - <surefire-plugin.version>3.1.2</surefire-plugin.version> + <quarkus.platform.version>3.15.3</quarkus.platform.version> + <surefire-plugin.version>3.3.1</surefire-plugin.version> <maven.compiler.parameters>true</maven.compiler.parameters> - <eclipse-api-version>1.1.7</eclipse-api-version> + <eclipse-api-version>1.2.0</eclipse-api-version> <auto-value.version>1.10.4</auto-value.version> <org.mapstruct.version>1.5.5.Final</org.mapstruct.version> <sonar.sources>src/main</sonar.sources> diff --git a/src/main/java/org/eclipsefoundation/downloads/resources/DownloadsResource.java b/src/main/java/org/eclipsefoundation/downloads/resources/DownloadsResource.java index 8113f5d1f7c1b8c88fe7cdfba0b2a41e803f3265..58cd6f0382e1adbca0c00a785596866f9d9afd3a 100644 --- a/src/main/java/org/eclipsefoundation/downloads/resources/DownloadsResource.java +++ b/src/main/java/org/eclipsefoundation/downloads/resources/DownloadsResource.java @@ -104,7 +104,7 @@ public class DownloadsResource { Optional<List<DownloadFileIndex>> dfis = cache .get(id, params, DownloadFileIndex.class, () -> dao.get(new RDBMSQuery<>(wrap, filters.get(DownloadFileIndex.class), params))) - .getData(); + .data(); if (dfis.isEmpty() || dfis.get().isEmpty()) { throw new NotFoundException(String.format("No DownloadFileIndex found with id '%s'", id)); @@ -311,6 +311,6 @@ public class DownloadsResource { return cache .get(releaseName + releaseVersion, new MultivaluedHashMap<>(), ReleaseTrackerPackages.class, () -> api.get(releaseName, releaseVersion)) - .getData(); + .data(); } } diff --git a/src/main/java/org/eclipsefoundation/downloads/services/impl/DefaultReleaseTrackerService.java b/src/main/java/org/eclipsefoundation/downloads/services/impl/DefaultReleaseTrackerService.java index c58064face51de1981260825ddb9ccc5b544fcb5..80756f651e7ca130e2c7be3635aae951fc31ad85 100644 --- a/src/main/java/org/eclipsefoundation/downloads/services/impl/DefaultReleaseTrackerService.java +++ b/src/main/java/org/eclipsefoundation/downloads/services/impl/DefaultReleaseTrackerService.java @@ -71,7 +71,7 @@ public class DefaultReleaseTrackerService implements ReleaseTrackerService { private TrackedReleases getCachedReleases() { return cache .get("all", new MultivaluedHashMap<>(), TrackedReleases.class, api::getTrackedReleases) - .getData() + .data() .orElse(TrackedReleases.builder().setReleases(new HashMap<>()).build()); } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index da02192a5c09c75acbe6462b8688eabd2c11a3ba..55e3d2da2179af3df4ec7ffd32cf02374ae9d703 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -14,10 +14,10 @@ eclipse.security.csrf.enabled=true eclipse.security.csrf.distributed-mode.is-default-provider=false eclipse.security.csrf.distributed-mode.enabled=false - ## DATASOURCE CONFIG eclipse.persistence.pagination-limit.max=100 quarkus.datasource.db-kind=mariadb +quarkus.datasource.db-version=10.0.0 quarkus.datasource.jdbc.min-size = 5 quarkus.datasource.jdbc.max-size = 15 diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 3143fa453c4ea1ff77ff70f7a10c10a2cb1dcd59..bb01e25e46e3733abbb13358ea2a3477623a5e3f 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -1,5 +1,6 @@ ## DATASOURCE CONFIG quarkus.datasource.db-kind=h2 +quarkus.datasource.db-version=2.3.0 eclipse.persistence.pagination-limit.default-value=25 eclipse.persistence.pagination-limit.max=100 quarkus.hibernate-orm.database.generation=none