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 af604f3..84c4eb4 100644 (file)
--- 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 3934f41..02da3b9 100644 (file)
--- 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 bd7bb2a..25d58ca 100644 (file)
--- 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>