summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsheetalm <sheetal.mudholkar@amdocs.com>2017-12-13 15:25:05 +0530
committersheetalm <sheetal.mudholkar@amdocs.com>2017-12-13 15:51:21 +0530
commit64ffbe2d6567b28b31f82c0dbf38379281722d7d (patch)
tree1832a2dd2b6dc159951038db1c089c7cc9296e47
parent4b1c2aaab1c3200076138d8702bc324d78a69fa8 (diff)
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>
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml5
-rw-r--r--openecomp-be/pom.xml12
-rw-r--r--pom.xml14
3 files changed, 19 insertions, 12 deletions
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
@@ -42,18 +42,6 @@
<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>
<version>${togglz.version}</version>
<scope>test</scope>
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>