summaryrefslogtreecommitdiffstats
path: root/sdnr/wt/featureaggregator
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2023-08-10 20:46:56 +0000
committerGerrit Code Review <gerrit@onap.org>2023-08-10 20:46:56 +0000
commit8f708e94e2798d42f1b107828c910304bc5cac6b (patch)
treeb82972b8fe8087a0c5e6c6c0b91c84d46e108ed4 /sdnr/wt/featureaggregator
parentfad3167f42d585e3144547db4c6dd7d00ea7b18a (diff)
parentc35ad79f3939eebf531f477d62755221789bca12 (diff)
Merge "Update features for Argon release"
Diffstat (limited to 'sdnr/wt/featureaggregator')
-rw-r--r--sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml9
-rw-r--r--sdnr/wt/featureaggregator/feature-devicemanager/pom.xml2
-rw-r--r--sdnr/wt/featureaggregator/feature-oauth/pom.xml2
-rw-r--r--sdnr/wt/featureaggregator/feature/pom.xml33
-rwxr-xr-xsdnr/wt/featureaggregator/installer/pom.xml13
-rwxr-xr-xsdnr/wt/featureaggregator/pom.xml5
6 files changed, 10 insertions, 54 deletions
diff --git a/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml b/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml
index f0aa5b1ee..1eb647752 100644
--- a/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml
+++ b/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
@@ -42,13 +42,6 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>sdnr-wt-apigateway-feature</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-websocketmanager-feature</artifactId>
<version>${project.version}</version>
<type>xml</type>
diff --git a/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml b/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml
index 612f08131..69d3ab854 100644
--- a/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml
+++ b/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/sdnr/wt/featureaggregator/feature-oauth/pom.xml b/sdnr/wt/featureaggregator/feature-oauth/pom.xml
index 5603786f8..683952a92 100644
--- a/sdnr/wt/featureaggregator/feature-oauth/pom.xml
+++ b/sdnr/wt/featureaggregator/feature-oauth/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml
index 03b29bc68..fdcaa14e1 100644
--- a/sdnr/wt/featureaggregator/feature/pom.xml
+++ b/sdnr/wt/featureaggregator/feature/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
@@ -43,20 +43,6 @@
<!-- Common Components go here -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>sdnr-wt-apigateway-feature</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>sdnr-wt-helpserver-feature</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-websocketmanager-feature</artifactId>
<version>${project.version}</version>
<type>xml</type>
@@ -76,7 +62,7 @@
<type>xml</type>
<classifier>features</classifier>
</dependency>
- <dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-mountpoint-registrar-feature</artifactId>
<version>${project.version}</version>
@@ -142,20 +128,5 @@
<type>xml</type>
<classifier>features</classifier>
</dependency>
- <!-- ODLUX components go here -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>sdnr-wt-odlux-core-feature</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>sdnr-wt-odlux-apps-feature</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
</dependencies>
</project>
diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml
index e10ac1663..f8b3e52a9 100755
--- a/sdnr/wt/featureaggregator/installer/pom.xml
+++ b/sdnr/wt/featureaggregator/installer/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
@@ -65,25 +65,18 @@
<type>xml</type>
<classifier>features</classifier>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-feature-aggregator-oauth</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>features</classifier>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-data-provider-setup</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>sdnr-wt-odlux-installer</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <classifier>repo</classifier>
- </dependency>
</dependencies>
<build>
diff --git a/sdnr/wt/featureaggregator/pom.xml b/sdnr/wt/featureaggregator/pom.xml
index f52626a64..4103e6df2 100755
--- a/sdnr/wt/featureaggregator/pom.xml
+++ b/sdnr/wt/featureaggregator/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.5.4</version>
+ <version>2.6.0</version>
<relativePath/>
</parent>
@@ -41,8 +41,7 @@
<modules>
<module>feature</module>
-<!-- <module>feature-minimal</module> -->
- <module>feature-oauth</module>
+ <!-- <module>feature-oauth</module> -->
<module>feature-devicemanager</module>
<module>feature-devicemanager-base</module>
<module>installer</module>