From: sheetalm <sheetal.mudholkar@amdocs.com>
Date: Wed, 13 Dec 2017 09:55:05 +0000 (+0530)
Subject: Rearranging togglez to avoid dependency issues
X-Git-Tag: v1.2.0~658
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F26205%2F1;p=sdc.git

Rearranging togglez to avoid dependency issues

Added new profile "dev-integ" which will allow togglez-console
dependency to be added. When built with default profile togglez-console
will be excluded

Change-Id: I8a918fe1ad56620d4215acb70dc126b0bc986802
Issue-ID: SDC-343
Signed-off-by: sheetalm <sheetal.mudholkar@amdocs.com>
---

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml
index af604f30ce..84c4eb408a 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml
@@ -141,6 +141,11 @@
             <artifactId>aspectjtools</artifactId>
             <version>${aspectj.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.togglz</groupId>
+            <artifactId>togglz-servlet</artifactId>
+            <version>${togglz.version}</version>
+        </dependency>
     </dependencies>
 
 
diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml
index 3934f411fd..02da3b9e46 100644
--- a/openecomp-be/pom.xml
+++ b/openecomp-be/pom.xml
@@ -40,18 +40,6 @@
             <version>${togglz.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.togglz</groupId>
-            <artifactId>togglz-servlet</artifactId>
-            <version>${togglz.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.togglz</groupId>
-            <artifactId>togglz-console</artifactId>
-            <version>${togglz.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.togglz</groupId>
             <artifactId>togglz-testing</artifactId>
diff --git a/pom.xml b/pom.xml
index bd7bb2a457..25d58ca061 100644
--- a/pom.xml
+++ b/pom.xml
@@ -396,6 +396,20 @@
 				<module>onboarding</module>
 			</modules>
 		</profile>
+
+		<profile>
+			<id>dev-integ</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.togglz</groupId>
+					<artifactId>togglz-console</artifactId>
+					<version>${togglz.version}</version>
+				</dependency>
+			</dependencies>
+		</profile>
 	</profiles>
 
 	<repositories>