Concentrate all features

We have features scattered across the repository. Fix that up by putting them into a single directory. Change-Id: I351349807b6860fc1f5cafa606a073d7c599958d Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
opendaylight · Feb 14, 2025 · 9905451 · 9905451
1 parent 655da87
commit 9905451
Show file tree

Hide file tree

Showing 39 changed files with 113 additions and 178 deletions.
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
@@ -274,13 +274,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}.openflowjava</groupId>
-                <artifactId>features-openflowjava</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-openflowplugin-flow-services-rest</artifactId>
@@ -365,6 +358,13 @@
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-openflowplugin-eric-extensions</artifactId>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-openflowplugin-nxm-extensions</artifactId>
@@ -374,7 +374,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-openflowplugin-eric-extensions</artifactId>
+                <artifactId>odl-openflowplugin-onf-extensions</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>
@@ -407,6 +407,34 @@
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-openflowplugin-app-lldp-speaker</artifactId>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-openflowplugin-app-topology-lldp-discovery</artifactId>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-openflowplugin-app-topology-manager</artifactId>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.openflowjava</groupId>
+                <artifactId>odl-openflowjava-protocol</artifactId>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
diff --git a/extension/features-extension-aggregator/pom.xml b/extension/features-extension-aggregator/pom.xml
diff --git a/extension/pom.xml b/extension/pom.xml
@@ -28,6 +28,5 @@
         <module>openflowplugin-extension-onf</module>
         <module>openflowplugin-extension-eric</module>
         <module>test-extension</module>
-        <module>features-extension-aggregator</module>
     </modules>
 </project>
diff --git a/...ggregator/features-openflowplugin/pom.xml → features/features-openflowplugin/pom.xml b/...ggregator/features-openflowplugin/pom.xml → features/features-openflowplugin/pom.xml
@@ -13,133 +13,150 @@
     <packaging>feature</packaging>
     <version>0.20.0-SNAPSHOT</version>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.openflowplugin</groupId>
