diff options
| author |   janani b <janani.b@huawei.com> | 2019-02-07 19:21:55 +0530 |
|---|---|---|
| committer | janani b <janani.b@huawei.com> | 2019-02-07 20:44:28 +0530 |
| commit | 77a8961d8a40afb557814802264aaab50291807f (patch) | |
| tree | 39524d1a5a30454073689e7bdeafd695ef0ba86b /features | |
| parent | 02c666d1f6d40158a004a946a507c16e4ad5a70c (diff) | |
Resolution for jersey version conflict
Moved the glassfish version of jersey to point to 2.25.1 as to that of odl
Issue-ID: CCSDK-1034
Change-Id: Ia245f3f49f035b45ce9668d334b05a70254272d6
Signed-off-by: janani b <janani.b@huawei.com>
Diffstat (limited to 'features')
| -rw-r--r-- | features/ccsdk-sli-plugins-all/pom.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/features/ccsdk-sli-plugins-all/pom.xml b/features/ccsdk-sli-plugins-all/pom.xml index 2c4e4c61..7d9068e8 100644 --- a/features/ccsdk-sli-plugins-all/pom.xml +++ b/features/ccsdk-sli-plugins-all/pom.xml @@ -25,7 +25,7 @@ <type>xml</type> <classifier>features</classifier> </dependency> - <!-- Current breaks container due to jersey version conflict + <dependency> <groupId>${project.groupId}</groupId> <artifactId>ccsdk-restapi-call-node</artifactId> @@ -33,7 +33,7 @@ <type>xml</type> <classifier>features</classifier> </dependency> - --> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>ccsdk-template-node</artifactId> |