Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump odlparent to 6.0.0
[controller.git]
/
opendaylight
/
md-sal
/
mdsal-it-parent
/
pom.xml
diff --git
a/opendaylight/md-sal/mdsal-it-parent/pom.xml
b/opendaylight/md-sal/mdsal-it-parent/pom.xml
index 7f835bd9d3a55f87f1a189bf063f0d9059bc153f..468743dbcecb0007a5f520cb541b70556f385bae 100644
(file)
--- a/
opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/
opendaylight/md-sal/mdsal-it-parent/pom.xml
@@
-13,20
+13,19
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>
3.1
.0</version>
+ <version>
6.0
.0</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-it-parent</artifactId>
<relativePath/>
</parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-it-parent</artifactId>
- <version>1.
8
.0-SNAPSHOT</version>
+ <version>1.
11
.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<packaging>pom</packaging>
<properties>
- <mdsal.version>1.
8
.0-SNAPSHOT</mdsal.version>
+ <mdsal.version>1.
11
.0-SNAPSHOT</mdsal.version>
<karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
<karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
<karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
<karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
- <karaf.distro.version>3.1.0</karaf.distro.version>
<karaf.distro.type>zip</karaf.distro.type>
<karaf.keep.unpack>false</karaf.keep.unpack>
</properties>
<karaf.distro.type>zip</karaf.distro.type>
<karaf.keep.unpack>false</karaf.keep.unpack>
</properties>
@@
-67,37
+66,19
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-features</artifactId>
<type>xml</type>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-features</artifactId>
<type>xml</type>
-
- <!-- FIXME: remove version declaration and scope once odlparent has this -->
- <version>${exam.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-extender-service</artifactId>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-extender-service</artifactId>
-
- <!-- FIXME: remove version declaration and scope once odlparent has this -->
- <version>${exam.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-inject</artifactId>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-inject</artifactId>
-
- <!-- FIXME: remove version declaration and scope once odlparent has this -->
- <version>${exam.version}</version>
- <scope>test</scope>
</dependency>
</dependency>
-
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-invoker-junit</artifactId>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-invoker-junit</artifactId>
-
- <!-- FIXME: remove version declaration and scope once odlparent has this -->
- <version>${exam.version}</version>
- <scope>test</scope>
</dependency>
</dependency>
-
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
@@
-132,7
+113,6
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${maven.surefire.version}</version>
<configuration>
<systemPropertyVariables>
<!-- CONTROLLER-1799: Use the same repository for Pax Exam as is used for Maven -->
<configuration>
<systemPropertyVariables>
<!-- CONTROLLER-1799: Use the same repository for Pax Exam as is used for Maven -->
@@
-205,7
+185,7
@@
and is available at http://www.eclipse.org/legal/epl-v10.html
<configuration>
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
<groupId>org.opendaylight.controller</groupId>
<configuration>
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
<groupId>org.opendaylight.controller</groupId>
- <includeArtifactIds>mockito-core,objenesis,
config-it-base,
mdsal-it-base</includeArtifactIds>
+ <includeArtifactIds>mockito-core,objenesis,mdsal-it-base</includeArtifactIds>
<excludes>META-INF\/**</excludes>
<ignorePermissions>false</ignorePermissions>
</configuration>
<excludes>META-INF\/**</excludes>
<ignorePermissions>false</ignorePermissions>
</configuration>