+                <artifactId>openflowplugin-artifacts</artifactId>
+                <version>0.20.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
+            <artifactId>odl-openflowjava-protocol</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-bulk-o-matic</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-config-pusher</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-forwardingrules-manager</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-forwardingrules-sync</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-table-miss-enforcer</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-topology</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-lldp-speaker</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-topology-lldp-discovery</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-topology-manager</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-drop-test</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-flow-services</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-flow-services-rest</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-nsf-model</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-southbound</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-reconciliation-framework</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-southbound-cli</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-libraries</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-app-arbitratorreconciliation</artifactId>
-            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-nxm-extensions</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-onf-extensions</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-eric-extensions</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/...regator/odl-openflowjava-protocol/pom.xml → features/odl-openflowjava-protocol/pom.xml b/...regator/odl-openflowjava-protocol/pom.xml → features/odl-openflowjava-protocol/pom.xml
diff --git a/...ava-protocol/src/main/feature/feature.xml → ...ava-protocol/src/main/feature/feature.xml b/...ava-protocol/src/main/feature/feature.xml → ...ava-protocol/src/main/feature/feature.xml
diff --git a/...ugin-app-arbitratorreconciliation/pom.xml → ...ugin-app-arbitratorreconciliation/pom.xml b/...ugin-app-arbitratorreconciliation/pom.xml → ...ugin-app-arbitratorreconciliation/pom.xml
diff --git a/...l-openflowplugin-app-bulk-o-matic/pom.xml → ...l-openflowplugin-app-bulk-o-matic/pom.xml b/...l-openflowplugin-app-bulk-o-matic/pom.xml → ...l-openflowplugin-app-bulk-o-matic/pom.xml
diff --git a/...-openflowplugin-app-config-pusher/pom.xml → ...-openflowplugin-app-config-pusher/pom.xml b/...-openflowplugin-app-config-pusher/pom.xml → ...-openflowplugin-app-config-pusher/pom.xml
diff --git a/...lugin-app-forwardingrules-manager/pom.xml → ...lugin-app-forwardingrules-manager/pom.xml b/...lugin-app-forwardingrules-manager/pom.xml → ...lugin-app-forwardingrules-manager/pom.xml
diff --git a/...owplugin-app-forwardingrules-sync/pom.xml → ...owplugin-app-forwardingrules-sync/pom.xml b/...owplugin-app-forwardingrules-sync/pom.xml → ...owplugin-app-forwardingrules-sync/pom.xml
diff --git a/...l-openflowplugin-app-lldp-speaker/pom.xml → ...l-openflowplugin-app-lldp-speaker/pom.xml b/...l-openflowplugin-app-lldp-speaker/pom.xml → ...l-openflowplugin-app-lldp-speaker/pom.xml
diff --git a/...ugin-app-reconciliation-framework/pom.xml → ...ugin-app-reconciliation-framework/pom.xml b/...ugin-app-reconciliation-framework/pom.xml → ...ugin-app-reconciliation-framework/pom.xml
diff --git a/...openflowplugin-app-southbound-cli/pom.xml → ...openflowplugin-app-southbound-cli/pom.xml b/...openflowplugin-app-southbound-cli/pom.xml → ...openflowplugin-app-southbound-cli/pom.xml
diff --git a/...lowplugin-app-table-miss-enforcer/pom.xml → ...lowplugin-app-table-miss-enforcer/pom.xml b/...lowplugin-app-table-miss-enforcer/pom.xml → ...lowplugin-app-table-miss-enforcer/pom.xml
diff --git a/...lugin-app-topology-lldp-discovery/pom.xml → ...lugin-app-topology-lldp-discovery/pom.xml b/...lugin-app-topology-lldp-discovery/pom.xml → ...lugin-app-topology-lldp-discovery/pom.xml
diff --git a/...enflowplugin-app-topology-manager/pom.xml → ...enflowplugin-app-topology-manager/pom.xml b/...enflowplugin-app-topology-manager/pom.xml → ...enflowplugin-app-topology-manager/pom.xml
diff --git a/...r/odl-openflowplugin-app-topology/pom.xml → ...s/odl-openflowplugin-app-topology/pom.xml b/...r/odl-openflowplugin-app-topology/pom.xml → ...s/odl-openflowplugin-app-topology/pom.xml
diff --git a/...ator/odl-openflowplugin-drop-test/pom.xml → ...ures/odl-openflowplugin-drop-test/pom.xml b/...ator/odl-openflowplugin-drop-test/pom.xml → ...ures/odl-openflowplugin-drop-test/pom.xml
diff --git a/...dl-openflowplugin-eric-extensions/pom.xml → ...dl-openflowplugin-eric-extensions/pom.xml b/...dl-openflowplugin-eric-extensions/pom.xml → ...dl-openflowplugin-eric-extensions/pom.xml
diff --git a/...extensions/src/main/features/features.xml → ...extensions/src/main/features/features.xml b/...extensions/src/main/features/features.xml → ...extensions/src/main/features/features.xml
diff --git a/...openflowplugin-flow-services-rest/pom.xml → ...openflowplugin-flow-services-rest/pom.xml b/...openflowplugin-flow-services-rest/pom.xml → ...openflowplugin-flow-services-rest/pom.xml
diff --git a/...ervices-rest/src/main/feature/feature.xml → ...ervices-rest/src/main/feature/feature.xml b/...ervices-rest/src/main/feature/feature.xml → ...ervices-rest/src/main/feature/feature.xml
diff --git a/.../odl-openflowplugin-flow-services/pom.xml → .../odl-openflowplugin-flow-services/pom.xml b/.../odl-openflowplugin-flow-services/pom.xml → .../odl-openflowplugin-flow-services/pom.xml
diff --git a/...ator/odl-openflowplugin-libraries/pom.xml → ...ures/odl-openflowplugin-libraries/pom.xml b/...ator/odl-openflowplugin-libraries/pom.xml → ...ures/odl-openflowplugin-libraries/pom.xml
diff --git a/...in-libraries/src/main/feature/feature.xml → ...in-libraries/src/main/feature/feature.xml b/...in-libraries/src/main/feature/feature.xml → ...in-libraries/src/main/feature/feature.xml
diff --git a/...ator/odl-openflowplugin-nsf-model/pom.xml → ...ures/odl-openflowplugin-nsf-model/pom.xml b/...ator/odl-openflowplugin-nsf-model/pom.xml → ...ures/odl-openflowplugin-nsf-model/pom.xml
diff --git a/...in-nsf-model/src/main/feature/feature.xml → ...in-nsf-model/src/main/feature/feature.xml b/...in-nsf-model/src/main/feature/feature.xml → ...in-nsf-model/src/main/feature/feature.xml
diff --git a/...odl-openflowplugin-nxm-extensions/pom.xml → ...odl-openflowplugin-nxm-extensions/pom.xml b/...odl-openflowplugin-nxm-extensions/pom.xml → ...odl-openflowplugin-nxm-extensions/pom.xml
diff --git a/...extensions/src/main/features/features.xml → ...extensions/src/main/features/features.xml b/...extensions/src/main/features/features.xml → ...extensions/src/main/features/features.xml
diff --git a/...odl-openflowplugin-onf-extensions/pom.xml → ...odl-openflowplugin-onf-extensions/pom.xml b/...odl-openflowplugin-onf-extensions/pom.xml → ...odl-openflowplugin-onf-extensions/pom.xml
diff --git a/...tor/odl-openflowplugin-southbound/pom.xml → ...res/odl-openflowplugin-southbound/pom.xml b/...tor/odl-openflowplugin-southbound/pom.xml → ...res/odl-openflowplugin-southbound/pom.xml
diff --git a/...n-southbound/src/main/feature/feature.xml → ...n-southbound/src/main/feature/feature.xml b/...n-southbound/src/main/feature/feature.xml → ...n-southbound/src/main/feature/feature.xml
diff --git a/features-aggregator/pom.xml → features/pom.xml b/features-aggregator/pom.xml → features/pom.xml
@@ -13,26 +13,34 @@
     <packaging>pom</packaging>
     <version>0.20.0-SNAPSHOT</version>
 
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
     <modules>
         <module>features-openflowplugin</module>
