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 versions to 5.0.4-SNAPSHOT
[controller.git]
/
benchmark
/
ntfbenchmark
/
pom.xml
diff --git
a/benchmark/ntfbenchmark/pom.xml
b/benchmark/ntfbenchmark/pom.xml
index bf73787a6383d5b96506870595f3832676a9e1b7..8fe0302a7b3484786243c9ff67a561f359478f3c 100644
(file)
--- a/
benchmark/ntfbenchmark/pom.xml
+++ b/
benchmark/ntfbenchmark/pom.xml
@@
-1,5
+1,6
@@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: --><!--
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
This program and the accompanying materials are made available under the
Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
This program and the accompanying materials are made available under the
@@
-7,61
+8,39
@@
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">
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">
-
+ <modelVersion>4.0.0</modelVersion>
<parent>
<parent>
- <groupId>org.opendaylight.
mdsal
</groupId>
- <artifactId>
binding
-parent</artifactId>
- <version>
0.14.0
-SNAPSHOT</version>
- <relativePath
/
>
+ <groupId>org.opendaylight.
controller
</groupId>
+ <artifactId>
mdsal
-parent</artifactId>
+ <version>
5.0.4
-SNAPSHOT</version>
+ <relativePath
>../../opendaylight/md-sal/parent</relativePath
>
</parent>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.opendaylight.controller</groupId>
<artifactId>ntfbenchmark</artifactId>
<artifactId>ntfbenchmark</artifactId>
- <version>1.7.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<packaging>bundle</packaging>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>1.9.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>benchmark-api</artifactId>
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>benchmark-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>sal-binding-api</artifactId>
+ <groupId>org.opendaylight.
mdsal
</groupId>
+ <artifactId>
md
sal-binding-api</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-core-api</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.guicedee.services</groupId>
+ <artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>yang-data-impl</artifactId>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <optional>true</optional>
</dependency>
</dependencies>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <propertyExpansion>checkstyle.violationseverity=error</propertyExpansion>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
</project>