diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-02-24 16:24:34 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-02-24 16:24:34 -0500 |
| commit | 7852314d98e8d049ce338816141ff80ee4f55751 (patch) | |
| tree | 4aac814e084b03f99cd18cc0533d95c18da70383 | |
| parent | fefd8620a4da1136eab869597af5ce475398198c (diff) | |
Fix dblib dependency scope
Scope of dependency on dblib must be provided to avoid conflicting
definition of embedded tomcat dependency in derived feature.xml
Change-Id: Ib2da967427c80701525a8ba4c3432a9f9844a5f9
Issue-ID: CCSDK-2117
Signed-off-by: Dan Timoney <dtimoney@att.com>
| -rw-r--r-- | sdnr/northbound/oofpcipoc/provider/pom.xml | 2 | ||||
| -rw-r--r-- | sdnr/wt/odlux/package.json | 2 | ||||
| -rw-r--r-- | sdnr/wt/odlux/yarn.lock | 16 |
3 files changed, 19 insertions, 1 deletions
diff --git a/sdnr/northbound/oofpcipoc/provider/pom.xml b/sdnr/northbound/oofpcipoc/provider/pom.xml index f3ac13e30..823e107cc 100644 --- a/sdnr/northbound/oofpcipoc/provider/pom.xml +++ b/sdnr/northbound/oofpcipoc/provider/pom.xml @@ -69,10 +69,12 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> diff --git a/sdnr/wt/odlux/package.json b/sdnr/wt/odlux/package.json index b9764f090..12d18c14d 100644 --- a/sdnr/wt/odlux/package.json +++ b/sdnr/wt/odlux/package.json @@ -82,4 +82,4 @@ "webpack-cli": "3.2.1", "webpack-dev-server": "3.1.14" } -}
\ No newline at end of file +} diff --git a/sdnr/wt/odlux/yarn.lock b/sdnr/wt/odlux/yarn.lock index 6dbdefecc..448d781a9 100644 --- a/sdnr/wt/odlux/yarn.lock +++ b/sdnr/wt/odlux/yarn.lock @@ -1361,6 +1361,17 @@ dependencies: "@babel/runtime" "^7.4.4" +"@material-ui/lab@4.0.0-alpha.41": + version "4.0.0-alpha.41" + resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.41.tgz#3848fd0ad224f02d86f737b60ce78c1524c122a3" + integrity sha512-nVXW5eHOLtExRSlfd6Hxa0hna1xenqCunoQv1MbGAVqW3XzLgWdCE2xKWwG3Ewdt/CZ4QUF5+KTTLVtZIqIeOw== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/utils" "^4.7.1" + clsx "^1.0.4" + prop-types "^15.7.2" + react-is "^16.8.0" + "@material-ui/styles@^4.9.0": version "4.9.0" resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.0.tgz#10c31859f6868cfa9d3adf6b6c3e32c9d676bc76" @@ -2983,6 +2994,11 @@ clsx@^1.0.2: resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.0.4.tgz#0c0171f6d5cb2fe83848463c15fcc26b4df8c2ec" integrity sha512-1mQ557MIZTrL/140j+JVdRM6e31/OA4vTYxXgqIIZlndyfjHpyawKZia1Im05Vp9BWmImkcNrNtFYQMyFcgJDg== +clsx@^1.0.4: + version "1.1.0" + resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.0.tgz#62937c6adfea771247c34b54d320fb99624f5702" + integrity sha512-3avwM37fSK5oP6M5rQ9CNe99lwxhXDOeSWVPAOYF6OazUTgZCMb0yWlJpmdD74REy1gkEaFiub2ULv4fq9GUhA== + cmd-shim@^2.0.2: version "2.1.0" resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.1.0.tgz#e59a08d4248dda3bb502044083a4db4ac890579a" |