Cleanup dependencies & upgrade log4j

changelog.d/20240711_174009_steliosvoutsinas_DM_45142.md

@@ -0,0 +1,35 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+-->
+
+<!--
+### Backwards-incompatible changes
+
+- A bullet item for the Backwards-incompatible changes category.
+
+-->
+<!--
+### New features
+
+- A bullet item for the New features category.
+
+-->
+<!--
+### Bug fixes
+
+- A bullet item for the Bug fixes category.
+
+-->
+<!--
+### Other changes
+
+- A bullet item for the Other changes category.
+
+-->
+
+## Other changes
+
+- Remove unneeded cadc dependencies (issue with dali/stilts conflict)
+- Upgrade log4j (Log4j vulnerability)

tap/build.gradle

@@ -15,42 +15,35 @@ sourceCompatibility = 1.8
 group = 'org.opencadc'
 version = '1.1'
 
+configurations {
+    // Ensure only local files are available to prevent collisions.
+    implementation.exclude group: 'uk.ac.starlink'
+}
+
 dependencies {
-    implementation 'log4j:log4j:1.2.+'
-    implementation 'org.opencadc:cadc-log:1.2.1'
-    implementation 'org.opencadc:cadc-util:1.11.2'
-    implementation 'org.opencadc:cadc-dali:1.2.18'
-    implementation 'org.opencadc:cadc-uws:1.0.5'
-    implementation 'org.opencadc:cadc-uws-server:1.2.20'
-    implementation 'org.opencadc:cadc-tap-server:1.1.24'
-    implementation 'org.opencadc:cadc-vosi:1.4.6'
+    implementation 'org.apache.logging.log4j:log4j-core:2.17.2'
+    implementation 'org.apache.logging.log4j:log4j-api:2.17.2'
+
     implementation 'org.opencadc:cadc-adql:1.1.14'
-    implementation 'org.opencadc:cadc-cdp:1.4.0'
-    implementation 'org.opencadc:cadc-dali-pg:0.3.1'
-    implementation 'org.opencadc:cadc-gms:1.0.12'
-    implementation 'org.opencadc:cadc-jsqlparser-compat:0.6.5'
     implementation 'org.opencadc:cadc-log:1.2.1'
-    implementation 'org.opencadc:cadc-registry:1.7.6'
     implementation 'org.opencadc:cadc-rest:1.3.20'
-    implementation 'org.opencadc:cadc-tap:1.1.16'
-    implementation 'org.opencadc:cadc-tap-schema:1.1.32'
-    implementation 'org.opencadc:cadc-tap-server:1.1.23'
-    implementation 'org.opencadc:cadc-tap-server-pg:1.1.0'
-    implementation 'org.opencadc:cadc-util:1.10.6'
+    implementation 'org.opencadc:cadc-tap-server:1.1.24'
+    implementation 'org.opencadc:cadc-tap-server-pg:[1.0.0,)'
+    implementation 'org.opencadc:cadc-util:1.11.2'
     implementation 'org.opencadc:cadc-uws:1.0.5'
     implementation 'org.opencadc:cadc-uws-server:1.2.20'
-    implementation 'org.opencadc:cadc-tap-server:1.1.23'
-    implementation 'org.opencadc:cadc-vosi:1.4.4'
-    implementation 'org.opencadc:cadc-adql:1.1.13'
+    implementation 'org.opencadc:cadc-vosi:1.4.6'
 
     // Switch out this to use any supported database instead of PostgreSQL.
     // ## START CUSTOM DATABASE ##
     implementation group: 'com.mysql', name: 'mysql-connector-j', version: '8.4.0'
     implementation 'org.postgresql:postgresql:42.2.2.jre7'
-    implementation 'org.opencadc:cadc-tap-server-pg:[1.0.0,)'
     // ## END CUSTOM DATABASE ##
 
+
     implementation 'com.google.cloud:google-cloud-storage:1.48.0'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
+    implementation 'org.antlr:ST4:4.3.1'
 
     testImplementation 'junit:junit:[4.0,)'
     testImplementation 'xmlunit:xmlunit:[1.0,)'

tap/src/main/resources/log4j.properties

@@ -1,4 +1,4 @@
-log4j.rootCategory=info, stdout
+log4j.rootCategory=debug, stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c{1} %x - %m\n