Skip to content
This repository has been archived by the owner on Jun 6, 2024. It is now read-only.

Upgrade to Micronaut 4.2.2 #3

Merged
merged 3 commits into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 25 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,35 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.unisg.library.systemlibrarian</groupId>
<artifactId>alma-job-runner</artifactId>
<version>1.0.2</version>
<version>1.0.3</version>
<packaging>${packaging}</packaging>

<!--
Upgrade to Micronaut 4
https://micronaut.io/2023/05/09/upgrade-to-micronaut-framework-4-0-0/
(remove this note after v4 runs well)
-->
<parent>
<groupId>io.micronaut</groupId>
<groupId>io.micronaut.platform</groupId>
<artifactId>micronaut-parent</artifactId>
<version>3.8.7</version>
<version>4.2.2</version>
</parent>

<properties>
<packaging>docker</packaging>
<jdk.version>17</jdk.version>
<release.version>17</release.version>
<micronaut.version>3.8.7</micronaut.version>
<micronaut.version>4.2.2</micronaut.version>
<micronaut.runtime>netty</micronaut.runtime>
<jgit.ssh.version>6.5.0.202303070854-r</jgit.ssh.version>
<jsch.version>0.2.7</jsch.version>
<apache.commonslang3.version>3.12.0</apache.commonslang3.version>
<cron.utils.version>9.2.0</cron.utils.version>
<simple.java.mail.version>8.0.0</simple.java.mail.version>
<mockito.version>5.2.0</mockito.version>
<maven.versions.plugin.version>2.12.0</maven.versions.plugin.version>
<maven.enforcer.plugin.version>3.1.0</maven.enforcer.plugin.version>
<maven.jib.plugin.version>3.3.1</maven.jib.plugin.version>
<jgit.ssh.version>6.8.0.202311291450-r</jgit.ssh.version>
<jsch.version>0.2.15</jsch.version>
<apache.commonslang3.version>3.14.0</apache.commonslang3.version>
<cron.utils.version>9.2.1</cron.utils.version>
<simple.java.mail.version>8.5.1</simple.java.mail.version>
<mockito.version>5.8.0</mockito.version>
<maven.versions.plugin.version>2.16.2</maven.versions.plugin.version>
<maven.enforcer.plugin.version>3.4.1</maven.enforcer.plugin.version>
<maven.jib.plugin.version>3.4.0</maven.jib.plugin.version>
<exec.mainClass>ch.unisg.library.systemlibrarian.Application</exec.mainClass>
</properties>

Expand All @@ -54,7 +59,7 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.micronaut</groupId>
<groupId>io.micronaut.validation</groupId>
<artifactId>micronaut-validation</artifactId>
<scope>compile</scope>
</dependency>
Expand All @@ -77,6 +82,11 @@
<groupId>io.micronaut.views</groupId>
<artifactId>micronaut-views-handlebars</artifactId>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
Expand Down Expand Up @@ -156,7 +166,7 @@
<build>
<plugins>
<plugin>
<groupId>io.micronaut.build</groupId>
<groupId>io.micronaut.maven</groupId>
<artifactId>micronaut-maven-plugin</artifactId>
</plugin>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import io.micronaut.http.MediaType;
import io.micronaut.http.annotation.Controller;
import io.micronaut.http.annotation.Get;
import io.micronaut.scheduling.TaskExecutors;
import io.micronaut.scheduling.annotation.ExecuteOn;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -15,6 +17,7 @@
import java.util.List;

@Controller
@ExecuteOn(TaskExecutors.BLOCKING)
public class HealthController {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final AlmaApiHttpClient almaApiHttpClient;
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<configuration>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<withJansi>true</withJansi>
<!-- encoders are assigned the type
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
<encoder>
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/views/head-partial.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">

<!-- see: https://newcss.net/ -->
<link rel="stylesheet" href="https://fonts.xz.style/serve/inter.css">
Expand Down
Loading