Update benchmark integration

Reuse mdsal-parent to get both the project version and dependency
declarations, eliminating some amount of duplication.

Change-Id: I08bbae324edc340daef748803284853ddbba5b2d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/benchmark/api/pom.xml b/benchmark/api/pom.xml
index a74f2915041f855b13e0c33c7f68c795e9a91b4f..39b9cb2896511d44ab20bcb04a6d8a88ee428264 100644 (file)
--- a/benchmark/api/pom.xml
+++ b/benchmark/api/pom.xml
@@ -7,17 +7,16 @@ 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">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>6.0.0</version>
-    <relativePath/>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>mdsal-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../../opendaylight/md-sal/parent</relativePath>
   </parent>
 
-  <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>benchmark-api</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>
@@ -26,5 +25,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>yang-ext</artifactId>
     </dependency>
   </dependencies>
-
 </project>

diff --git a/benchmark/dsbenchmark/pom.xml b/benchmark/dsbenchmark/pom.xml
index 1cc3b74330ca3724c70f824a7a68e9292b1a54c4..d76e366b961c44057886a634c3e5e2ec636086af 100644 (file)
--- a/benchmark/dsbenchmark/pom.xml
+++ b/benchmark/dsbenchmark/pom.xml
@@ -8,32 +8,18 @@ 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">
-
+  <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>6.0.0</version>
-    <relativePath/>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>mdsal-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../../opendaylight/md-sal/parent</relativePath>
   </parent>
 
-  <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>dsbenchmark</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>controller-artifacts</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -52,36 +38,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>yang-data-impl</artifactId>
     </dependency>
   </dependencies>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <versionRange>[0.7.2.201409121644,)</versionRange>
-                    <goals>
-                      <goal>prepare-agent</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore/>
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-        </plugins>
-    </pluginManagement>
-  </build>
 </project>

diff --git a/benchmark/ntfbenchmark/pom.xml b/benchmark/ntfbenchmark/pom.xml
index a78896f493e7e9299c2807ccfd677668b959a29a..32c51d2d6164f4a9de38c2fe739cd807343f81f7 100644 (file)
--- a/benchmark/ntfbenchmark/pom.xml
+++ b/benchmark/ntfbenchmark/pom.xml
@@ -8,32 +8,18 @@ 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">
-
+  <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>6.0.0</version>
-    <relativePath/>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>mdsal-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../../opendaylight/md-sal/parent</relativePath>
   </parent>
 
-  <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>ntfbenchmark</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>controller-artifacts</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/benchmark/rpcbenchmark/pom.xml b/benchmark/rpcbenchmark/pom.xml
index 794befefe16a9fc1d6123ef1c7b201458c4f94db..69f051c1592b64b954fdc79f9e2011dfff987506 100644 (file)
--- a/benchmark/rpcbenchmark/pom.xml
+++ b/benchmark/rpcbenchmark/pom.xml
@@ -8,32 +8,18 @@ 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">
-
+  <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>6.0.0</version>
-    <relativePath/>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>mdsal-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../../opendaylight/md-sal/parent</relativePath>
   </parent>
 
-  <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>rpcbenchmark</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>controller-artifacts</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>