Merge pull request #4 from nordhealth/dev

Correctly package Log4j 2.16.0 dependencies
nordhealth · Dec 15, 2021 · 3ba3097 · 3ba3097
2 parents b0a8fbc + fcc6d79
commit 3ba3097
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 29 deletions.
diff --git a/.idea/artifacts/webapp_hardware_bridge_jar.xml b/.idea/artifacts/webapp_hardware_bridge_jar.xml
diff --git a/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_11_2.xml b/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_11_2.xml
diff --git a/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_16_0.xml b/.idea/libraries/Gradle__org_apache_logging_log4j_log4j_api_2_16_0.xml
diff --git a/...pache_logging_log4j_log4j_core_2_11_2.xml → ...pache_logging_log4j_log4j_core_2_16_0.xml b/...pache_logging_log4j_log4j_core_2_11_2.xml → ...pache_logging_log4j_log4j_core_2_16_0.xml
diff --git a/...logging_log4j_log4j_slf4j_impl_2_11_2.xml → ...logging_log4j_log4j_slf4j_impl_2_16_0.xml b/...logging_log4j_log4j_slf4j_impl_2_11_2.xml → ...logging_log4j_log4j_slf4j_impl_2_16_0.xml
diff --git a/.idea/modules/webapp-hardware-bridge.main.iml b/.idea/modules/webapp-hardware-bridge.main.iml
diff --git a/.idea/modules/webapp-hardware-bridge.test.iml b/.idea/modules/webapp-hardware-bridge.test.iml
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Class-Path: junit-4.12.jar Java-WebSocket-1.4.0.jar commons-io-2.6.jar
   de.huxhorn.lilith.3rdparty.junique-1.0.4.jar guava-28.0-jre.jar jsr3
  05-3.0.2.jar failureaccess-1.0.1.jar httpcore-4.4.11.jar log4j-api-2.
- 11.2.jar checker-qual-2.8.1.jar fontbox-2.0.14.jar listenablefuture-9
+ 16.0.jar checker-qual-2.8.1.jar fontbox-2.0.14.jar listenablefuture-9
  999.0-empty-to-avoid-conflict-with-guava.jar jSerialComm-2.4.2.jar gs
  on-2.8.5.jar pdfbox-2.0.14.jar httpclient-4.5.7.jar commons-logging-1
- .2.jar log4j-slf4j-impl-2.11.2.jar bcpkix-jdk15on-1.62.jar j2objc-ann
+ .2.jar log4j-slf4j-impl-2.16.0.jar bcpkix-jdk15on-1.62.jar j2objc-ann
  otations-1.3.jar error_prone_annotations-2.3.2.jar commons-codec-1.11
  .jar commons-lang3-3.8.1.jar slf4j-api-1.7.25.jar bcprov-jdk15on-1.62
- .jar log4j-core-2.11.2.jar animal-sniffer-annotations-1.17.jar hamcre
+ .jar log4j-core-2.16.0.jar animal-sniffer-annotations-1.17.jar hamcre
  st-core-1.3.jar
 Main-Class: tigerworkshop.webapphardwarebridge.Server