Cleanup dependecies & upgrade log4j

CHANGELOG.md

@@ -5,7 +5,18 @@ lsst-tap-service is versioned with [semver](https://semver.org/). Dependencies a
 Find changes for the upcoming release in the project's [changelog.d](https://github.com/lsst-sqre/lsst-tap-service/tree/main/changelog.d/).
 
 <!-- scriv-insert-here -->
-# 2024-06-28
+
+<a id='changelog-2.4.1'></a>
+## 2.4.1 (2024-07-15)
+
+### Changed
+
+- Changed scriv settings to match tap-postgres
+- Remove unneeded cadc dependencies (issue with dali/stilts conflict)
+- Upgrade log4j (Log4j vulnerability)
+
+<a id='changelog-2.4.0'></a>
+# 2.4.0 (2024-06-28)
 
 ### Fixed
 
@@ -15,13 +26,15 @@ Find changes for the upcoming release in the project's [changelog.d](https://git
 
 - Change result handling, to use a redirect servlet. Addresses issue with async failing due to auth header propagation with clients like pyvo, topcat
 
-# 2024-06-18
+<a id='changelog-2.3.1'></a>
+# 2.3.1 (2024-06-18)
 
 ## Other Changes
 
 - Upgrade mysql-connector to 8.4.0
 
-# 2024-06-11
+<a id='changelog-2.3.0'></a>
+# 2.3.0 (2024-06-11)
 
 ## New features
 

build.gradle

@@ -40,31 +40,23 @@ configurations {
 }
 
 dependencies {
-    implementation 'log4j:log4j:1.2.+'
+    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.13'
-    implementation 'org.opencadc:cadc-cdp:1.3.7'
-    implementation 'org.opencadc:cadc-dali:1.2.17'
     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.0.5'
     implementation 'org.opencadc:cadc-tap-server-oracle:1.2.11'
-    implementation 'org.opencadc:cadc-util:1.10.6'
+    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 group: 'org.postgresql', name: 'postgresql', version: '42.2.5'
     // ## END CUSTOM DATABASE ##

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