From 4e4aaa9aa7acd9f66222fb6a41321c18d0839812 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Fri, 6 Aug 2021 16:42:10 -0400
Subject: Package upgrades for Istanbul

Code updates to support package upgrades in Istanbul

Issue-ID: CCSDK-3415
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I44efd0d335bc63cc627d6ba64df1d5e406deb72a
---
 core/features/ccsdk-dblib/pom.xml                      | 1 -
 core/features/ccsdk-dblib/src/main/feature/feature.xml | 1 -
 2 files changed, 2 deletions(-)

(limited to 'core/features')

diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml
index 313371b68..63a21c240 100644
--- a/core/features/ccsdk-dblib/pom.xml
+++ b/core/features/ccsdk-dblib/pom.xml
@@ -29,7 +29,6 @@
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-jdbc</artifactId>
-            <version>9.0.30</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
diff --git a/core/features/ccsdk-dblib/src/main/feature/feature.xml b/core/features/ccsdk-dblib/src/main/feature/feature.xml
index acb7a7399..f8f53a7ce 100644
--- a/core/features/ccsdk-dblib/src/main/feature/feature.xml
+++ b/core/features/ccsdk-dblib/src/main/feature/feature.xml
@@ -6,7 +6,6 @@
         <feature prerequisite="true" dependency="false">wrap</feature>
         <bundle>mvn:org.onap.ccsdk.sli.core/dblib-provider/${project.version}</bundle>
         <bundle>wrap:mvn:org.apache.tomcat/tomcat-jdbc/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&amp;overwrite=merge</bundle>
-        <bundle>wrap:mvn:org.apache.tomcat/tomcat-juli/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&amp;overwrite=merge</bundle>
         <bundle>mvn:org.onap.ccsdk.sli.core/utils-provider/${project.version}</bundle>
     </feature>
 </features>
-- 
cgit 1.2.3-korg