Code Review / integration / distribution.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Unify BGPCEP version
[integration/distribution.git] / distributions / serviceprovider / pom.xml
diff --git a/distributions/serviceprovider/pom.xml b/distributions/serviceprovider/pom.xml
index 28d80d3bb8a2a590d294679e48beb0c80d86b286..0e85cc52abc06f867c8568c689fb9edad65be7ca 100644 (file)
--- a/distributions/serviceprovider/pom.xml
+++ b/distributions/serviceprovider/pom.xml
@@ -4,15 +4,12 @@
 Adapted from David Erickson's Distribution pom.xml
 see https://git.opendaylight.org/gerrit/#/c/390/
 -->
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>distributions</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <version>0.1.2-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
@@ -21,97 +18,79 @@ http://maven.apache.org/maven-v4_0_0.xsd">
   <name>OpenDaylight Service Provider Edition</name>
 
   <properties>
-    <bgpcep.bgp.version>0.3.0-SNAPSHOT</bgpcep.bgp.version>
-    <bgpcep.common.version>0.3.0-SNAPSHOT</bgpcep.common.version>
-    <bgpcep.pcep.version>0.3.0-SNAPSHOT</bgpcep.pcep.version>
-    <bgpcep.programming.version>0.3.0-SNAPSHOT</bgpcep.programming.version>
-    <bgpcep.rsvp.version>0.3.0-SNAPSHOT</bgpcep.rsvp.version>
-    <bgpcep.topology.version>0.3.0-SNAPSHOT</bgpcep.topology.version>
+    <bgpcep.version>0.3.1-SNAPSHOT</bgpcep.version>
+    <lispflowmapping.version>1.1.6-SNAPSHOT</lispflowmapping.version>
 
-    <ietf.topology.version>2013.10.21.0-SNAPSHOT</ietf.topology.version>
+    <ietf.topology.version>2013.10.21.2-SNAPSHOT</ietf.topology.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.integration</groupId>
       <artifactId>distributions-base</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
+      <version>0.1.2-SNAPSHOT</version>
       <type>zip</type>
       <classifier>osgipackage</classifier>
       <!-- Make sure this isn't included on any classpath-->
       <scope>provided</scope>
     </dependency>
 
-        <!--
-    <dependency>
-      <groupId>org.opendaylight.defense4all</groupId>
-      <artifactId>defense4all.core.impl</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.defense4all</groupId>
-      <artifactId>framework.core.impl</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.defense4all</groupId>
-      <artifactId>restservice</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-    </dependency>
-    -->
-
     <!-- affinity -->
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity.implementation</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity.northbound</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>l2agent</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <artifactId>flatl2</artifactId>
+      <version>0.4.2-SNAPSHOT</version>
     </dependency>
 
-    <!--
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>model-parent</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <artifactId>flatl2.northbound</artifactId>
+      <version>0.4.2-SNAPSHOT</version>
     </dependency>
-    -->
+
+    <dependency>
+      <groupId>org.opendaylight.affinity</groupId>
+      <artifactId>l2agent</artifactId>
+      <version>0.4.2-SNAPSHOT</version>
+    </dependency>
+
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>analytics</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>analytics.implementation</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>analytics.northbound</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.2-SNAPSHOT</version>
     </dependency>
 
+
     <!--
          BGPCEP: required IETF models
          -->
