Merge pull request #50 from target/dependencyUpdates

Update dependencies and add scanner logging
target · Jan 8, 2025 · 859e932 · 859e932
2 parents 3bf76d4 + 281a4de
commit 859e932
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'maven-publish'
     id 'idea'
     id 'application'
-    id 'org.springframework.boot' version '3.1.11'
+    id 'org.springframework.boot' version '3.4.1'
     id 'io.spring.dependency-management' version '1.0.9.RELEASE'
     id 'de.undercouch.download' version '4.1.1'
     id 'jacoco'
@@ -25,14 +25,17 @@ repositories {
 }
 
 dependencies {
-    implementation "org.springframework.boot:spring-boot-starter-web:3.1.11"
-    implementation "org.springframework.boot:spring-boot-starter-actuator:3.1.11"
-    implementation "org.springframework.boot:spring-boot-starter-validation:3.1.11"
-    implementation "org.springframework.boot:spring-boot-loader:3.1.11"
+    implementation "org.springframework.boot:spring-boot-starter-web:3.4.1"
+    implementation "org.springframework.boot:spring-boot-starter-actuator:3.4.1"
+    implementation "org.springframework.boot:spring-boot-starter-validation:3.4.1"
+    implementation "org.springframework.boot:spring-boot-loader:3.4.1"
+    implementation "org.springframework:spring-webmvc:6.2.1"
+    implementation "org.springframework:spring-web:6.2.1"
+    implementation "org.junit.platform:junit-platform-launcher:1.11.4"
     implementation "io.micrometer:micrometer-registry-influx:1.9.0"
     implementation "org.javapos:javapos-config-loader:2.2.0"
     implementation "org.javapos:javapos:1.14.3"
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0"
     implementation "com.fasterxml.jackson.core:jackson-annotations:2.14.0"
     implementation "com.fasterxml.jackson.core:jackson-core:2.14.0"
     implementation "com.fasterxml.jackson.core:jackson-databind:2.14.0"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
diff --git a/scripts/devicestarter.sh b/scripts/devicestarter.sh
@@ -142,4 +142,4 @@ echo ""
 cd /opt/target/possum
 
 # TODO Need to check if NCRRetail form init.d and NCRLoader is running.
-java -cp $CP -Djava.library.path=$LIB_PATH -XX:ErrorFile=$POSSUM_LOG_PATH/CrashLog/hs_err_pid%p.log -XX:ReplayDataFile=$POSSUM_LOG_PATH/CrashLog/replay_pid%p.log -Dlog4j2.formatMsgNoLookups=true -Dloader.main=com.target.devicemanager.DeviceMain org.springframework.boot.loader.PropertiesLauncher
+java -cp $CP -Djava.library.path=$LIB_PATH -XX:ErrorFile=$POSSUM_LOG_PATH/CrashLog/hs_err_pid%p.log -XX:ReplayDataFile=$POSSUM_LOG_PATH/CrashLog/replay_pid%p.log -Dlog4j2.formatMsgNoLookups=true -Dloader.main=com.target.devicemanager.DeviceMain org.springframework.boot.loader.launch.PropertiesLauncher
diff --git a/src/main/java/com/target/devicemanager/components/scanner/ScannerManager.java b/src/main/java/com/target/devicemanager/components/scanner/ScannerManager.java
@@ -174,6 +174,8 @@ void cancelScanRequest() throws ScannerException {
             ScannerException scannerException = new ScannerException(ScannerError.UNEXPECTED_ERROR);
             LOGGER.trace("cancelScanRequest(out)");
             throw scannerException;
+        } catch (Exception exception) {
+            LOGGER.info("Error in cancelScanRequest: " + exception.getMessage());
         }
         LOGGER.trace("cancelScanRequest(out)");
     }