Updates (#45)

jug-mz · Feb 1, 2024 · 4e72fe3 · 4e72fe3
1 parent dad0ab2
commit 4e72fe3
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 85 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -17,10 +17,8 @@ jobs:
         java-version: '21'
         distribution: 'graalvm'
         cache: maven
-    - name: Maybe install Graal
-      run: ./install-graalvm.sh
     - name: Build with Maven
-      run: mvn -s settings.xml -q clean package -Pnative -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -B -V
+      run: mvn clean package -Dnative
     - name: Copy artifacts to target
       run: |
         cp target/backend-proxy-1.0-SNAPSHOT-runner target/dist/application

diff --git a/.travis.yml b/.travis.yml
diff --git a/install-graalvm.sh b/install-graalvm.sh
diff --git a/pom.xml b/pom.xml
@@ -8,10 +8,10 @@
     <version>1.0-SNAPSHOT</version>
     <properties>
         <surefire-plugin.version>2.22.1</surefire-plugin.version>
-        <quarkus.version>1.1.0.Final</quarkus.version>
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <quarkus.version>3.7.1</quarkus.version>
+        <maven.compiler.source>21</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencyManagement>
@@ -104,16 +104,6 @@
                         <groupId>io.quarkus</groupId>
                         <artifactId>quarkus-maven-plugin</artifactId>
                         <version>${quarkus.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>

diff --git a/src/main/java/de/jugmz/general/http/CacheHeaderFilter.java b/src/main/java/de/jugmz/general/http/CacheHeaderFilter.java
@@ -2,8 +2,8 @@
 
 import io.quarkus.vertx.http.runtime.filters.Filters;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
 import java.time.Duration;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;

diff --git a/src/main/java/de/jugmz/general/http/SecurityHeaderFilter.java b/src/main/java/de/jugmz/general/http/SecurityHeaderFilter.java
@@ -2,8 +2,8 @@
 
 import io.quarkus.vertx.http.runtime.filters.Filters;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
 
 @ApplicationScoped
 public class SecurityHeaderFilter {

diff --git a/src/main/java/de/jugmz/health/ServiceHealthCheck.java b/src/main/java/de/jugmz/health/ServiceHealthCheck.java
@@ -3,7 +3,7 @@
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class ServiceHealthCheck implements HealthCheck {

diff --git a/src/main/java/de/jugmz/meetup/MeetupController.java b/src/main/java/de/jugmz/meetup/MeetupController.java
@@ -7,12 +7,12 @@
 import org.eclipse.microprofile.faulttolerance.Timeout;
 import org.eclipse.microprofile.metrics.annotation.Counted;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 import java.net.SocketException;
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/src/main/java/de/jugmz/meetup/MeetupMapper.java b/src/main/java/de/jugmz/meetup/MeetupMapper.java
@@ -4,8 +4,8 @@
 import de.jugmz.meetup.api.MeetupEventVenue;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;

diff --git a/src/main/java/de/jugmz/meetup/MeetupService.java b/src/main/java/de/jugmz/meetup/MeetupService.java
@@ -6,9 +6,9 @@
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/src/main/java/de/jugmz/meetup/api/MeetupClient.java b/src/main/java/de/jugmz/meetup/api/MeetupClient.java
@@ -2,12 +2,12 @@
 
 import org.eclipse.microprofile.metrics.annotation.Counted;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 import java.util.List;
 
 @Path("/")

diff --git a/src/main/java/de/jugmz/meetup/api/MeetupEvent.java b/src/main/java/de/jugmz/meetup/api/MeetupEvent.java
@@ -1,6 +1,6 @@
 package de.jugmz.meetup.api;
 
-import javax.json.bind.annotation.JsonbProperty;
+import jakarta.json.bind.annotation.JsonbProperty;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalTime;

diff --git a/src/main/java/de/jugmz/meetup/fallback/MeetupPastFallbackHandler.java b/src/main/java/de/jugmz/meetup/fallback/MeetupPastFallbackHandler.java
@@ -7,7 +7,7 @@
 import org.eclipse.microprofile.faulttolerance.ExecutionContext;
 import org.eclipse.microprofile.faulttolerance.FallbackHandler;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;

diff --git a/src/main/java/de/jugmz/meetup/fallback/MeetupUpcomingFallbackHandler.java b/src/main/java/de/jugmz/meetup/fallback/MeetupUpcomingFallbackHandler.java
@@ -6,7 +6,7 @@
 import org.eclipse.microprofile.faulttolerance.ExecutionContext;
 import org.eclipse.microprofile.faulttolerance.FallbackHandler;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;

diff --git a/src/main/java/de/jugmz/partner/PartnerController.java b/src/main/java/de/jugmz/partner/PartnerController.java
@@ -3,11 +3,11 @@
 import de.jugmz.general.comparators.NoOpComparator;
 import de.jugmz.general.comparators.RandomComparator;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/src/main/java/de/jugmz/sponsor/SponsorController.java b/src/main/java/de/jugmz/sponsor/SponsorController.java
@@ -3,11 +3,11 @@
 import de.jugmz.general.comparators.NoOpComparator;
 import de.jugmz.general.comparators.RandomComparator;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;