@@ -147,17 +126,12 @@ http://maven.apache.org/maven-v4_0_0.xsd">
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>concepts</artifactId>
-      <version>${bgpcep.common.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>framework</artifactId>
-      <version>${bgpcep.common.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>util</artifactId>
-      <version>${bgpcep.common.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
 
     <!--
@@ -166,17 +140,17 @@ http://maven.apache.org/maven-v4_0_0.xsd">
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>topology-api</artifactId>
-      <version>${bgpcep.topology.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>topology-api-config</artifactId>
-      <version>${bgpcep.topology.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>topology-tunnel-api</artifactId>
-      <version>${bgpcep.topology.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
 
     <!--
@@ -185,87 +159,87 @@ http://maven.apache.org/maven-v4_0_0.xsd">
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-concepts</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-linkstate</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-linkstate-config</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-parser-api</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-parser-impl</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-parser-spi-config</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-parser-spi</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-rib-api-config</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-rib-api</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-rib-impl-config</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-rib-impl</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-rib-spi</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-rib-spi-config</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-topology-provider</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>bgp-topology-provider-config</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>bgp-update-api-config</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <artifactId>bgp-util</artifactId>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>bgp-util</artifactId>
-      <version>${bgpcep.bgp.version}</version>
+      <artifactId>bgp-controller-config</artifactId>
+      <version>${bgpcep.version}</version>
     </dependency>
 
     <!--
@@ -274,37 +248,42 @@ http://maven.apache.org/maven-v4_0_0.xsd">
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>programming-api</artifactId>
-      <version>${bgpcep.programming.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>programming-impl</artifactId>
-      <version>${bgpcep.programming.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>programming-impl-config</artifactId>
-      <version>${bgpcep.programming.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>programming-spi</artifactId>
-      <version>${bgpcep.programming.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>programming-spi-config</artifactId>
-      <version>${bgpcep.programming.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>programming-topology-api</artifactId>
-      <version>${bgpcep.programming.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>programming-tunnel-api</artifactId>
-      <version>${bgpcep.programming.version}</version>
+      <version>${bgpcep.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.bgpcep</groupId>
+      <artifactId>programming-controller-config</artifactId>
+      <version>${bgpcep.version}</version>
     </dependency>
 
     <!--
@@ -313,7 +292,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>rsvp-api</artifactId>
-      <version>${bgpcep.rsvp.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
 
     <!--
@@ -322,105 +301,137 @@ http://maven.apache.org/maven-v4_0_0.xsd">
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>pcep-api-config</artifactId>
-      <version>${bgpcep.pcep.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>pcep-api</artifactId>
-      <version>${bgpcep.pcep.version}</version>
+      <version>${bgpcep.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.bgpcep</groupId>
+      <artifactId>pcep-ietf-stateful02</artifactId>
+      <version>${bgpcep.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.bgpcep</groupId>
+      <artifactId>pcep-ietf-stateful07</artifactId>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>pcep-impl-config</artifactId>
-      <version>${bgpcep.pcep.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>pcep-impl</artifactId>
-      <version>${bgpcep.pcep.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>pcep-spi</artifactId>
-      <version>${bgpcep.pcep.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>pcep-spi-config</artifactId>
-      <version>${bgpcep.pcep.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>pcep-testtool</artifactId>
-      <version>${bgpcep.pcep.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>pcep-topology-api</artifactId>
-      <version>${bgpcep.pcep.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>pcep-topology-provider</artifactId>
-      <version>${bgpcep.pcep.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>pcep-topology-provider-config</artifactId>
-      <version>${bgpcep.pcep.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>pcep-topology-spi</artifactId>
-      <version>${bgpcep.pcep.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>pcep-tunnel-api</artifactId>
-      <version>${bgpcep.pcep.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>pcep-tunnel-provider</artifactId>
-      <version>${bgpcep.pcep.version}</version>
+      <version>${bgpcep.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
       <artifactId>pcep-tunnel-provider-config</artifactId>
-      <version>${bgpcep.pcep.version}</version>
+      <version>${bgpcep.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.bgpcep</groupId>
+      <artifactId>pcep-controller-config</artifactId>
+      <version>${bgpcep.version}</version>
     </dependency>
 
     <!-- lispflowmapping -->
+       <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.yangmodel</artifactId>
+      <version>${lispflowmapping.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.api</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
+      <version>${lispflowmapping.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.config</artifactId>
+      <version>${lispflowmapping.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.implementation</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
+      <version>${lispflowmapping.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>mappingservice.clusterdao</artifactId>
+      <version>${lispflowmapping.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.northbound</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
+      <version>${lispflowmapping.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.southbound</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
+      <version>${lispflowmapping.version}</version>
     </dependency>
 
     <!--SNMP4SDN-->
     <dependency>
       <groupId>org.opendaylight.snmp4sdn</groupId>
       <artifactId>snmp4sdn</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
+      <version>0.1.2</version>
     </dependency>
 
   </dependencies>
@@ -436,41 +447,45 @@ http://maven.apache.org/maven-v4_0_0.xsd">
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
         <version>2.6</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.8</version>
         <executions>
           <execution>
-            <phase>generate-resources</phase>
-            <id>copy-resources</id>
+            <id>unpack-shared-resources</id>
             <goals>
-              <goal>copy-resources</goal>
+              <goal>unpack-dependencies</goal>
             </goals>
+            <phase>generate-resources</phase>
             <configuration>
               <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${basedir}/src/main/resources</directory>
-                </resource>
-              </resources>
+              <includeArtifacIds>distributions-base</includeArtifacIds>
+              <includeGroupIds>org.opendaylight.integration</includeGroupIds>
+              <excludeTransitive>true</excludeTransitive>
+              <ignorePermissions>false</ignorePermissions>
             </configuration>
           </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.8</version>
-        <executions>
+
           <execution>
-            <id>unpack-shared-resources</id>
+            <id>unpack-provided-configs</id>
             <goals>
               <goal>unpack-dependencies</goal>
             </goals>
             <phase>generate-resources</phase>
             <configuration>
-             <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
-             <includeArtifacIds>distributions-base</includeArtifacIds>
-             <includeGroupIds>org.opendaylight.integration</includeGroupIds>
-             <excludeTransitive>true</excludeTransitive>
-             <ignorePermissions>false</ignorePermissions>
+              <outputDirectory>${project.build.directory}/provided-configs</outputDirectory>
+              <includeArtifactIds>
+                bgp-controller-config,
+                pcep-controller-config,
+                programming-controller-config,
+              </includeArtifactIds>
+              <includeGroupIds>
+                org.opendaylight.bgpcep,
+              </includeGroupIds>
+              <excludeTransitive>true</excludeTransitive>
+              <ignorePermissions>false</ignorePermissions>
             </configuration>
           </execution>
         </executions>
Integration distribution