Code Review
/
vfc
/
nfvo
/
driver
/
vnfm
/
svnfm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix version to 1.3.1
[vfc/nfvo/driver/vnfm/svnfm.git]
/
huawei
/
vnfmadapter
/
VnfmadapterService
/
service
/
pom.xml
diff --git
a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
index
a18c043
..
e1f54e3
100644
(file)
--- a/
huawei/vnfmadapter/VnfmadapterService/service/pom.xml
+++ b/
huawei/vnfmadapter/VnfmadapterService/service/pom.xml
@@
-20,7
+20,7
@@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId>
<artifactId>vnfmadapter-service-root</artifactId>
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId>
<artifactId>vnfmadapter-service-root</artifactId>
- <version>1.
1.0
-SNAPSHOT</version>
+ <version>1.
3.1
-SNAPSHOT</version>
</parent>
<artifactId>vnfmadapter-service</artifactId>
</parent>
<artifactId>vnfmadapter-service</artifactId>
@@
-73,11
+73,22
@@
<artifactId>com.springsource.org.apache.commons.codec</artifactId>
<version>1.3.0</version>
</dependency>
<artifactId>com.springsource.org.apache.commons.codec</artifactId>
<version>1.3.0</version>
</dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ </dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@
-106,11
+117,22
@@
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>2.2.2</version>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>2.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>3.1.17</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.1.6</version>
+ <version>3.1.17</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
@@
-126,52
+148,52
@@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>
3.1.0
.RELEASE</version>
+ <version>
4.3.18
.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>
3.1.0
.RELEASE</version>
+ <version>
4.3.18
.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>
3.1.0
.RELEASE</version>
+ <version>
4.3.18
.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>
3.1.0
.RELEASE</version>
+ <version>
5.1.5
.RELEASE</version>
</dependency>
</dependency>
- <dependency>
+ <
!--
dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>3.1.0.RELEASE</version>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>3.1.0.RELEASE</version>
- </dependency>
+ </dependency
--
>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>
3.1.0
.RELEASE</version>
+ <version>
4.3.18
.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>
3.1.0
.RELEASE</version>
+ <version>
4.3.18
.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>
3.1.0
.RELEASE</version>
+ <version>
4.3.18
.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>
3.1.0
.RELEASE</version>
+ <version>
4.3.18
.RELEASE</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
- <version>1.9.
2
</version>
+ <version>1.9.
13
</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
@@
-191,17
+213,17
@@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.
3.5
</version>
+ <version>4.
5.3
</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
- <version>4.
3.5
</version>
+ <version>4.
5.3
</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>4.
3.5
</version>
+ <version>4.
5.3
</version>
</dependency>
<!--dependency>
</dependency>
<!--dependency>
@@
-209,35
+231,26
@@
<artifactId>com.springsource.org.apache.commons.httpclient</artifactId>
<version>3.1.0</version>
</dependency-->
<artifactId>com.springsource.org.apache.commons.httpclient</artifactId>
<version>3.1.0</version>
</dependency-->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
</dependency>
- <dependency>
+
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.
3
.5</version>
+ <version>4.
5
.5</version>
</dependency>
</dependency>
- <dependency>
+
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpc
lient-cach
e</artifactId>
- <version>4.
3.5
</version>
+ <artifactId>httpc
or
e</artifactId>
+ <version>4.
4.1
</version>
</dependency>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <version>4.3.5</version>
- </dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>3.1.6</version>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>3.1.6</version>
- </dependency>
+ </dependency
--
>
<!-- UT coverage dependency start -->
<dependency>
<!-- UT coverage dependency start -->
<dependency>