Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Ignore feature conditions
[controller.git]
/
opendaylight
/
config
/
config-it-base
/
pom.xml
diff --git
a/opendaylight/config/config-it-base/pom.xml
b/opendaylight/config/config-it-base/pom.xml
index def8cd3fd36a302679d3cee3071495428aa3833b..f45ca9690e1cbb434082593e4854c2775f9c4efe 100644
(file)
--- a/
opendaylight/config/config-it-base/pom.xml
+++ b/
opendaylight/config/config-it-base/pom.xml
@@
-11,12
+11,17
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-parent</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-parent</artifactId>
- <version>0.
4
.0-SNAPSHOT</version>
- <relativePath
/
>
+ <version>0.
6
.0-SNAPSHOT</version>
+ <relativePath
>../config-parent</relativePath
>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>config-it-base</artifactId>
<packaging>bundle</packaging>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>config-it-base</artifactId>
<packaging>bundle</packaging>
+
+ <properties>
+ <opendaylight.karaf.version>1.8.0-SNAPSHOT</opendaylight.karaf.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
<dependencyManagement>
<dependencies>
<dependency>
@@
-33,6
+38,13
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-util</artifactId>
</dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>opendaylight-karaf-empty</artifactId>
+ <version>${opendaylight.karaf.version}</version>
+ <type>zip</type>
+ </dependency>
+
<!-- Dependencies for pax exam karaf container -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<!-- Dependencies for pax exam karaf container -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
@@
-76,10
+88,13
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.version}</version>
- </dependency>
</dependencies>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
</project>
</project>