Merge pull request #734 from Epic-Breakfast-Productions/dev

Dev
Epic-Breakfast-Productions · Nov 22, 2024 · 983d843 · 983d843
2 parents 9f55b5d + 911e2a9
commit 983d843
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 65 deletions.
diff --git a/software/oqm-core-api/build.gradle b/software/oqm-core-api/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id 'java'
 	id 'io.quarkus'
-	id "io.freefair.lombok" version "8.10.2"
+	id "io.freefair.lombok" version "8.11"
 }
 
 group 'com.ebp.openQuarterMaster'
@@ -55,7 +55,7 @@ dependencies {
 	implementation 'org.apache.commons:commons-csv:1.12.0'
 	implementation 'org.apache.commons:commons-io:1.3.2'
 	implementation 'commons-codec:commons-codec:1.17.1'
-	implementation 'org.apache.tika:tika-core:2.9.2'
+	implementation 'org.apache.tika:tika-core:3.0.0'
 
 	/*
 	Test Dependencies
@@ -65,7 +65,7 @@ dependencies {
 	testImplementation group: 'io.rest-assured', name: 'rest-assured'
 	testImplementation 'io.quarkus:quarkus-smallrye-jwt-build'
 	testImplementation 'io.quarkus:quarkus-test-kafka-companion'
-	testImplementation 'net.datafaker:datafaker:2.4.0'
+	testImplementation 'net.datafaker:datafaker:2.4.1'
 	testImplementation 'org.assertj:assertj-core:3.26.3'
 	testImplementation 'io.jaegertracing:jaeger-testcontainers:0.7.0'
 }

diff --git a/software/oqm-core-api/src/native-test/java/tech/ebp/oqm/core/api/AuthIntTest.java b/software/oqm-core-api/src/native-test/java/tech/ebp/oqm/core/api/AuthIntTest.java
diff --git a/software/oqm-core-base-station/build.gradle b/software/oqm-core-base-station/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'io.quarkus'
-    id "io.freefair.lombok" version "8.10.2"
+    id "io.freefair.lombok" version "8.11"
 }
 
 group 'com.ebp.openQuarterMaster'
@@ -35,19 +35,19 @@ dependencies {
 
     implementation group: 'org.jsoup', name: 'jsoup', version: '1.18.1'
     implementation 'uk.org.okapibarcode:okapibarcode:0.4.8'
-    implementation 'com.itextpdf:html2pdf:5.0.5'
+    implementation 'com.itextpdf:html2pdf:6.0.0'
 
     //webjars
     implementation 'org.webjars:jquery:3.7.1'
     implementation 'org.webjars:bootstrap:5.3.3'
 
     testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.11.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.11.3"
     testImplementation 'io.rest-assured:rest-assured'
-    testImplementation 'net.datafaker:datafaker:2.4.0'
+    testImplementation 'net.datafaker:datafaker:2.4.1'
 
-    testImplementation 'com.microsoft.playwright:playwright:1.47.0'
-    testImplementation 'com.deque.html.axe-core:playwright:4.9.1'
+    testImplementation 'com.microsoft.playwright:playwright:1.48.0'
+    testImplementation 'com.deque.html.axe-core:playwright:4.10.1'
 }
 
 java {

diff --git a/...e-base-station/src/native-test/java/tech/ebp/oqm/core/baseStation/GreetingResourceIT.java b/...e-base-station/src/native-test/java/tech/ebp/oqm/core/baseStation/GreetingResourceIT.java
diff --git a/software/plugins/external-item-search/build.gradle b/software/plugins/external-item-search/build.gradle
@@ -1,9 +1,12 @@
 plugins {
     id 'java'
     id 'io.quarkus'
-    id "io.freefair.lombok" version "8.10.2"
+    id "io.freefair.lombok" version "8.11"
 }
 
+group 'tech.ebp.openQuarterMaster'
+version '1.0.1'
+
 repositories {
     mavenCentral()
     mavenLocal()
@@ -26,17 +29,14 @@ dependencies {
     implementation 'io.quarkus:quarkus-arc'
 
     implementation group: 'org.jsoup', name: 'jsoup', version: '1.18.1'
-    implementation 'io.quarkiverse.wiremock:quarkus-wiremock:1.3.3'
+    implementation 'io.quarkiverse.wiremock:quarkus-wiremock:1.4.0'
 
 
     testImplementation 'io.quarkus:quarkus-junit5'
     testImplementation 'io.rest-assured:rest-assured'
 //    compileOnly 'io.quarkiverse.mockserver:quarkus-mockserver-test:1.9.0'
 }
 
-group 'tech.ebp.openQuarterMaster'
-version '1.0.0'
-
 java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17

diff --git a/software/plugins/external-item-search/installerSrc/installerProperties.json b/software/plugins/external-item-search/installerSrc/installerProperties.json
@@ -6,7 +6,7 @@
 	"description": "Allows for Open QuarterMaster services to search for items from outside sources. Requires internet connection.",
 	"homepage": "https://github.com/Epic-Breakfast-Productions/OpenQuarterMaster/tree/main/software/plugins/external-item-search",
 	"dependencies": {
-		"deb": "curl, jq, docker.io, docker, oqm-manager-station+captain (>= 2.1.0), oqm-infra-jaeger (>= 1.1.0)"
+		"deb": "curl, jq, docker.io, oqm-manager-station+captain (>= 2.1.0), oqm-infra-jaeger (>= 1.1.0)"
 	},
 	"copyright": {
 		"contact":"Greg Stewart <[email protected]>",