Code Review
/
sdc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix handling of default values for VFC properties
[sdc.git]
/
asdctool
/
pom.xml
diff --git
a/asdctool/pom.xml
b/asdctool/pom.xml
index
3b0d02a
..
5a50dcc
100644
(file)
--- a/
asdctool/pom.xml
+++ b/
asdctool/pom.xml
@@
-9,7
+9,7
@@
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.1
0.1
-SNAPSHOT</version>
+ <version>1.1
2.2
-SNAPSHOT</version>
</parent>
<dependencies>
</parent>
<dependencies>
@@
-43,6
+43,10
@@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.functionaljava</groupId>
+ <artifactId>functionaljava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
</exclusions>
</dependency>
<dependency>
@@
-206,10
+210,6
@@
<version>${jetty.version}</version>
<scope>compile</scope>
<exclusions>
<version>${jetty.version}</version>
<scope>compile</scope>
<exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
@@
-300,8
+300,12
@@
<scope>compile</scope>
<exclusions>
<exclusion>
<scope>compile</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-groovy</artifactId>
<artifactId>gremlin-groovy</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.tinkerpop</groupId>
<groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.json</groupId>
</exclusion>
<exclusion>
<groupId>org.json</groupId>
@@
-537,6
+541,12
@@
<artifactId>cassandra-driver-core</artifactId>
<version>${cassandra.driver.version}</version>
<scope>compile</scope>
<artifactId>cassandra-driver-core</artifactId>
<version>${cassandra.driver.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.github.jnr</groupId>
+ <artifactId>jnr-posix</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
</dependency>
<dependency>