Code Review / integration / distribution.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: d20ae87)
Add transportpce projects in chlorine distribution 68/102568/7
authorGilles Thouenon <gilles.thouenon@orange.com>
Wed, 5 Oct 2022 11:55:43 +0000 (13:55 +0200)
committerAnil Belur <abelur@linuxfoundation.org>
Fri, 11 Nov 2022 06:18:51 +0000 (06:18 +0000)
- move transportpce features from opendaylight/pom.xml (self-managed
  project) to features repo (managed project)
- add new transportpce-models features to the distribution

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I7ae8bcd365a32316489526962685b99e9b8715c2

artifacts/upstream/artifacts/pom.xml patch | blob | history
artifacts/upstream/properties/pom.xml patch | blob | history
features/repos/index/pom.xml patch | blob | history
features/singles/odl-integration-compatible-with-all/pom.xml patch | blob | history
opendaylight/pom.xml patch | blob | history

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 14b3ea6edb59c19d819fc2184e540e04dd76e751..a09beb2663d3b48b01bf66a60769c6707f44ba0d 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -37,7 +37,7 @@
         <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream/artifacts;hb=HEAD</url>
         <tag>HEAD</tag>
     </scm>
-    <!-- TODO: Open Bugs agains projects to export a single artifact pom containing every public atrifact version. -->
+    <!-- TODO: Open Bugs against projects to export a single artifact pom containing every public artifact version. -->
     <!-- Project artifact poms. Alphabetical order -->
     <profiles>
         <profile>
@@ -258,6 +258,72 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
+        <profile>
+            <id>transportpce</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.transportpce</groupId>
+                        <artifactId>odl-transportpce</artifactId>
+                        <version>{transportpce.version}</version>
+                        <classifier>features</classifier>
+                        <type>xml</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.opendaylight.transportpce</groupId>
+                        <artifactId>odl-transportpce-tapi</artifactId>
+                        <version>{transportpce.version}</version>
+                        <classifier>features</classifier>
+                        <type>xml</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.opendaylight.transportpce</groupId>
+                        <artifactId>odl-transportpce-inventory</artifactId>
+                        <version>{transportpce.version}</version>
+                        <classifier>features</classifier>
+                        <type>xml</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.opendaylight.transportpce</groupId>
+                        <artifactId>odl-transportpce-nbinotifications</artifactId>
+                        <version>{transportpce.version}</version>
+                        <classifier>features</classifier>
+                        <type>xml</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.opendaylight.transportpce</groupId>
+                        <artifactId>odl-transportpce-dmaap-client</artifactId>
+                        <version>{transportpce.version}</version>
+                        <classifier>features</classifier>
+                        <type>xml</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.opendaylight.transportpce.models</groupId>
+                        <artifactId>odl-openroadm-devices</artifactId>
+                        <version>{transportpce.models.version}</version>
+                        <classifier>features</classifier>
+                        <type>xml</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.opendaylight.transportpce.models</groupId>
+                        <artifactId>odl-openroadm-models</artifactId>
+                        <version>{transportpce.models.version}</version>
+                        <classifier>features</classifier>
+                        <type>xml</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.opendaylight.transportpce.models</groupId>
+                        <artifactId>odl-tapi-models</artifactId>
+                        <version>{transportpce.models.version}</version>
+                        <classifier>features</classifier>
+                        <type>xml</type>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
         <profile>
             <id>serviceutils</id>
             <activation>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 51768f12a7f66bb565f701fa1ec77aa0a587e9a5..1ba3153b41aae63bfbd3f4ebcfb846f9fb5e0d64 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -56,6 +56,8 @@
         <openflowplugin.version>0.15.1-SNAPSHOT</openflowplugin.version>
         <ovsdb.version>1.15.1-SNAPSHOT</ovsdb.version>
         <serviceutils.version>0.10.1-SNAPSHOT</serviceutils.version>
+        <transportpce.version>6.1.0-SNAPSHOT</transportpce.version>
+        <transportpce.models.version>17.1.0-SNAPSHOT</transportpce.models.version>
         <yangtools.version>9.0.2</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index cf1d44b939d84b1877c39d8fe9b6f7e694a699b7..1fa1973d953c94b026d096c458be989008c5c0d2 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -349,6 +349,75 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- TransportPCE -->
+        <profile>
+            <id>transportpce</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce</groupId>
+                    <artifactId>odl-transportpce</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce</groupId>
+                    <artifactId>odl-transportpce-tapi</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce</groupId>
+                    <artifactId>odl-transportpce-inventory</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce</groupId>
+                    <artifactId>odl-transportpce-nbinotifications</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce</groupId>
+                    <artifactId>odl-transportpce-dmaap-client</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+            </dependencies>
+        </profile>
+        <!-- TransportPCE-models -->
+        <profile>
+            <id>transportpce-models</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce.models</groupId>
+                    <artifactId>odl-openroadm-devices</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                    <scope>runtime</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce.models</groupId>
+                    <artifactId>odl-openroadm-models</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                    <scope>runtime</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce.models</groupId>
+                    <artifactId>odl-tapi-models</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                    <scope>runtime</scope>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- Yangtools -->
         <profile>
             <id>yangtools</id>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 9d19bb214874c6c7639d61d2475ecd4056e60622..c7a2ac31cf21987697a25f548043a31ff86065bd 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -219,5 +219,71 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- TransportPCE -->
+        <profile>
+            <id>transportpce</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce</groupId>
+                    <artifactId>odl-transportpce</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce</groupId>
+                    <artifactId>odl-transportpce-tapi</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce</groupId>
+                    <artifactId>odl-transportpce-inventory</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce</groupId>
+                    <artifactId>odl-transportpce-nbinotifications</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce</groupId>
+                    <artifactId>odl-transportpce-dmaap-client</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+            </dependencies>
+        </profile>
+        <!-- TransportPCE-models -->
+        <profile>
+            <id>transportpce-models</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce.models</groupId>
+                    <artifactId>odl-openroadm-devices</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce.models</groupId>
+                    <artifactId>odl-openroadm-models</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.transportpce.models</groupId>
+                    <artifactId>odl-tapi-models</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 </project>
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index c8547f4617e686103b459cba16046affa35cd1fd..69ae16f606c8c4a6067a2972577396155efd9628 100644 (file)
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -38,55 +38,6 @@
         <tag>HEAD</tag>
     </scm>
     <profiles>
-        <!-- TransportPCE -->
-        <profile>
-            <id>transportpce</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.transportpce</groupId>
-                    <artifactId>odl-transportpce</artifactId>
-                    <version>6.0.0-SNAPSHOT</version>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.transportpce</groupId>
-                    <artifactId>odl-transportpce-tapi</artifactId>
-                    <version>6.0.0-SNAPSHOT</version>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.transportpce</groupId>
-                    <artifactId>odl-transportpce-inventory</artifactId>
-                    <version>6.0.0-SNAPSHOT</version>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.transportpce</groupId>
-                    <artifactId>odl-transportpce-nbinotifications</artifactId>
-                    <version>6.0.0-SNAPSHOT</version>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.transportpce</groupId>
-                    <artifactId>odl-transportpce-dmaap-client</artifactId>
-                    <version>6.0.0-SNAPSHOT</version>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>dependency-convergence</id>
             <build>
Integration distribution