X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=artifacts%2Fupstream%2Fartifacts%2Fpom.xml;h=03c43405f31dc0faaaae36a5e83b6ea1b255d1e3;hb=3396e612b82a032f1e3c331e681b085e5b2b4a03;hp=315190c2aba05625635eca08a9300dabfbf70c84;hpb=16a4588897eb24c424a015af5652734fd8779777;p=integration%2Fdistribution.git

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 315190c2..03c43405 100644
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.integration</groupId>
         <artifactId>properties</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>0.13.0-SNAPSHOT</version>
         <relativePath>../properties</relativePath>
     </parent>
     <artifactId>artifact-artifacts</artifactId>
@@ -41,16 +41,16 @@
     <!-- Project artifact poms. Alphabetical order -->
     <profiles>
         <profile>
-            <id>bgpcep</id>
+            <id>aaa</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.bgpcep</groupId>
-                        <artifactId>bgpcep-artifacts</artifactId>
-                        <version>${bgpcep.version}</version>
+                        <groupId>org.opendaylight.aaa</groupId>
+                        <artifactId>aaa-artifacts</artifactId>
+                        <version>${aaa.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
@@ -58,16 +58,16 @@
             </dependencyManagement>
         </profile>
         <profile>
-            <id>coe</id>
+            <id>bgpcep</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.coe</groupId>
-                        <artifactId>coe-artifacts</artifactId>
-                        <version>${coe.version}</version>
+                        <groupId>org.opendaylight.bgpcep</groupId>
+                        <artifactId>bgpcep-artifacts</artifactId>
+                        <version>${bgpcep.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
@@ -83,8 +83,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>config-artifacts</artifactId>
-                        <version>${config.version}</version>
+                        <artifactId>controller-artifacts</artifactId>
+                        <version>${controller.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
@@ -126,16 +126,16 @@
             </dependencyManagement>
         </profile>
         <profile>
-            <id>groupbasedpolicy</id>
+            <id>infrautils</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.groupbasedpolicy</groupId>
-                        <artifactId>groupbasedpolicy-artifacts</artifactId>
-                        <version>${groupbasedpolicy.version}</version>
+                        <groupId>org.opendaylight.infrautils</groupId>
+                        <artifactId>infrautils-artifacts</artifactId>
+                        <version>${infrautils.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
@@ -143,16 +143,16 @@
             </dependencyManagement>
         </profile>
         <profile>
-            <id>honeycombvbd</id>
+            <id>jsonrpc</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.honeycomb.vbd</groupId>
-                        <artifactId>vbd-artifacts</artifactId>
-                        <version>${honeycomb.vbd.version}</version>
+                        <groupId>org.opendaylight.jsonrpc</groupId>
+                        <artifactId>jsonrpc-artifacts</artifactId>
+                        <version>${jsonrpc.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
@@ -160,16 +160,16 @@
             </dependencyManagement>
         </profile>
         <profile>
-            <id>infrautils</id>
+            <id>lispflowmapping</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.infrautils</groupId>
-                        <artifactId>infrautils-artifacts</artifactId>
-                        <version>${infrautils.version}</version>
+                        <groupId>org.opendaylight.lispflowmapping</groupId>
+                        <artifactId>lispflowmapping-artifacts</artifactId>
+                        <version>${lispflowmapping.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
@@ -177,19 +177,27 @@
             </dependencyManagement>
         </profile>
         <profile>
-            <id>lispflowmapping</id>
+            <id>mdsal</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.lispflowmapping</groupId>
-                        <artifactId>lispflowmapping-artifacts</artifactId>
-                        <version>${lispflowmapping.version}</version>
+                        <groupId>org.opendaylight.mdsal</groupId>
+                        <artifactId>mdsal-artifacts</artifactId>
+                        <version>${mdsal.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
+                    <!-- FIXME: remove this with mdsal-6.0.1+ -->
+                    <dependency>
+                        <groupId>org.opendaylight.mdsal</groupId>
+                        <artifactId>odl-mdsal-trace</artifactId>
+                        <version>${mdsal.version}</version>
+                        <classifier>features</classifier>
+                        <type>xml</type>
+                    </dependency>
                 </dependencies>
             </dependencyManagement>
         </profile>
@@ -207,13 +215,6 @@
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.netconf</groupId>
-                        <artifactId>restconf-artifacts</artifactId>
-                        <version>${restconf.version}</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                    </dependency>
                 </dependencies>
             </dependencyManagement>
         </profile>
@@ -251,6 +252,23 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
+        <profile>
+            <id>odlparent</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.odlparent</groupId>
+                        <artifactId>odlparent-artifacts</artifactId>
+                        <version>${odlparent.version}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
         <profile>
             <id>openflowplugin</id>
             <activation>
@@ -300,16 +318,16 @@
             </dependencyManagement>
         </profile>
         <profile>
-            <id>tsdr</id>
+            <id>serviceutils</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.tsdr</groupId>
-                        <artifactId>tsdr-artifacts</artifactId>
-                        <version>${tsdr.version}</version>
+                        <groupId>org.opendaylight.serviceutils</groupId>
+                        <artifactId>serviceutils-artifacts</artifactId>
+                        <version>${serviceutils.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
@@ -317,17 +335,16 @@
             </dependencyManagement>
         </profile>
         <profile>
-            <id>unimgr</id>
+            <id>yangtools</id>
             <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
                     <dependency>
-                        <groupId>org.opendaylight.unimgr</groupId>
-                        <artifactId>unimgr-artifacts</artifactId>
-                        <version>${unimgr.version}</version>
+                        <groupId>org.opendaylight.yangtools</groupId>
+                        <artifactId>yangtools-artifacts</artifactId>
+                        <version>${yangtools.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>