From 03ade18ac83ab02ee1ce0d6d43725b96513b4577 Mon Sep 17 00:00:00 2001
From: "Thomas Nelson Jr (arthurdent3) tn1381@att.com" <tn1381@att.com>
Date: Tue, 5 Jun 2018 14:09:02 -0400
Subject: Update Master to include jar folder.

This will put jar folder form separate branch into this where it
belongs and we can build properly for beijing. Cassablanca will
have a parent pom approach.

Change-Id: Ieae3fce5ab42faddf4964285533fdc59d8b963de
Issue-ID: MUSIC-79
Signed-off-by: Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com>
---
 WebContent/WEB-INF/web.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'WebContent/WEB-INF')

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 59fe1251..323c805f 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -18,7 +18,8 @@
 		     	io.swagger.jaxrs.json,
                 io.swagger.jaxrs.listing,
                 org.onap.music.rest,
-                org.onap.music.exceptions
+                org.onap.music.exceptions,
+                org.onap.music.conductor.conditionals
 		     </param-value>
 		</init-param>
 		<init-param>
-- 
cgit 1.2.3-korg