-        <module>odl-openflowplugin-flow-services-rest</module>
-        <module>odl-openflowplugin-flow-services</module>
-        <module>odl-openflowplugin-southbound</module>
-        <module>odl-openflowplugin-nsf-model</module>
-        <module>odl-openflowplugin-drop-test</module>
-        <module>odl-openflowplugin-app-table-miss-enforcer</module>
-        <module>odl-openflowplugin-app-config-pusher</module>
-        <module>odl-openflowplugin-app-topology</module>
-        <module>odl-openflowplugin-app-lldp-speaker</module>
-        <module>odl-openflowplugin-app-topology-lldp-discovery</module>
-        <module>odl-openflowplugin-app-topology-manager</module>
+        <module>odl-openflowjava-protocol</module>
+        <module>odl-openflowplugin-app-arbitratorreconciliation</module>
         <module>odl-openflowplugin-app-bulk-o-matic</module>
+        <module>odl-openflowplugin-app-config-pusher</module>
         <module>odl-openflowplugin-app-forwardingrules-manager</module>
         <module>odl-openflowplugin-app-forwardingrules-sync</module>
+        <module>odl-openflowplugin-app-lldp-speaker</module>
         <module>odl-openflowplugin-app-reconciliation-framework</module>
         <module>odl-openflowplugin-app-southbound-cli</module>
+        <module>odl-openflowplugin-app-table-miss-enforcer</module>
+        <module>odl-openflowplugin-app-topology-lldp-discovery</module>
+        <module>odl-openflowplugin-app-topology-manager</module>
+        <module>odl-openflowplugin-app-topology</module>
+        <module>odl-openflowplugin-drop-test</module>
+        <module>odl-openflowplugin-flow-services</module>
+        <module>odl-openflowplugin-flow-services-rest</module>
         <module>odl-openflowplugin-libraries</module>
-        <module>odl-openflowplugin-app-arbitratorreconciliation</module>
+        <module>odl-openflowplugin-nsf-model</module>
+        <module>odl-openflowplugin-southbound</module>
+        <module>odl-openflowplugin-eric-extensions</module>
+        <module>odl-openflowplugin-nxm-extensions</module>
+        <module>odl-openflowplugin-onf-extensions</module>
     </modules>
-
 </project>