summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dependencies-bom/pom.xml50
-rw-r--r--odlparent/binding-parent/pom.xml24
-rw-r--r--odlparent/bundle-parent/pom.xml24
-rw-r--r--odlparent/feature-repo-parent/pom.xml24
-rw-r--r--odlparent/karaf4-parent/pom.xml24
-rw-r--r--odlparent/mdsal-it-parent/pom.xml24
-rw-r--r--odlparent/odlparent-lite/pom.xml24
-rw-r--r--odlparent/odlparent/pom.xml24
-rwxr-xr-xodlparent/setup/src/main/resources/pom-template.xml24
-rw-r--r--odlparent/single-feature-parent/pom.xml24
-rwxr-xr-xoparent/pom.xml120
-rw-r--r--springboot/spring-boot-setup/src/main/resources/pom-template.xml15
-rw-r--r--springboot/springboot1/pom.xml15
-rw-r--r--springboot/springboot2/pom.xml15
14 files changed, 219 insertions, 212 deletions
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index f65cb8e4..a5e26f21 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -74,6 +74,16 @@
<version>2.4.0</version>
</dependency>
<dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.2.11</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.2.11</version>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
@@ -106,6 +116,12 @@
<version>7.0</version>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
@@ -116,6 +132,17 @@
<version>2.1</version>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2.8</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>stax-api</artifactId>
+ <groupId>javax.xml.stream</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
@@ -158,6 +185,16 @@
<version>4.5.10</version>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>2.11.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>2.11.2</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<version>9.0.30</version>
@@ -165,7 +202,12 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7</version>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
@@ -195,6 +237,12 @@
<version>2.4.4</version>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.10.19</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-analytics</artifactId>
<version>1.6.5</version>
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 494de2de..fa639287 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -96,18 +96,18 @@
<logging-analytics.version>1.6.6</logging-analytics.version>
<!-- CCSDK component versions -->
- <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
- <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
- <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
- <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
- <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
- <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
- <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
+ <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+ <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+ <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
+ <sdnctl.aai.service.version>${ccsdk.sli.version}</sdnctl.aai.service.version>
+ <sdnctl.dblib.version>${ccsdk.sli.version}</sdnctl.dblib.version>
+ <sdnctl.mdsal.resource.version>${ccsdk.sli.version}</sdnctl.mdsal.resource.version>
+ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
<odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 66eb4ba8..9e6cf962 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -96,18 +96,18 @@
<logging-analytics.version>1.6.6</logging-analytics.version>
<!-- CCSDK component versions -->
- <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
- <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
- <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
- <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
- <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
- <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
- <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
+ <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+ <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+ <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
+ <sdnctl.aai.service.version>${ccsdk.sli.version}</sdnctl.aai.service.version>
+ <sdnctl.dblib.version>${ccsdk.sli.version}</sdnctl.dblib.version>
+ <sdnctl.mdsal.resource.version>${ccsdk.sli.version}</sdnctl.mdsal.resource.version>
+ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
<odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index b58f0b74..06c888f1 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -96,18 +96,18 @@
<logging-analytics.version>1.6.6</logging-analytics.version>
<!-- CCSDK component versions -->
- <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
- <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
- <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
- <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
- <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
- <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
- <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
+ <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+ <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+ <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
+ <sdnctl.aai.service.version>${ccsdk.sli.version}</sdnctl.aai.service.version>
+ <sdnctl.dblib.version>${ccsdk.sli.version}</sdnctl.dblib.version>
+ <sdnctl.mdsal.resource.version>${ccsdk.sli.version}</sdnctl.mdsal.resource.version>
+ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
<odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index affe9be3..eb701f20 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -96,18 +96,18 @@
<logging-analytics.version>1.6.6</logging-analytics.version>
<!-- CCSDK component versions -->
- <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
- <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
- <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
- <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
- <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
- <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
- <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
+ <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+ <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+ <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
+ <sdnctl.aai.service.version>${ccsdk.sli.version}</sdnctl.aai.service.version>
+ <sdnctl.dblib.version>${ccsdk.sli.version}</sdnctl.dblib.version>
+ <sdnctl.mdsal.resource.version>${ccsdk.sli.version}</sdnctl.mdsal.resource.version>
+ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
<odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index e1ec8ef1..e555c66a 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -96,18 +96,18 @@
<logging-analytics.version>1.6.6</logging-analytics.version>
<!-- CCSDK component versions -->
- <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
- <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
- <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
- <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
- <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
- <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
- <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
+ <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+ <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+ <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
+ <sdnctl.aai.service.version>${ccsdk.sli.version}</sdnctl.aai.service.version>
+ <sdnctl.dblib.version>${ccsdk.sli.version}</sdnctl.dblib.version>
+ <sdnctl.mdsal.resource.version>${ccsdk.sli.version}</sdnctl.mdsal.resource.version>
+ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
<odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 4ef8a7e2..1ccc320a 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -96,18 +96,18 @@
<logging-analytics.version>1.6.6</logging-analytics.version>
<!-- CCSDK component versions -->
- <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
- <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
- <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
- <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
- <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
- <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
- <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
+ <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+ <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+ <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
+ <sdnctl.aai.service.version>${ccsdk.sli.version}</sdnctl.aai.service.version>
+ <sdnctl.dblib.version>${ccsdk.sli.version}</sdnctl.dblib.version>
+ <sdnctl.mdsal.resource.version>${ccsdk.sli.version}</sdnctl.mdsal.resource.version>
+ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
<odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 49a76e80..56409dc9 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -96,18 +96,18 @@
<logging-analytics.version>1.6.6</logging-analytics.version>
<!-- CCSDK component versions -->
- <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
- <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
- <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
- <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
- <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
- <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
- <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
+ <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+ <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+ <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
+ <sdnctl.aai.service.version>${ccsdk.sli.version}</sdnctl.aai.service.version>
+ <sdnctl.dblib.version>${ccsdk.sli.version}</sdnctl.dblib.version>
+ <sdnctl.mdsal.resource.version>${ccsdk.sli.version}</sdnctl.mdsal.resource.version>
+ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
<odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 58b61f2a..5a65babc 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -96,18 +96,18 @@
<logging-analytics.version>1.6.6</logging-analytics.version>
<!-- CCSDK component versions -->
- <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
- <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
- <sdnctl.sli.version>\${ccsdk.sli.core.version}</sdnctl.sli.version>
- <sdnctl.aai.service.version>\${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
- <sdnctl.dblib.version>\${ccsdk.sli.core.version}</sdnctl.dblib.version>
- <sdnctl.mdsal.resource.version>\${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
- <sdnctl.slipluginutils.version>\${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
+ <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+ <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+ <ccsdk.sli.core.version>\${ccsdk.sli.version}</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>\${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>\${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>\${ccsdl.sli.version}</ccsdk.sli.plugins.version>
+ <sdnctl.aai.service.version>\${ccsdk.sli.version}</sdnctl.aai.service.version>
+ <sdnctl.dblib.version>\${ccsdk.sli.version}</sdnctl.dblib.version>
+ <sdnctl.mdsal.resource.version>\${ccsdk.sli.version}</sdnctl.mdsal.resource.version>
+ <sdnctl.slipluginutils.version>\${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
<odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 3bd549e9..b5048b35 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -96,18 +96,18 @@
<logging-analytics.version>1.6.6</logging-analytics.version>
<!-- CCSDK component versions -->
- <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
- <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
- <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
- <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
- <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
- <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
- <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
+ <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+ <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+ <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
+ <sdnctl.aai.service.version>${ccsdk.sli.version}</sdnctl.aai.service.version>
+ <sdnctl.dblib.version>${ccsdk.sli.version}</sdnctl.dblib.version>
+ <sdnctl.mdsal.resource.version>${ccsdk.sli.version}</sdnctl.mdsal.resource.version>
+ <sdnctl.slipluginutils.version>${ccsdk.sli.version}</sdnctl.slipluginutils.version>
<!-- Support libraries used by OpenDaylight -->
<odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
diff --git a/oparent/pom.xml b/oparent/pom.xml
index d96f5e12..998c0956 100755
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>2.0.0</version>
+ <version>3.1.0</version>
<relativePath/>
</parent>
@@ -55,26 +55,10 @@
<bundle.plugin.version>2.5.0</bundle.plugin.version>
<checkstyle.skip>true</checkstyle.skip>
- <!-- CCSDK component versions -->
- <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
- <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
-
-
- <mariadb.connector.version>2.1.1</mariadb.connector.version>
- <fasterxml.jackson.version>2.10.0</fasterxml.jackson.version>
- <velocity.version>2.0</velocity.version>
-
<dmaap.listener.version>1.1.5</dmaap.listener.version>
<sdc.client.version>1.4.0</sdc.client.version>
<sdc.tosca.version>1.6.3</sdc.tosca.version>
- <dependency-list.file>direct-dependencies.txt</dependency-list.file>
-
</properties>
<dependencyManagement>
@@ -103,63 +87,18 @@
<artifactId>dmaapClient</artifactId>
<version>${dmaap.listener.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.21</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>2.11.2</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${fasterxml.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${fasterxml.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
- <version>${velocity.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</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.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.vorburger.mariaDB4j</groupId>
- <artifactId>mariaDB4j</artifactId>
- <version>2.2.3</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<repositories>
<repository>
<id>onap-public</id>
@@ -215,17 +154,9 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>com.github.ferstl</groupId>
- <artifactId>depgraph-maven-plugin</artifactId>
- <version>3.3.0</version>
- <configuration>
- <graphFormat>text</graphFormat>
- <outputFileName>${dependency-list.file}</outputFileName>
- <outputDirectory>${project.basedir}</outputDirectory>
- <transitiveExcludes>*</transitiveExcludes>
- <showVersions>true</showVersions>
- <showGroupIds>true</showGroupIds>
- </configuration>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-maven-plugin</artifactId>
+ <version>4.7.2</version>
</plugin>
</plugins>
</pluginManagement>
@@ -342,6 +273,31 @@
<version>4.2.1</version>
<extensions>true</extensions>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
index d207178b..2912ac0d 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
@@ -91,13 +91,14 @@
<logging-analytics.version>1.6.5</logging-analytics.version>
<!-- CCSDK component versions -->
- <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
- <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+ <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+ <ccsdk.sli.core.version>${ccsdl.sli.version}</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
<!-- Spring versions -->
<spring.boot.version>${springbootparent.version}</spring.boot.version>
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index cdbdc9f2..98d13fc3 100644
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -91,13 +91,14 @@
<logging-analytics.version>1.6.5</logging-analytics.version>
<!-- CCSDK component versions -->
- <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
- <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+ <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+ <ccsdk.sli.core.version>${ccsdl.sli.version}</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
<!-- Spring versions -->
<spring.boot.version>1.5.22.RELEASE</spring.boot.version>
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 148179f5..77bd08ca 100644
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -91,13 +91,14 @@
<logging-analytics.version>1.6.5</logging-analytics.version>
<!-- CCSDK component versions -->
- <ccsdk.cds.version>1.1.0-SNAPSHOT</ccsdk.cds.version>
- <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
- <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
- <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
- <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
- <ccsdk.distribution.version>1.1.0-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.cds.version>1.1.1-SNAPSHOT</ccsdk.cds.version>
+ <ccsdk.features.version>1.1.1-SNAPSHOT</ccsdk.features.version>
+ <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.sli.version>1.2.0-SNAPSHOT</ccsdk.sli.version>
+ <ccsdk.sli.core.version>${ccsdl.sli.version}</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>${ccsdl.sli.version}</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>${ccsdl.sli.version}</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>${ccsdl.sli.version}</ccsdk.sli.plugins.version>
<!-- Spring versions -->
<spring.boot.version>2.3.3.RELEASE</spring.boot.version>