Cleanup sal-akka-raft/pom.xml

Restructuring to not inherit from aggregator pom.

Change-Id: I0084848fc3740534c8c7be9fb25276a72c26d837
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/md-sal/sal-akka-raft/pom.xml b/opendaylight/md-sal/sal-akka-raft/pom.xml
index ad8a7367a08b48a6f9dc057e5a65a77d76db0028..cb1e653b0d966ae566de4d29e21d43038b6c5727 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/pom.xml
+++ b/opendaylight/md-sal/sal-akka-raft/pom.xml
@@ -2,13 +2,29 @@
 <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>
 <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.controller</groupId>
-    <artifactId>sal-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <relativePath/>

   </parent>
   </parent>

+
+  <groupId>org.opendaylight.controller</groupId>

   <artifactId>sal-akka-raft</artifactId>
   <artifactId>sal-akka-raft</artifactId>

+  <version>1.5.0-SNAPSHOT</version>

   <packaging>bundle</packaging>
 
   <packaging>bundle</packaging>
 

+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+

   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>


@@ -70,7 +86,6 @@
       <artifactId>akka-slf4j_${scala.version}</artifactId>
     </dependency>
 
       <artifactId>akka-slf4j_${scala.version}</artifactId>
     </dependency>
 

-

       <!-- Test Dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <!-- Test Dependencies -->
     <dependency>
       <groupId>junit</groupId>


@@ -121,36 +136,6 @@
       </plugin>
 
       <plugin>
       </plugin>
 
       <plugin>

-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>org/opendaylight/controller/cluster/**/*</include>
-          </includes>
-          <excludes>
-              <exclude>org/opendaylight/controller/cluster/raft/protobuff/**/*</exclude>
-              <exclude>org/opendaylight/controller/cluster/example/**/*</exclude>
-          </excludes>
-          <check>false</check>
-        </configuration>
-        <executions>
-          <execution>
-            <id>pre-test</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>post-test</id>
-            <goals>
-              <goal>report</goal>
-            </goals>
-            <phase>test</phase>
-          </execution>
-        </executions>
-      </plugin>
-
-     <plugin>

         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>


@@ -166,10 +151,27 @@
       </plugin>
     </plugins>
   </build>
       </plugin>
     </plugins>
   </build>

+

   <scm>
     <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL:Architecture:Clustering</url>
   </scm>
   <scm>
     <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL:Architecture:Clustering</url>
   </scm>

+
+  <!--
+      Maven Site Configuration
+
+      The following configuration is necessary for maven-site-plugin to
+      correctly identify the correct deployment path for OpenDaylight Maven
+      sites.
+  -->
+  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+  <distributionManagement>
+    <site>
+      <id>opendaylight-site</id>
+      <url>${nexus.site.url}/${project.artifactId}/</url>
+    </site>
+  </distributionManagement>

 </project>
 </project>