diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-07-11 08:47:49 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2019-08-15 16:36:48 +0000 |
| commit | c74f6af8d7b72eeeee7ceedbf82fc8cecef1ae3d (patch) | |
| tree | c734478dca6678c317f0b793a11b048874835cf5 | |
| parent | a68f2b849f86ab0a146648385785d40595388a52 (diff) | |
Update to Neon
Apply code updates to port to Neon.
Change-Id: I159309494ec64209d9fa23fc515643f1e31fe146
Issue-ID: CCSDK-1389
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
96 files changed, 802 insertions, 235 deletions
diff --git a/aafshiro/features/ccsdk-aafshiro/pom.xml b/aafshiro/features/ccsdk-aafshiro/pom.xml index 94c259f6c..a73eca329 100755 --- a/aafshiro/features/ccsdk-aafshiro/pom.xml +++ b/aafshiro/features/ccsdk-aafshiro/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>ccsdk-aafshiro</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features :: aafshiro :: ${project.artifactId}</name> diff --git a/aafshiro/features/features-aafshiro/pom.xml b/aafshiro/features/features-aafshiro/pom.xml index 171665f9f..8db7a9b3b 100755 --- a/aafshiro/features/features-aafshiro/pom.xml +++ b/aafshiro/features/features-aafshiro/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>features-aafshiro</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features :: aafshiro :: ${project.artifactId}</name> diff --git a/aafshiro/features/pom.xml b/aafshiro/features/pom.xml index 714551d57..c401ef27e 100755 --- a/aafshiro/features/pom.xml +++ b/aafshiro/features/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>aafshiro-features</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features :: aafshiro :: ${project.artifactId}</name> diff --git a/aafshiro/installer/pom.xml b/aafshiro/installer/pom.xml index 75410398e..200277d22 100755 --- a/aafshiro/installer/pom.xml +++ b/aafshiro/installer/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>aafshiro-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features :: aafshiro :: ${project.artifactId}</name> diff --git a/aafshiro/pom.xml b/aafshiro/pom.xml index 8a3d522d8..4cfdfbc4f 100755 --- a/aafshiro/pom.xml +++ b/aafshiro/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>aafshiro</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features :: aafshiro</name> diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml index 61bfea93d..9937826a2 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml @@ -13,12 +13,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <artifactId>blueprints-data-adaptor-provider</artifactId> <packaging>bundle</packaging> <name>Blueprints Data Adaptor - Provider</name> @@ -96,7 +96,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>${maven.bundle.version}</version> <extensions>true</extensions> <configuration> <instructions> diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..76459d51d --- /dev/null +++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright © 2017-2018 AT&T Intellectual Property. Modifications Copyright
+ © 2018 IBM. Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software distributed
+ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the License. -->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+ odl:use-default-for-reference-types="true">
+
+ <!-- Dependencies -->
+
+ <reference id="dataSource" interface="javax.sql.DataSource" />
+
+ <!-- Data SourceInitialisation -->
+
+ <bean id="config.dataSource"
+ class="org.onap.ccsdk.features.data.adaptor.db.DataSourceWrap">
+ <argument ref="dataSource" />
+ </bean>
+
+ <bean id="jdbcTemplate"
+ class="org.springframework.jdbc.core.JdbcTemplate">
+ <property name="dataSource" ref="config.dataSource" />
+ </bean>
+
+ <bean id="namedParameterJdbcTemplate"
+ class="org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate">
+ <argument ref="config.dataSource" />
+ </bean>
+
+ <!-- DAO Initialisation -->
+ <bean id="transactionLogDao"
+ class="org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDaoImpl">
+ <argument ref="jdbcTemplate" />
+ </bean>
+
+ <bean id="configResourceDao"
+ class="org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoImpl">
+ <argument ref="jdbcTemplate" />
+ </bean>
+
+ <bean id="queryExecutorDao"
+ class="org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDaoImpl">
+ <argument ref="jdbcTemplate" />
+ </bean>
+
+ <bean id="namedQueryExecutorDao"
+ class="org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDaoImpl">
+ <argument ref="namedParameterJdbcTemplate" />
+ </bean>
+
+ <!-- Expose the Common Component Bean -->
+
+ <bean id="configResourceService"
+ class="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceServiceImpl">
+ <argument ref="transactionLogDao" />
+ <argument ref="configResourceDao" />
+ <argument ref="queryExecutorDao" />
+ <argument ref="namedQueryExecutorDao" />
+ </bean>
+
+ <service ref="configResourceService"
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
+
+</blueprint>
diff --git a/blueprints-processor/adaptors/pom.xml b/blueprints-processor/adaptors/pom.xml index 9f1c2b0d9..9e081a5a3 100644 --- a/blueprints-processor/adaptors/pom.xml +++ b/blueprints-processor/adaptors/pom.xml @@ -20,12 +20,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <artifactId>blueprints-processor-adaptors</artifactId> diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml index 9232e0c10..f7effc4b8 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <artifactId>blueprints-rest-adaptor-provider</artifactId> <packaging>bundle</packaging> <name>Blueprints Rest Adaptor - Provider</name> @@ -71,6 +71,48 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.21.0-GA</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.10.19</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-support</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-reflect</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-core</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -85,7 +127,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>${maven.bundle.version}</version> <extensions>true</extensions> <configuration> <instructions> diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..8788f6482 --- /dev/null +++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017-2018 AT&T Intellectual Property.
+ Modifications Copyright © 2018 IBM.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+ odl:use-default-for-reference-types="true">
+
+ <!-- Expose the Common Component Bean -->
+
+ <bean id="configRestAdaptorService"
+ class="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl">
+ </bean>
+
+ <service ref="configRestAdaptorService"
+ interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />
+
+</blueprint>
diff --git a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml index 40daabbf3..f7ec2c36a 100644 --- a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml +++ b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>ccsdk-blueprints-processor</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>Blueprints Processor :: Features :: ${project.artifactId}</name> diff --git a/blueprints-processor/features/features-blueprints-processor/pom.xml b/blueprints-processor/features/features-blueprints-processor/pom.xml index 49d83cc2a..c01eeab3b 100755 --- a/blueprints-processor/features/features-blueprints-processor/pom.xml +++ b/blueprints-processor/features/features-blueprints-processor/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>features-blueprints-processor</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>Blueprints Processor :: CCSDK Features :: ${project.artifactId}</name> diff --git a/blueprints-processor/features/pom.xml b/blueprints-processor/features/pom.xml index 3ec62da1a..7dbbeb6f8 100755 --- a/blueprints-processor/features/pom.xml +++ b/blueprints-processor/features/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>blueprints-processor-features</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Blueprints Processor :: Features aggregator :: ${project.artifactId}</name> diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml index 6b4aeb89f..fb662d575 100644 --- a/blueprints-processor/installer/pom.xml +++ b/blueprints-processor/installer/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>blueprints-processor-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Blueprints Processor :: ${project.artifactId}</name> diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml index ff9bcda88..1b7f46ea3 100644 --- a/blueprints-processor/plugin/assignment-provider/pom.xml +++ b/blueprints-processor/plugin/assignment-provider/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <artifactId>blueprints-assignment-provider</artifactId> <packaging>bundle</packaging> <name>Blueprints Assignment - Provider</name> @@ -71,11 +71,43 @@ <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-mockito</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.21.0-GA</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.10.19</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-support</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-reflect</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-core</artifactId> + <version>1.6.4</version> <scope>test</scope> </dependency> </dependencies> @@ -92,7 +124,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>${maven.bundle.version}</version> <extensions>true</extensions> <configuration> <instructions> diff --git a/blueprints-processor/plugin/assignment-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/assignment-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..f15429dfe --- /dev/null +++ b/blueprints-processor/plugin/assignment-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017-2018 AT&T Intellectual Property.
+ Modifications Copyright © 2018 IBM.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+ odl:use-default-for-reference-types="true">
+
+ <reference id="componentNodeService"
+ interface="org.onap.ccsdk.features.model.service.ComponentNodeService" />
+
+ <reference id="configResourceService"
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
+
+ <reference id="configModelService"
+ interface="org.onap.ccsdk.features.model.service.ConfigModelService" />
+
+ <reference id="configRestAdaptorService"
+ interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />
+
+ <reference id="configGeneratorService"
+ interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorService" />
+
+ <!-- Expose the Common Component Bean -->
+ <bean id="configAssignmentNode"
+ class="org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode">
+ <argument ref="configResourceService" />
+ <argument ref="configRestAdaptorService" />
+ <argument ref="configModelService" />
+ <argument ref="componentNodeService" />
+ <argument ref="configGeneratorService" />
+ </bean>
+
+ <service ref="configAssignmentNode"
+ interface="org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode" />
+
+ <bean id="configAssignmentService"
+ class="org.onap.ccsdk.features.assignment.service.ConfigAssignmentServiceImpl">
+ <argument ref="configResourceService" />
+ <argument ref="configRestAdaptorService" />
+ <argument ref="configModelService" />
+ <argument ref="componentNodeService" />
+ <argument ref="configGeneratorService" />
+ </bean>
+
+ <service ref="configAssignmentService"
+ interface="org.onap.ccsdk.features.assignment.service.ConfigAssignmentService" />
+
+</blueprint>
diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml index b4f5873c7..6917660b3 100644 --- a/blueprints-processor/plugin/generator-provider/pom.xml +++ b/blueprints-processor/plugin/generator-provider/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <artifactId>blueprints-generator-provider</artifactId> <packaging>bundle</packaging> <name>Blueprints Generator - Provider</name> @@ -70,19 +70,48 @@ <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-mockito</artifactId> - <version>1.6.6</version> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.21.0-GA</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.10.19</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> - <version>1.6.6</version> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-support</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-reflect</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-core</artifactId> + <version>1.6.4</version> <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -92,7 +121,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>${maven.bundle.version}</version> <extensions>true</extensions> <configuration> <instructions> diff --git a/blueprints-processor/plugin/generator-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/generator-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..78cb28189 --- /dev/null +++ b/blueprints-processor/plugin/generator-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017-2018 AT&T Intellectual Property.
+ Modifications Copyright © 2018 IBM.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+ odl:use-default-for-reference-types="true">
+
+ <reference id="configModelService"
+ interface="org.onap.ccsdk.features.model.service.ConfigModelService" />
+
+ <reference id="configResourceService"
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
+
+ <!-- Expose the Common Component Bean -->
+
+ <bean id="configGeneratorService"
+ class="org.onap.ccsdk.features.generator.service.ConfigGeneratorServiceImpl">
+ <argument ref="configResourceService" />
+ </bean>
+
+ <service ref="configGeneratorService"
+ interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorService" />
+
+ <bean id="configGeneratorNode"
+ class="org.onap.ccsdk.features.generator.service.ConfigGeneratorNode">
+ <argument ref="configResourceService" />
+ <argument ref="configModelService" />
+ </bean>
+
+ <service ref="configGeneratorNode"
+ interface="org.onap.ccsdk.features.generator.service.ConfigGeneratorNode" />
+
+
+</blueprint>
diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml index 6cf25f473..0f9c9430d 100644 --- a/blueprints-processor/plugin/model-provider/pom.xml +++ b/blueprints-processor/plugin/model-provider/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <artifactId>blueprints-model-provider</artifactId> <packaging>bundle</packaging> <name>Blueprints Model - Provider</name> @@ -66,6 +66,43 @@ <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-mockito</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.21.0-GA</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.10.19</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-support</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-reflect</artifactId> + <version>1.6.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-core</artifactId> + <version>1.6.4</version> <scope>test</scope> </dependency> <dependency> @@ -106,7 +143,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>${maven.bundle.version}</version> <extensions>true</extensions> <configuration> <instructions> diff --git a/blueprints-processor/plugin/model-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/model-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..5a07f94c6 --- /dev/null +++ b/blueprints-processor/plugin/model-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017-2018 AT&T Intellectual Property.
+ Modifications Copyright © 2018 IBM.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+ odl:use-default-for-reference-types="true">
+
+ <!-- Dependency -->
+
+ <reference id="configResourceService"
+ interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />
+
+ <reference id="configRestAdaptorService"
+ interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />
+
+ <!-- Expose the Common Component Bean -->
+ <bean id="configModelNode"
+ class="org.onap.ccsdk.features.model.service.ConfigModelNode">
+ </bean>
+
+ <service ref="configModelNode"
+ interface="org.onap.ccsdk.features.model.service.ConfigModelNode" />
+
+ <bean id="configModelService"
+ class="org.onap.ccsdk.features.model.service.ConfigModelServiceImpl">
+ <argument ref="configRestAdaptorService" />
+ </bean>
+
+ <service ref="configModelService"
+ interface="org.onap.ccsdk.features.model.service.ConfigModelService" />
+
+
+ <!-- ComponentNode -->
+
+ <bean id="componentNodeService"
+ class="org.onap.ccsdk.features.model.service.ComponentNodeServiceImpl">
+ <argument ref="blueprintBundleContext" />
+ <argument ref="configResourceService" />
+ <argument ref="configRestAdaptorService" />
+ </bean>
+
+ <service ref="componentNodeService"
+ interface="org.onap.ccsdk.features.model.service.ComponentNodeService" />
+
+ <bean id="componentNodeDelegate"
+ class="org.onap.ccsdk.features.model.service.ComponentNodeDelegate">
+ <argument ref="componentNodeService" />
+ </bean>
+
+ <service ref="componentNodeDelegate"
+ interface="org.onap.ccsdk.features.model.service.ComponentNodeDelegate" />
+
+</blueprint>
diff --git a/blueprints-processor/plugin/pom.xml b/blueprints-processor/plugin/pom.xml index 634b370d3..b4cea13bd 100644 --- a/blueprints-processor/plugin/pom.xml +++ b/blueprints-processor/plugin/pom.xml @@ -21,11 +21,11 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <artifactId>blueprints-processor-plugin</artifactId> <groupId>org.onap.ccsdk.features</groupId> <packaging>pom</packaging> diff --git a/blueprints-processor/pom.xml b/blueprints-processor/pom.xml index 0878f88c8..2b2fde6df 100644 --- a/blueprints-processor/pom.xml +++ b/blueprints-processor/pom.xml @@ -21,13 +21,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>blueprints-processor</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Blueprints Processor Module</name> diff --git a/features/ccsdk-features-all/pom.xml b/features/ccsdk-features-all/pom.xml index 81189db1c..b447afa0d 100644 --- a/features/ccsdk-features-all/pom.xml +++ b/features/ccsdk-features-all/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>ccsdk-features-all</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features :: features :: ${project.artifactId}</name> diff --git a/features/features-features/pom.xml b/features/features-features/pom.xml index bbff939cd..8f4444b1d 100644 --- a/features/features-features/pom.xml +++ b/features/features-features/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>features-features</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>Blueprints Processor :: features :: ${project.artifactId}</name> diff --git a/features/installer/pom.xml b/features/installer/pom.xml index a5320cae0..81103665c 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>features-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Blueprints Processor :: features :: ${project.artifactId}</name> diff --git a/features/pom.xml b/features/pom.xml index 00dbb3699..4d95a39eb 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>ccsdk-feature-aggregator</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Blueprints Processor :: features</name> @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features</groupId> <artifactId>ccsdk-features</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features</name> diff --git a/sdnr/northbound/energysavings/features/pom.xml b/sdnr/northbound/energysavings/features/pom.xml index 03150b184..37ceeb835 100644 --- a/sdnr/northbound/energysavings/features/pom.xml +++ b/sdnr/northbound/energysavings/features/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> @@ -16,13 +16,7 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal.model</groupId> - <artifactId>mdsal-model-artifacts</artifactId> - <version>0.11.1</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-artifacts</artifactId> diff --git a/sdnr/northbound/energysavings/installer/pom.xml b/sdnr/northbound/energysavings/installer/pom.xml index f689d90ad..48febff61 100755 --- a/sdnr/northbound/energysavings/installer/pom.xml +++ b/sdnr/northbound/energysavings/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/northbound/energysavings/model/pom.xml b/sdnr/northbound/energysavings/model/pom.xml index 9afa4cc40..7eceab4bf 100644 --- a/sdnr/northbound/energysavings/model/pom.xml +++ b/sdnr/northbound/energysavings/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/northbound/energysavings/pom.xml b/sdnr/northbound/energysavings/pom.xml index b4bff6065..8812c8f5f 100644 --- a/sdnr/northbound/energysavings/pom.xml +++ b/sdnr/northbound/energysavings/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/northbound/energysavings/provider/pom.xml b/sdnr/northbound/energysavings/provider/pom.xml index 9c68876c1..3ce3ce545 100644 --- a/sdnr/northbound/energysavings/provider/pom.xml +++ b/sdnr/northbound/energysavings/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/northbound/energysavings/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/northbound/energysavings/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..7dfdc4d35 --- /dev/null +++ b/sdnr/northbound/energysavings/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- vi: set et smarttab sw=4 tabstop=4: --> +<!-- + =================================================================== + Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. + =================================================================== + + Unless otherwise specified, all software contained herein is licensed + under the Apache License, Version 2.0 (the “Licenseâ€); + you may not use this software except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" + xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" + odl:use-default-for-reference-types="true"> + + <reference id="dataBroker" + interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" + odl:type="default" /> + + <bean id="provider" +<<<<<<< HEAD + class="org.onap.sdnc.northbound.sdnr.impl.EnergysavingsProvider" +======= + class="org.onap.ccsdk.features.sdnr.northbound.EnergysavingsProvider" +>>>>>>> 4a0fb45... Rename package to new ccsdk/features repo + init-method="init" destroy-method="close"> + <argument ref="dataBroker" /> + </bean> + +</blueprint> diff --git a/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml b/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml index e06fd214d..c218dece9 100644 --- a/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml +++ b/sdnr/northbound/features/ccsdk-features-sdnr-northbound-all/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>sdnr-northbound-all</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-northbound :: features :: ${project.artifactId}</name> diff --git a/sdnr/northbound/features/installer/pom.xml b/sdnr/northbound/features/installer/pom.xml index 797bcee80..bfd10f751 100644 --- a/sdnr/northbound/features/installer/pom.xml +++ b/sdnr/northbound/features/installer/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>sdnr-northbound-features-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-northbound :: features :: ${project.artifactId}</name> diff --git a/sdnr/northbound/features/pom.xml b/sdnr/northbound/features/pom.xml index ce55dd9f5..fcb5eeb25 100644 --- a/sdnr/northbound/features/pom.xml +++ b/sdnr/northbound/features/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>sdnr-northbound-feature-aggregator</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-northbound :: features</name> diff --git a/sdnr/northbound/oofpcipoc/consumer/pom.xml b/sdnr/northbound/oofpcipoc/consumer/pom.xml index 437f98a06..2b4886283 100644 --- a/sdnr/northbound/oofpcipoc/consumer/pom.xml +++ b/sdnr/northbound/oofpcipoc/consumer/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>oofpcipoc-consumer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/sdnr/northbound/oofpcipoc/consumer/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/northbound/oofpcipoc/consumer/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..6bb5e3833 --- /dev/null +++ b/sdnr/northbound/oofpcipoc/consumer/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- Copyright © ${copyrightYear} ${copyright} and others. All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available + at http://www.eclipse.org/legal/epl-v10.html --> + +<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" + xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true"> + + <reference id="svcLogicService" + interface="org.onap.ccsdk.sli.core.sli.provider.SvcLogicService" /> + + <bean id="client" class="org.onap.ccsdk.features.sdnr.northbound.oofpcipoc.OofpcipocClient"> + <argument ref="svcLogicService" /> + </bean> + + <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" + odl:type="default" /> + + <!-- Register the OofpcipocListener to receive yang notifications --> + + <odl:notification-listener ref="listener"/> + + <bean id="listener" class="org.onap.ccsdk.features.sdnr.northbound.oofpcipoc.OofpcipocHandleNotif"> + <argument ref="dataBroker" /> + <argument ref="client" /> + </bean> + +</blueprint> diff --git a/sdnr/northbound/oofpcipoc/feature/pom.xml b/sdnr/northbound/oofpcipoc/feature/pom.xml index 56c23d9a3..351267722 100644 --- a/sdnr/northbound/oofpcipoc/feature/pom.xml +++ b/sdnr/northbound/oofpcipoc/feature/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>sdnr-oofpcipoc</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-northbound :: oofpcipoc :: ${project.artifactId}</name> diff --git a/sdnr/northbound/oofpcipoc/installer/pom.xml b/sdnr/northbound/oofpcipoc/installer/pom.xml index 382b6e1ff..eb2f774dd 100644 --- a/sdnr/northbound/oofpcipoc/installer/pom.xml +++ b/sdnr/northbound/oofpcipoc/installer/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>oofpcipoc-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-northbound :: oofpcipoc :: ${project.artifactId}</name> diff --git a/sdnr/northbound/oofpcipoc/model/pom.xml b/sdnr/northbound/oofpcipoc/model/pom.xml index 00820b7dd..84ea3130e 100644 --- a/sdnr/northbound/oofpcipoc/model/pom.xml +++ b/sdnr/northbound/oofpcipoc/model/pom.xml @@ -5,24 +5,22 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>oofpcipoc-model</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> <dependency> - <groupId>org.opendaylight.mdsal.model</groupId> - <artifactId>ietf-inet-types-2013-07-15</artifactId> - </dependency> - <dependency> - <groupId>org.opendaylight.mdsal.model</groupId> - <artifactId>ietf-yang-types-20130715</artifactId> - </dependency> + <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> + <artifactId>rfc6991</artifactId> + </dependency> + + </dependencies> <build> <pluginManagement> diff --git a/sdnr/northbound/oofpcipoc/pom.xml b/sdnr/northbound/oofpcipoc/pom.xml index 0c119c719..b0387f66f 100644 --- a/sdnr/northbound/oofpcipoc/pom.xml +++ b/sdnr/northbound/oofpcipoc/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>oofpcipoc</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-northbound :: oofpcipoc</name> diff --git a/sdnr/northbound/oofpcipoc/provider/pom.xml b/sdnr/northbound/oofpcipoc/provider/pom.xml index 34ef1e4d3..015b968a4 100644 --- a/sdnr/northbound/oofpcipoc/provider/pom.xml +++ b/sdnr/northbound/oofpcipoc/provider/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>oofpcipoc-provider</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/sdnr/northbound/oofpcipoc/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/northbound/oofpcipoc/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..72278ffa2 --- /dev/null +++ b/sdnr/northbound/oofpcipoc/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- Copyright © ${copyrightYear} ${copyright} and others. All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available + at http://www.eclipse.org/legal/epl-v10.html --> + +<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" + xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true"> + + <reference id="svcLogicService" + interface="org.onap.ccsdk.sli.core.sli.provider.SvcLogicService" /> + + <bean id="client" class="org.onap.ccsdk.features.sdnr.northbound.oofpcipoc.OofpcipocClient"> + <argument ref="svcLogicService" /> + </bean> + + <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" + odl:type="default" /> + + <reference id="notificationService" + interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService" + odl:type="default" /> + + <reference id="rpcRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" + odl:type="default" /> + + <bean id="provider" class="org.onap.ccsdk.features.sdnr.northbound.oofpcipoc.OofpcipocProvider"> + <argument ref="dataBroker" /> + <argument ref="rpcRegistry" /> + <argument ref="notificationService" /> + <argument ref="client" /> + </bean> + +</blueprint> diff --git a/sdnr/northbound/pom.xml b/sdnr/northbound/pom.xml index cbbd31e34..0ae151aef 100644 --- a/sdnr/northbound/pom.xml +++ b/sdnr/northbound/pom.xml @@ -24,13 +24,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>sdnr-northbound</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sdnr-northbound :: features</name> <description>SDN-R RAN and OOF PCI ANR POC </description> diff --git a/sdnr/wt/apigateway/feature/pom.xml b/sdnr/wt/apigateway/feature/pom.xml index 68dbe5ffe..339de5ec4 100644 --- a/sdnr/wt/apigateway/feature/pom.xml +++ b/sdnr/wt/apigateway/feature/pom.xml @@ -26,26 +26,20 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-apigateway-feature</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <dependencyManagement> <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal.model</groupId> - <artifactId>mdsal-model-artifacts</artifactId> - <version>${odl.mdsal.model.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-artifacts</artifactId> diff --git a/sdnr/wt/apigateway/installer/pom.xml b/sdnr/wt/apigateway/installer/pom.xml index 40d5e7983..3c5397f24 100755 --- a/sdnr/wt/apigateway/installer/pom.xml +++ b/sdnr/wt/apigateway/installer/pom.xml @@ -4,14 +4,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-apigateway-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/apigateway/pom.xml b/sdnr/wt/apigateway/pom.xml index 137422c0a..d2b3253f9 100755 --- a/sdnr/wt/apigateway/pom.xml +++ b/sdnr/wt/apigateway/pom.xml @@ -26,14 +26,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-apigateway-top</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/apigateway/provider/pom.xml b/sdnr/wt/apigateway/provider/pom.xml index 8886a69bc..3367ffd19 100644 --- a/sdnr/wt/apigateway/provider/pom.xml +++ b/sdnr/wt/apigateway/provider/pom.xml @@ -17,7 +17,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-apigateway-provider</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> <properties> @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <dependencies> diff --git a/sdnr/wt/devicemanager/feature/pom.xml b/sdnr/wt/devicemanager/feature/pom.xml index 8059223ed..266d934b7 100644 --- a/sdnr/wt/devicemanager/feature/pom.xml +++ b/sdnr/wt/devicemanager/feature/pom.xml @@ -21,33 +21,25 @@ * ============LICENSE_END========================================================= --> -<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemanager-feature</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <dependencyManagement> <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal.model</groupId> - <artifactId>mdsal-model-artifacts</artifactId> - <version>${odl.mdsal.model.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-artifacts</artifactId> diff --git a/sdnr/wt/devicemanager/installer/pom.xml b/sdnr/wt/devicemanager/installer/pom.xml index fb7917f69..873f331ec 100755 --- a/sdnr/wt/devicemanager/installer/pom.xml +++ b/sdnr/wt/devicemanager/installer/pom.xml @@ -27,13 +27,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemanager-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> diff --git a/sdnr/wt/devicemanager/model/pom.xml b/sdnr/wt/devicemanager/model/pom.xml index 9df45e34d..d8364ec53 100644 --- a/sdnr/wt/devicemanager/model/pom.xml +++ b/sdnr/wt/devicemanager/model/pom.xml @@ -25,14 +25,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemanager-model</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/devicemanager/pom.xml b/sdnr/wt/devicemanager/pom.xml index ef76b1397..3195a79ce 100755 --- a/sdnr/wt/devicemanager/pom.xml +++ b/sdnr/wt/devicemanager/pom.xml @@ -26,14 +26,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemanager-top</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/devicemanager/provider/pom.xml b/sdnr/wt/devicemanager/provider/pom.xml index 63dc690be..876e802da 100644 --- a/sdnr/wt/devicemanager/provider/pom.xml +++ b/sdnr/wt/devicemanager/provider/pom.xml @@ -20,14 +20,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemanager-provider</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> @@ -463,4 +463,3 @@ </plugins> </build> </project> - diff --git a/sdnr/wt/devicemanager/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/wt/devicemanager/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..b946e1035 --- /dev/null +++ b/sdnr/wt/devicemanager/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +============LICENSE_START======================================================= +ONAP : ccsdk feature sdnr wt devicemanager + ================================================================================ +Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. +All rights reserved. +================================================================================ +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +============LICENSE_END========================================================= + --> + +<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" + xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true"> + + <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" + odl:type="default" /> + + <reference id="notificationPublishService" + interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService" + odl:type="default" /> + + <reference id="mountPointService" + interface="org.opendaylight.controller.md.sal.binding.api.MountPointService" + odl:type="default" /> + + <reference id="rpcProviderRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" + odl:type="default" /> + + <reference id="clusterSingletonService" + interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/> + + <bean id="provider" class="org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.DeviceManagerImpl" init-method="init" destroy-method="close"> + <property name="dataBroker" ref="dataBroker"/> + <property name="rpcProviderRegistry" ref="rpcProviderRegistry" /> + <property name="notificationPublishService" ref="notificationPublishService" /> + <property name="mountPointService" ref="mountPointService" /> + <property name="clusterSingletonService" ref="clusterSingletonService" /> + </bean> + + +</blueprint> diff --git a/sdnr/wt/devicemanager/provider/src/test/java/org/elasticsearch/bootstrap/JarHell.java b/sdnr/wt/devicemanager/provider/src/test/java/org/elasticsearch/bootstrap/JarHell.java new file mode 100644 index 000000000..4a6913efe --- /dev/null +++ b/sdnr/wt/devicemanager/provider/src/test/java/org/elasticsearch/bootstrap/JarHell.java @@ -0,0 +1,10 @@ +package org.elasticsearch.bootstrap; +import java.net.URL; +public class JarHell { + private JarHell() {} + public static void checkJarHell() throws Exception {} + public static void checkJarHell(URL urls[]) throws Exception {} + public static void checkVersionFormat(String targetVersion) {} + public static void checkJavaVersion(String resource, String targetVersion) {} + public static URL[] parseClassPath() {return new URL[]{};} +} diff --git a/sdnr/wt/devicemodel/feature/pom.xml b/sdnr/wt/devicemodel/feature/pom.xml index 5508bd849..fbc0b9268 100644 --- a/sdnr/wt/devicemodel/feature/pom.xml +++ b/sdnr/wt/devicemodel/feature/pom.xml @@ -24,26 +24,20 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemodel-feature</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <dependencyManagement> <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal.model</groupId> - <artifactId>mdsal-model-artifacts</artifactId> - <version>${odl.mdsal.model.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-artifacts</artifactId> diff --git a/sdnr/wt/devicemodel/installer/pom.xml b/sdnr/wt/devicemodel/installer/pom.xml index ccd5507e7..28f2c5484 100755 --- a/sdnr/wt/devicemodel/installer/pom.xml +++ b/sdnr/wt/devicemodel/installer/pom.xml @@ -26,14 +26,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemodel-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/devicemodel/model/pom.xml b/sdnr/wt/devicemodel/model/pom.xml index a3a7c0d86..c7d7f19f7 100644 --- a/sdnr/wt/devicemodel/model/pom.xml +++ b/sdnr/wt/devicemodel/model/pom.xml @@ -26,14 +26,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemodel-model</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/devicemodel/pom.xml b/sdnr/wt/devicemodel/pom.xml index 2a2b0443f..6048e3519 100755 --- a/sdnr/wt/devicemodel/pom.xml +++ b/sdnr/wt/devicemodel/pom.xml @@ -26,14 +26,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-devicemodel-top</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml index 7f6c0aec8..8b70e8832 100644 --- a/sdnr/wt/featureaggregator/feature/pom.xml +++ b/sdnr/wt/featureaggregator/feature/pom.xml @@ -24,26 +24,20 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-feature-aggregator</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <dependencyManagement> <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal.model</groupId> - <artifactId>mdsal-model-artifacts</artifactId> - <version>${odl.mdsal.model.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-artifacts</artifactId> diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml index 0f2644eca..4d4a3830a 100755 --- a/sdnr/wt/featureaggregator/installer/pom.xml +++ b/sdnr/wt/featureaggregator/installer/pom.xml @@ -24,14 +24,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-feature-aggregator-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/featureaggregator/pom.xml b/sdnr/wt/featureaggregator/pom.xml index aeebf98ff..9ec6fe0ab 100755 --- a/sdnr/wt/featureaggregator/pom.xml +++ b/sdnr/wt/featureaggregator/pom.xml @@ -24,14 +24,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-feature-aggregator-top</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/helpserver/feature/pom.xml b/sdnr/wt/helpserver/feature/pom.xml index 5654c5ba3..6af6838ad 100644 --- a/sdnr/wt/helpserver/feature/pom.xml +++ b/sdnr/wt/helpserver/feature/pom.xml @@ -26,14 +26,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-helpserver-feature</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/helpserver/installer/pom.xml b/sdnr/wt/helpserver/installer/pom.xml index cdfab667e..8cf3f058c 100755 --- a/sdnr/wt/helpserver/installer/pom.xml +++ b/sdnr/wt/helpserver/installer/pom.xml @@ -4,14 +4,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-helpserver-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/helpserver/pom.xml b/sdnr/wt/helpserver/pom.xml index cbdde0c15..76fe13e16 100755 --- a/sdnr/wt/helpserver/pom.xml +++ b/sdnr/wt/helpserver/pom.xml @@ -26,14 +26,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-helpserver-top</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/helpserver/provider/pom.xml b/sdnr/wt/helpserver/provider/pom.xml index 4722b834d..9f68028e3 100644 --- a/sdnr/wt/helpserver/provider/pom.xml +++ b/sdnr/wt/helpserver/provider/pom.xml @@ -17,7 +17,7 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-helpserver-provider</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> <properties> @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <dependencies> diff --git a/sdnr/wt/odlux/apps/apiDemo/pom.xml b/sdnr/wt/odlux/apps/apiDemo/pom.xml index 3fcb3b728..9e99a4103 100644 --- a/sdnr/wt/odlux/apps/apiDemo/pom.xml +++ b/sdnr/wt/odlux/apps/apiDemo/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-apiDemo</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-apiDemo</name> <licenses> diff --git a/sdnr/wt/odlux/apps/app-feature/pom.xml b/sdnr/wt/odlux/apps/app-feature/pom.xml index 0baee6595..6d865ebd3 100644 --- a/sdnr/wt/odlux/apps/app-feature/pom.xml +++ b/sdnr/wt/odlux/apps/app-feature/pom.xml @@ -16,14 +16,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-apps-feature</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <licenses> diff --git a/sdnr/wt/odlux/apps/app-installer/pom.xml b/sdnr/wt/odlux/apps/app-installer/pom.xml index 1994619ab..ede8c85e2 100755 --- a/sdnr/wt/odlux/apps/app-installer/pom.xml +++ b/sdnr/wt/odlux/apps/app-installer/pom.xml @@ -4,14 +4,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-apps-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/odlux/apps/configurationApp/pom.xml b/sdnr/wt/odlux/apps/configurationApp/pom.xml index ec010e79a..3bd2c10d2 100644 --- a/sdnr/wt/odlux/apps/configurationApp/pom.xml +++ b/sdnr/wt/odlux/apps/configurationApp/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-configurationApp</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-configurationApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/connectApp/pom.xml b/sdnr/wt/odlux/apps/connectApp/pom.xml index 4b0c7c362..829c968b0 100644 --- a/sdnr/wt/odlux/apps/connectApp/pom.xml +++ b/sdnr/wt/odlux/apps/connectApp/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-connectApp</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-connectApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/demoApp/pom.xml b/sdnr/wt/odlux/apps/demoApp/pom.xml index fc338c158..de2fbfc90 100644 --- a/sdnr/wt/odlux/apps/demoApp/pom.xml +++ b/sdnr/wt/odlux/apps/demoApp/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-demoApp</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-demoApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/faultApp/pom.xml b/sdnr/wt/odlux/apps/faultApp/pom.xml index 436b2cf4f..c9a9d5328 100644 --- a/sdnr/wt/odlux/apps/faultApp/pom.xml +++ b/sdnr/wt/odlux/apps/faultApp/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-faultApp</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-faultApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/helpApp/pom.xml b/sdnr/wt/odlux/apps/helpApp/pom.xml index bc2b5c87b..2ec7e1883 100644 --- a/sdnr/wt/odlux/apps/helpApp/pom.xml +++ b/sdnr/wt/odlux/apps/helpApp/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-helpApp</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-helpApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/inventoryApp/pom.xml b/sdnr/wt/odlux/apps/inventoryApp/pom.xml index d5072497b..1184196c2 100644 --- a/sdnr/wt/odlux/apps/inventoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/inventoryApp/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-inventoryApp</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-inventoryApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml index 1b72de5ad..160ebb54b 100644 --- a/sdnr/wt/odlux/apps/maintenanceApp/pom.xml +++ b/sdnr/wt/odlux/apps/maintenanceApp/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-maintenanceApp</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-maintenanceApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/mediatorApp/pom.xml b/sdnr/wt/odlux/apps/mediatorApp/pom.xml index 96c9ef5cf..4c48ce0dc 100644 --- a/sdnr/wt/odlux/apps/mediatorApp/pom.xml +++ b/sdnr/wt/odlux/apps/mediatorApp/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-mediatorApp</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-mediatorApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/minimumApp/pom.xml b/sdnr/wt/odlux/apps/minimumApp/pom.xml index c55ccfc24..fb4d81e7d 100644 --- a/sdnr/wt/odlux/apps/minimumApp/pom.xml +++ b/sdnr/wt/odlux/apps/minimumApp/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-minimumApp</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-minimumApp</name> <licenses> diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml index 45d76796d..942fd9451 100644 --- a/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml +++ b/sdnr/wt/odlux/apps/performanceHistoryApp/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-app-performanceHistoryApp</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnr-wt-odlux-app-performanceHistoryApp</name> <licenses> diff --git a/sdnr/wt/odlux/core/features/pom.xml b/sdnr/wt/odlux/core/features/pom.xml index b24c6dec4..083c03cb9 100644 --- a/sdnr/wt/odlux/core/features/pom.xml +++ b/sdnr/wt/odlux/core/features/pom.xml @@ -16,14 +16,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-core-feature</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <licenses> @@ -35,13 +35,7 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal.model</groupId> - <artifactId>mdsal-model-artifacts</artifactId> - <version>${odl.mdsal.model.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-artifacts</artifactId> diff --git a/sdnr/wt/odlux/core/installer/pom.xml b/sdnr/wt/odlux/core/installer/pom.xml index f3c9ab637..422a121c6 100755 --- a/sdnr/wt/odlux/core/installer/pom.xml +++ b/sdnr/wt/odlux/core/installer/pom.xml @@ -4,14 +4,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-core-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/odlux/core/model/pom.xml b/sdnr/wt/odlux/core/model/pom.xml index af41a421a..919915281 100644 --- a/sdnr/wt/odlux/core/model/pom.xml +++ b/sdnr/wt/odlux/core/model/pom.xml @@ -4,14 +4,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-core-model</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <licenses> diff --git a/sdnr/wt/odlux/core/pom.xml b/sdnr/wt/odlux/core/pom.xml index e56ec82de..63c136d46 100644 --- a/sdnr/wt/odlux/core/pom.xml +++ b/sdnr/wt/odlux/core/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> @@ -12,7 +12,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-core-top</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>odlux-core</name> diff --git a/sdnr/wt/odlux/core/provider/pom.xml b/sdnr/wt/odlux/core/provider/pom.xml index ea8e3eb29..0e1fe9ac7 100644 --- a/sdnr/wt/odlux/core/provider/pom.xml +++ b/sdnr/wt/odlux/core/provider/pom.xml @@ -4,14 +4,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-core-provider</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <licenses> diff --git a/sdnr/wt/odlux/framework/pom.xml b/sdnr/wt/odlux/framework/pom.xml index da369e018..c19eba7bb 100644 --- a/sdnr/wt/odlux/framework/pom.xml +++ b/sdnr/wt/odlux/framework/pom.xml @@ -4,13 +4,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-odlux-framework</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>jar</packaging> <name>sdnr-wt-odlux-framework</name> <properties> diff --git a/sdnr/wt/odlux/pom.xml b/sdnr/wt/odlux/pom.xml index fec9f6ab8..e4af48516 100644 --- a/sdnr/wt/odlux/pom.xml +++ b/sdnr/wt/odlux/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> @@ -12,7 +12,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>odlux-top</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>odlux</name> diff --git a/sdnr/wt/pom.xml b/sdnr/wt/pom.xml index 9d6389723..314d39c4c 100644 --- a/sdnr/wt/pom.xml +++ b/sdnr/wt/pom.xml @@ -24,13 +24,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sdnr-wireless transport :: micro-services</name> <description>SDN-R wireless transport micro-services</description> diff --git a/sdnr/wt/readthedocs/pom.xml b/sdnr/wt/readthedocs/pom.xml index 9450cd800..856b58628 100644 --- a/sdnr/wt/readthedocs/pom.xml +++ b/sdnr/wt/readthedocs/pom.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> @@ -12,8 +11,8 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.2</version> - <relativePath /> + <version>1.4.0-SNAPSHOT</version> + <relativePath/> </parent> <properties> diff --git a/sdnr/wt/websocketmanager2/feature/pom.xml b/sdnr/wt/websocketmanager2/feature/pom.xml index fb7f62289..a31e1e809 100644 --- a/sdnr/wt/websocketmanager2/feature/pom.xml +++ b/sdnr/wt/websocketmanager2/feature/pom.xml @@ -26,26 +26,20 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-websocketmanager2-feature</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId} :: feature</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <dependencyManagement> <dependencies> - <dependency> - <groupId>org.opendaylight.mdsal.model</groupId> - <artifactId>mdsal-model-artifacts</artifactId> - <version>${odl.mdsal.model.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> + <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>mdsal-artifacts</artifactId> diff --git a/sdnr/wt/websocketmanager2/installer/pom.xml b/sdnr/wt/websocketmanager2/installer/pom.xml index 75fd80b89..c15e26241 100755 --- a/sdnr/wt/websocketmanager2/installer/pom.xml +++ b/sdnr/wt/websocketmanager2/installer/pom.xml @@ -26,14 +26,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-websocketmanager2-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/websocketmanager2/model/pom.xml b/sdnr/wt/websocketmanager2/model/pom.xml index 8161374a2..e5bdfab58 100644 --- a/sdnr/wt/websocketmanager2/model/pom.xml +++ b/sdnr/wt/websocketmanager2/model/pom.xml @@ -25,13 +25,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-websocketmanager2-model</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> </project> diff --git a/sdnr/wt/websocketmanager2/pom.xml b/sdnr/wt/websocketmanager2/pom.xml index 3581a41c5..9974bf562 100755 --- a/sdnr/wt/websocketmanager2/pom.xml +++ b/sdnr/wt/websocketmanager2/pom.xml @@ -26,14 +26,14 @@ <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-websocketmanager2-top</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/sdnr/wt/websocketmanager2/provider/pom.xml b/sdnr/wt/websocketmanager2/provider/pom.xml index a454245d0..ecf36e33a 100644 --- a/sdnr/wt/websocketmanager2/provider/pom.xml +++ b/sdnr/wt/websocketmanager2/provider/pom.xml @@ -14,13 +14,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-websocketmanager2-provider</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> <packaging>bundle</packaging> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <properties> diff --git a/sdnr/wt/websocketmanager2/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/sdnr/wt/websocketmanager2/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml new file mode 100644 index 000000000..5e95b7b74 --- /dev/null +++ b/sdnr/wt/websocketmanager2/provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ============LICENSE_START======================================================================== + ONAP : ccsdk feature sdnr wt + ================================================================================================= + Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved. + ================================================================================================= + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software distributed under the License + is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + or implied. See the License for the specific language governing permissions and limitations under + the License. + ============LICENSE_END========================================================================== +--> +<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" + xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" + odl:use-default-for-reference-types="true"> + + <reference id="rpcProviderRegistry" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" odl:type="default" /> + + <bean id="provider" class="org.onap.ccsdk.features.sdnr.wt.websocketmanager2.WebSocketManagerProvider" init-method="init" destroy-method="close"> + <property name="rpcProviderRegistry" ref="rpcProviderRegistry" /> + </bean> + + <reference id="onBindService" availability="mandatory" activation="eager" interface="org.osgi.service.http.HttpService"> + <reference-listener ref="provider" bind-method="onBindService" unbind-method="onUnbindService" /> + </reference> + +</blueprint> diff --git a/version.properties b/version.properties index 6a35b9035..50be578e4 100644 --- a/version.properties +++ b/version.properties @@ -5,8 +5,8 @@ release_name=0 -sprint_number=5 -feature_revision=2 +sprint_number=6 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} |