From 7a3d1800ada3d677a1666de59a59dd238309be65 Mon Sep 17 00:00:00 2001
From: Stelios Voutsinas <steliosvoutsinas@yahoo.com>
Date: Mon, 15 Jul 2024 19:02:16 -0700
Subject: [PATCH] Remove cadc lib not needed & fix starlink conflict

---
 CHANGELOG.md | 11 +++++++++++
 build.gradle |  5 ++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbffa45..e3fb3a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,17 @@ Find changes for the upcoming release in the project's [changelog.d](https://git
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-2.4.2'></a>
+## 2.4.2 (2024-07-15)
+
+### Changed
+
+- Remove unneeded cadc-libs
+
+### Fixed
+
+- Conflict between stilts & dali packages
+
 <a id='changelog-2.4.1'></a>
 ## 2.4.1 (2024-07-15)
 
diff --git a/build.gradle b/build.gradle
index f3a6133..f5f3c27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,11 +37,13 @@ war {
 configurations {
     intTestCompile.extendsFrom testImplementation
     intTestRuntime.extendsFrom testRuntimeOnly
+    implementation.exclude group: 'uk.ac.starlink'
 }
 
 dependencies {
     implementation 'org.apache.logging.log4j:log4j-core:2.17.2'
     implementation 'org.apache.logging.log4j:log4j-api:2.17.2'
+    implementation 'org.opencadc:cadc-access-control-identity:[1.0.7,)'
     implementation 'org.opencadc:cadc-adql:1.1.13'
     implementation 'org.opencadc:cadc-dali-pg:0.3.1'
     implementation 'org.opencadc:cadc-log:1.2.1'
@@ -66,9 +68,6 @@ dependencies {
 
     implementation 'com.google.cloud:google-cloud-storage:1.48.0'
     implementation 'org.restlet.jee:org.restlet.ext.servlet:2.0.3'
-    implementation 'org.opencadc:cadc-tap-server:[1.1.5,)'
-    implementation 'org.opencadc:cadc-adql:[1.1.4,)'
-    implementation 'org.opencadc:cadc-access-control-identity:[1.0.7,)'
     implementation 'software.amazon.awssdk:s3:2.17.230'
     implementation 'software.amazon.awssdk:auth:2.17.230'
     implementation 'org.apache.solr:solr-s3-repository:8.11.2'