Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump versions by x.y.(z+1)
[netconf.git]
/
features
/
netconf-connector
/
features-netconf-connector
/
pom.xml
diff --git
a/features/netconf-connector/features-netconf-connector/pom.xml
b/features/netconf-connector/features-netconf-connector/pom.xml
index e9670fc5be149f6c86c89ec0fe4d41874c463dca..3c86155a9f8b56040b9abcb96974eee457a1041f 100644
(file)
--- a/
features/netconf-connector/features-netconf-connector/pom.xml
+++ b/
features/netconf-connector/features-netconf-connector/pom.xml
@@
-6,23
+6,27
@@
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>
2.0.0
</version>
+ <version>
4.0.11
</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<relativePath/>
</parent>
<groupId>org.opendaylight.netconf</groupId>
- <artifactId>features
4
-netconf-connector</artifactId>
- <version>1.
3.0
-SNAPSHOT</version>
+ <artifactId>features-netconf-connector</artifactId>
+ <version>1.
6.3
-SNAPSHOT</version>
<packaging>feature</packaging>
<packaging>feature</packaging>
+ <properties>
+ <!-- Skip SFT as some of the features are mutually exclusive, i.e. SFT may fail
+ if certain features are installed together. -->
+ <skip.karaf.featureTest>true</skip.karaf.featureTest>
+ </properties>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@
-52,13
+56,6
@@
<type>xml</type>
<classifier>features</classifier>
</dependency>
<type>xml</type>
<classifier>features</classifier>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>odl-netconf-connector-ssh</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>odl-netconf-callhome-ssh</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>odl-netconf-callhome-ssh</artifactId>
@@
-81,4
+78,4
@@
<classifier>features</classifier>
</dependency>
</dependencies>
<classifier>features</classifier>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>