From cd564b7a4d9718a08539fa88d1b8c37e77ac0065 Mon Sep 17 00:00:00 2001 From: Stelios Voutsinas Date: Wed, 10 Jul 2024 22:20:32 -0700 Subject: [PATCH 1/3] Cleanup dependecies & upgrade log4j --- build.gradle | 16 +++------- ...240711_051828_steliosvoutsinas_DM_45142.md | 30 +++++++++++++++++++ 2 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 changelog.d/20240711_051828_steliosvoutsinas_DM_45142.md diff --git a/build.gradle b/build.gradle index bd76fb9..f3a6133 100644 --- a/build.gradle +++ b/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 ## diff --git a/changelog.d/20240711_051828_steliosvoutsinas_DM_45142.md b/changelog.d/20240711_051828_steliosvoutsinas_DM_45142.md new file mode 100644 index 0000000..658c729 --- /dev/null +++ b/changelog.d/20240711_051828_steliosvoutsinas_DM_45142.md @@ -0,0 +1,30 @@ + + + + + + +### Other changes + +- Remove unneeded cadc dependencies (issue with dali/stilts conflict) +- Upgrade log4j (Log4j vulnerability) + From 20c0235a0bf10e45d9d5267de1597fbfab4df1bc Mon Sep 17 00:00:00 2001 From: Stelios Voutsinas Date: Thu, 11 Jul 2024 10:30:48 -0700 Subject: [PATCH 2/3] Changes from scriv fragment to changelog --- CHANGELOG.md | 8 +++++ ...240711_051828_steliosvoutsinas_DM_45142.md | 30 ------------------- 2 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 changelog.d/20240711_051828_steliosvoutsinas_DM_45142.md diff --git a/CHANGELOG.md b/CHANGELOG.md index d36a7de..805c5f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ 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/). + +# 2024-07-11 + +## Other changes + +- Remove unneeded cadc dependencies (issue with dali/stilts conflict) +- Upgrade log4j (Log4j vulnerability) + # 2024-06-28 ### Fixed diff --git a/changelog.d/20240711_051828_steliosvoutsinas_DM_45142.md b/changelog.d/20240711_051828_steliosvoutsinas_DM_45142.md deleted file mode 100644 index 658c729..0000000 --- a/changelog.d/20240711_051828_steliosvoutsinas_DM_45142.md +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - -### Other changes - -- Remove unneeded cadc dependencies (issue with dali/stilts conflict) -- Upgrade log4j (Log4j vulnerability) - From ef868f8dfa71ff9df95bb58c84c4b8877b094560 Mon Sep 17 00:00:00 2001 From: Stelios Voutsinas Date: Mon, 15 Jul 2024 14:48:43 -0700 Subject: [PATCH 3/3] Set scriv setting to match tap-postgres --- CHANGELOG.md | 15 ++++++++++----- changelog.d/scriv.ini | 5 ++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 805c5f9..dbffa45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,14 +6,17 @@ Find changes for the upcoming release in the project's [changelog.d](https://git -# 2024-07-11 + +## 2.4.1 (2024-07-15) -## Other changes +### Changed +- Changed scriv settings to match tap-postgres - Remove unneeded cadc dependencies (issue with dali/stilts conflict) - Upgrade log4j (Log4j vulnerability) -# 2024-06-28 + +# 2.4.0 (2024-06-28) ### Fixed @@ -23,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 + +# 2.3.1 (2024-06-18) ## Other Changes - Upgrade mysql-connector to 8.4.0 -# 2024-06-11 + +# 2.3.0 (2024-06-11) ## New features diff --git a/changelog.d/scriv.ini b/changelog.d/scriv.ini index e452bca..39f1cb8 100644 --- a/changelog.d/scriv.ini +++ b/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