Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency updates #49

Closed
wants to merge 17 commits into from
Closed

Dependency updates #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b58bfe7
Update springboot
rrenkor Oct 16, 2024
da25cec
Update springboot
rrenkor Oct 16, 2024
c03410d
extra logging for scanner
bmcecilia3 Jan 7, 2025
481d5fc
don't throw error
bmcecilia3 Jan 7, 2025
97f2d06
Merge remote-tracking branch 'origin/PNA-2198' into alphaTesting
rrenkor Jan 7, 2025
8227a46
Update springdoc-openapi-starter-webmvc-ui
rrenkor Jan 7, 2025
40f46eb
webmvc 3
bmcecilia3 Jan 7, 2025
206c346
webmvc 4
bmcecilia3 Jan 7, 2025
0fefa42
webmvc 5
bmcecilia3 Jan 7, 2025
c6400a5
webmvc 6
bmcecilia3 Jan 7, 2025
4c0d08b
webmvc 7
bmcecilia3 Jan 7, 2025
00b8d78
spring milestone
bmcecilia3 Jan 7, 2025
70f55ed
webmvc 8
bmcecilia3 Jan 7, 2025
e128604
spring update
bmcecilia3 Jan 7, 2025
4dad3b0
unit test dependancies
bmcecilia3 Jan 7, 2025
adc703d
update micrometer
bmcecilia3 Jan 8, 2025
ceaa223
revert micrometer
bmcecilia3 Jan 8, 2025
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
15 changes: 9 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion scripts/devicestarter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions src/main/java/com/target/devicemanager/components/scanner/ScannerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)");
}
Expand Down