Cleanup cadc dependencies & Fix stilts conflict issue

CHANGELOG.md

@@ -7,17 +7,26 @@ Find changes for the upcoming release in the project's [changelog.d](https://git
 <!-- scriv-insert-here -->
 
 
+<a id='changelog-1.18.3'></a>
+## 1.18.3 (2024-07-15)
+
+### Other changes
+
+- Remove unneeded cadc dependencies (issue with dali/stilts conflict)
+- Upgrade log4j (Log4j vulnerability)
+- Modified scriv settings 
+
 <a id='changelog-1.18.2'></a>
 ## 1.18.2 (2024-07-12)
 
-## Fixed
+### Fixed
 
 - Fix Postgres data database init scripts
 
 <a id='changelog-1.18.1'></a>
 ## 1.18.1 (2024-07-11)
 
-## Changed
+### Changed
 
 - Change Postgres to v15 and base image to fedora (centos endoflife)
 

changelog.d/scriv.ini

@@ -1,3 +1,6 @@
 [scriv]
 format = md
-categories = Backwards-incompatible changes,New features,Bug fixes,Other changes
+md_header_level = 2
+entry_title_template = {{ version }} ({{ date.strftime('%%Y-%%m-%%d') }})
+new_fragment_template = file:changelog.d/_template.md.jinja
+skip_fragments = _template.md.jinja

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,)'