commit 23c6e0be5fab9463f137615053ef412e4da2315e Author: iwakeh iwakeh@torproject.org Date: Thu Oct 5 18:03:29 2017 +0000

Let the jdbc driver service configuration be part of the jar.

This is part of task-21145. --- java/base.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/base.xml b/java/base.xml index db197ea..f66644d 100644 --- a/java/base.xml +++ b/java/base.xml @@ -290,7 +290,12 @@ <fileset dir="${resources}" includes="${resourceincludes}" /> <restrict> <not> - <name name="META-INF/*" /> + <and> + <name name="META-INF/*" /> + <not> + <name name="META-INF/services/java.sql.Driver" /> + </not> + </and> </not> <archives> <zips>