Skip to content

Commit

Permalink
Upgrade quarkus to 3.14.1 (#77)
Browse files Browse the repository at this point in the history
* fix dependency

* add globalInterceptor annotation

* bump quarkus to 3.14.1

* replace deprecated ProfileManager with ConfigUtil

* lock great_expectations version
  • Loading branch information
RuiTeixeira authored Aug 30, 2024
1 parent 117b66d commit 9dbaf26
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 21 deletions.
8 changes: 4 additions & 4 deletions agoora-agents-api/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

Expand All @@ -21,15 +21,15 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client</artifactId>
<artifactId>quarkus-resteasy-client</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-keycloak-admin-client</artifactId>
<artifactId>quarkus-keycloak-admin-resteasy-client</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package io.spoud.agoora.agents.api.auth;

import io.grpc.*;
import io.quarkus.grpc.GlobalInterceptor;
import io.spoud.agoora.agents.api.config.AgooraAgentClientAuthConfig;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.ws.rs.client.ClientBuilder;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
Expand All @@ -24,6 +26,7 @@
import java.util.concurrent.TimeUnit;

@Slf4j
@GlobalInterceptor
public class AuthClientInterceptor implements ClientInterceptor {
public static final String PROXY_HOST = "http.proxyHost";
public static final String PROXY_PORT = "http.proxyPort";
Expand Down
13 changes: 7 additions & 6 deletions agoora-kafka-agent/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<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"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand Down Expand Up @@ -30,7 +30,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-smallrye-reactive-messaging-kafka</artifactId>
<artifactId>quarkus-messaging-kafka</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand All @@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client</artifactId>
<artifactId>quarkus-resteasy-client</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down Expand Up @@ -207,7 +207,8 @@
</plugins>
</build>
<properties>
<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: 2 additions & 1 deletion agoora-mqtt-agent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@
</plugins>
</build>
<properties>
<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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.spoud.agoora.agents.mqtt;

import io.quarkus.runtime.StartupEvent;
import io.quarkus.runtime.configuration.ProfileManager;
import io.quarkus.runtime.configuration.ConfigUtils;
import lombok.extern.slf4j.Slf4j;

import jakarta.enterprise.context.ApplicationScoped;
Expand All @@ -12,6 +12,6 @@
public class ApplicationLifeCycle {

void onStart(@Observes StartupEvent ev) {
LOG.info("The application is starting with profile " + ProfileManager.getActiveProfile());
LOG.info("The application is starting with profile {}", ConfigUtils.getProfiles());
}
}
3 changes: 2 additions & 1 deletion agoora-openapi-agent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@
</plugins>
</build>
<properties>
<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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.spoud.agoora.agents.openapi;

import io.quarkus.runtime.StartupEvent;
import io.quarkus.runtime.configuration.ProfileManager;
import io.quarkus.runtime.configuration.ConfigUtils;
import lombok.extern.slf4j.Slf4j;

import jakarta.enterprise.context.ApplicationScoped;
Expand All @@ -12,6 +12,6 @@
public class ApplicationLifeCycle {

void onStart(@Observes StartupEvent ev) {
LOG.info("The application is starting with profile " + ProfileManager.getActiveProfile());
LOG.info("The application is starting with profile {}", ConfigUtils.getProfiles());
}
}
3 changes: 2 additions & 1 deletion agoora-pgsql-agent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@
</plugins>
</build>
<properties>
<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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.spoud.agoora.agents.pgsql;

import io.quarkus.runtime.StartupEvent;
import io.quarkus.runtime.configuration.ProfileManager;
import io.quarkus.runtime.configuration.ConfigUtils;
import lombok.extern.slf4j.Slf4j;

import jakarta.enterprise.context.ApplicationScoped;
Expand All @@ -12,6 +12,6 @@
public class ApplicationLifeCycle {

void onStart(@Observes StartupEvent ev) {
LOG.info("The application is starting with profile " + ProfileManager.getActiveProfile());
LOG.info("The application is starting with profile {}", ConfigUtils.getProfiles());
}
}
2 changes: 1 addition & 1 deletion agoora-profiler-service/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ numba>=0.56.0, <1
pandas>1.1, <3, !=1.4.0
ydata-profiling
func-timeout
great_expectations
great_expectations==0.18.19
future
pyspark
# for some reason this is needed for great_expectations to work
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<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.1</quarkus.platform.version>
<quarkus.platform.version>3.14.1</quarkus.platform.version>

<sonar.projectKey>spoud_${project.artifactId}</sonar.projectKey>
<sonar.organization>spoud</sonar.organization>
Expand Down

0 comments on commit 9dbaf26

Please sign in to comment.