From 1030c447ade4967425336e298e99003a22d5ee23 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Sat, 21 Dec 2024 14:55:40 +0100 Subject: [PATCH] Update dependencies --- apns/build.gradle | 2 -- .../java/de/tum/cit/artemis/push/apns/ApnsSendService.java | 7 ++++--- firebase/build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/apns/build.gradle b/apns/build.gradle index 1aee017..73ab7e9 100644 --- a/apns/build.gradle +++ b/apns/build.gradle @@ -22,8 +22,6 @@ dependencies { implementation 'com.eatthepath:pushy:0.15.4' - implementation 'jakarta.annotation:jakarta.annotation-api:3.0.0' - implementation(project(":common")) } diff --git a/apns/src/main/java/de/tum/cit/artemis/push/apns/ApnsSendService.java b/apns/src/main/java/de/tum/cit/artemis/push/apns/ApnsSendService.java index 447dc35..d096972 100644 --- a/apns/src/main/java/de/tum/cit/artemis/push/apns/ApnsSendService.java +++ b/apns/src/main/java/de/tum/cit/artemis/push/apns/ApnsSendService.java @@ -10,11 +10,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.event.ApplicationReadyEvent; +import org.springframework.context.event.EventListener; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import jakarta.annotation.PostConstruct; import java.io.File; import java.io.IOException; import java.time.Duration; @@ -37,8 +38,8 @@ public class ApnsSendService implements SendService { private ApnsClient apnsClient; - @PostConstruct - public void initialize() { + @EventListener(ApplicationReadyEvent.class) + public void applicationReady() { log.info("apnsCertificatePwd: {}", apnsCertificatePwd); log.info("apnsCertificatePath: {}", apnsCertificatePath); log.info("apnsProdEnvironment: {}", apnsProdEnvironment); diff --git a/firebase/build.gradle b/firebase/build.gradle index 2e0413c..19ce5b5 100644 --- a/firebase/build.gradle +++ b/firebase/build.gradle @@ -20,12 +20,12 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation "com.google.firebase:firebase-admin:9.3.0" + implementation "com.google.firebase:firebase-admin:9.4.2" // use the latest version to avoid security vulnerabilities // TODO: I don't think we need this dependency, we could also try to exclude it - implementation "com.google.protobuf:protobuf-java:4.29.1" - implementation "com.google.protobuf:protobuf-java-util:4.29.1" + implementation "com.google.protobuf:protobuf-java:4.29.2" + implementation "com.google.protobuf:protobuf-java-util:4.29.2" implementation(project(":common")) } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72..cea7a79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 6c1a14c..1fb4e2a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,8 +5,8 @@ pluginManagement { plugins { id 'java' apply false - id 'org.springframework.boot' version '3.4.0' apply false - id 'io.spring.dependency-management' version '1.1.6' apply false + id 'org.springframework.boot' version '3.4.1' apply false + id 'io.spring.dependency-management' version '1.1.7' apply false } }