summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-09-20 09:35:08 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-09-20 09:43:12 -0700
commit21c0990a50556bb57e4e13e1ebdbff976cc813f0 (patch)
treebb578e644fcf613f7a03559372bbadabb9e92c37
parent19659e205ef636cec767e32a62cc549cf9156d5b (diff)
Standardize 3rd party library versions
Use applicable 3rd party library versions from oparent. Includes upgrade to oparent 1.2.1. Change-Id: I04941105fc659a1829018da26d59ba56ad08ad42 Issue-ID: INT-656 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--bpmn/so-bpmn-infrastructure-common/pom.xml5
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/pom.xml5
-rw-r--r--pom.xml10
-rw-r--r--so-monitoring/so-monitoring-handler/pom.xml4
-rw-r--r--so-monitoring/so-monitoring-ui/src/main/frontend/yarn.lock6
5 files changed, 8 insertions, 22 deletions
diff --git a/bpmn/so-bpmn-infrastructure-common/pom.xml b/bpmn/so-bpmn-infrastructure-common/pom.xml
index ad51b3f69e..3523703ee8 100644
--- a/bpmn/so-bpmn-infrastructure-common/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-common/pom.xml
@@ -197,11 +197,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
-
- </dependency>
- <dependency>
<groupId>com.fasterxml.uuid</groupId>
<artifactId>java-uuid-generator</artifactId>
</dependency>
diff --git a/bpmn/so-bpmn-infrastructure-flows/pom.xml b/bpmn/so-bpmn-infrastructure-flows/pom.xml
index 4db7b3ff66..63b66cafe5 100644
--- a/bpmn/so-bpmn-infrastructure-flows/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-flows/pom.xml
@@ -168,11 +168,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
-
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
diff --git a/pom.xml b/pom.xml
index 3d78f5220c..daccd8fbc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
<relativePath/>
</parent>
<groupId>org.onap.so</groupId>
@@ -511,7 +511,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.8.10</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
@@ -681,12 +680,6 @@
WildFly 10 version -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.5</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.4</version>
<scope>compile</scope>
@@ -807,7 +800,6 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
diff --git a/so-monitoring/so-monitoring-handler/pom.xml b/so-monitoring/so-monitoring-handler/pom.xml
index a535d408f7..ae900ba422 100644
--- a/so-monitoring/so-monitoring-handler/pom.xml
+++ b/so-monitoring/so-monitoring-handler/pom.xml
@@ -33,7 +33,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
- <guava.version>22.0</guava.version>
<openpojo.version>0.8.6</openpojo.version>
</properties>
@@ -42,7 +41,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -92,4 +90,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-</project> \ No newline at end of file
+</project>
diff --git a/so-monitoring/so-monitoring-ui/src/main/frontend/yarn.lock b/so-monitoring/so-monitoring-ui/src/main/frontend/yarn.lock
index f6fade9614..7ecbb03ae7 100644
--- a/so-monitoring/so-monitoring-ui/src/main/frontend/yarn.lock
+++ b/so-monitoring/so-monitoring-ui/src/main/frontend/yarn.lock
@@ -4098,6 +4098,12 @@ next-tick@1:
version "1.0.0"
resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+ngx-spinner@^6.1.2:
+ version "6.1.2"
+ resolved "https://registry.yarnpkg.com/ngx-spinner/-/ngx-spinner-6.1.2.tgz#9778dbffbd17b27a7a90c4f0d9d8a7817e6ffb76"
+ dependencies:
+ tslib "^1.9.0"
+
no-case@^2.2.0:
version "2.3.2"
resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"