diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-12-02 07:48:49 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-12-02 11:11:13 -0500 |
| commit | 8f2fcdaf36cc05480d0d8c03d0d54368e7a851f6 (patch) | |
| tree | 6e7f0cef4cc3523c0b9ba0e28e249db41b993655 | |
| parent | ff3eecb980bfdc8d43d2ed3a4c786d634fa6f4e2 (diff) | |
Add missing pom.xml files
Add missing modules to top level pom.xml and add missing
pom files for core, adaptors, northbound and plugin directories.
Also rolled version to next minor version (1.2.0-SNAPSHOT) to avoid
conflict with compiled code from individual repos during
transition to new structure.
Issue-ID: CCSDK-3009
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: If58175bd2519955cd896290cac7001df4eb62287
168 files changed, 1100 insertions, 270 deletions
diff --git a/.gitignore b/.gitignore index 42cca13bb..e3a6ff64b 100755 --- a/.gitignore +++ b/.gitignore @@ -7,10 +7,11 @@ org.eclipse.core.resources.prefs .settings .idea .externalToolBuilders +.checkstyle maven-eclipse.xml workspace -.checkstyle .vscode +.factorypath ## Compilation Files ## *.class @@ -18,6 +19,9 @@ workspace target target-ide MANIFEST.MF +**/yang-gen-sal +*.interp +core/sli/model/src/main/java ## Misc Ignores (OS specific etc) ## bin/ @@ -30,18 +34,27 @@ classes out/ .DS_STORE .metadata -.vscode -provider/src/main/java/META-INF/ -provider/src/main/java/inventory/ -logs/ -debug-logs/ -*.log -*.versionsBackup -## BlackDuck generated file -ccsdk-adaptors_bdio.jsonld +## antlr4 generated files ## +ExprGrammarBaseListener.java +ExprGrammarLexer.java +ExprGrammarListener.java +ExprGrammarParser.java +ExprGrammar.tokens +ExprGrammarLexer.tokens + +# BlackDuck generated file +*.jsonld blackDuckHubProjectName.txt blackDuckHubProjectVersionName.txt -#Generated dependencies list +# Derby log +derby.log + +# Generated file +core/sliPluginUtils/provider/testFileName direct-dependencies.txt +logs/ +debug-logs/ +*.log +*.versionsBackup diff --git a/adaptors/aai-service/installer/pom.xml b/adaptors/aai-service/installer/pom.xml index 591e9bc20..2611c7b05 100755 --- a/adaptors/aai-service/installer/pom.xml +++ b/adaptors/aai-service/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>aai-service-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name> diff --git a/adaptors/aai-service/pom.xml b/adaptors/aai-service/pom.xml index 322291043..a06c97291 100755 --- a/adaptors/aai-service/pom.xml +++ b/adaptors/aai-service/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>aai-service</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: aai-service</name> diff --git a/adaptors/aai-service/provider/pom.xml b/adaptors/aai-service/provider/pom.xml index ca3fda288..ecd5ac980 100755 --- a/adaptors/aai-service/provider/pom.xml +++ b/adaptors/aai-service/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>aai-service-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name> diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml index 605c64421..403b20e64 100644 --- a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml +++ b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml @@ -25,7 +25,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ansible-adapter-bundle</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name> diff --git a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml index af02a8c5c..eb6726c54 100644 --- a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml +++ b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml @@ -35,7 +35,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ansible-adapter-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId}</name> diff --git a/adaptors/ansible-adapter/pom.xml b/adaptors/ansible-adapter/pom.xml index 3414e7cf3..a46493dca 100644 --- a/adaptors/ansible-adapter/pom.xml +++ b/adaptors/ansible-adapter/pom.xml @@ -35,7 +35,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ansible-adaptor</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: ansible-adapter</name> diff --git a/adaptors/artifacts/pom.xml b/adaptors/artifacts/pom.xml index 452292304..e55c8093b 100755 --- a/adaptors/artifacts/pom.xml +++ b/adaptors/artifacts/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>sli-adaptors-artifacts</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: sli-adaptors-artifacts</name> diff --git a/adaptors/base/http/installer/pom.xml b/adaptors/base/http/installer/pom.xml index 980302ac9..bed3252f4 100644 --- a/adaptors/base/http/installer/pom.xml +++ b/adaptors/base/http/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>base-http-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: base-http :: ${project.artifactId}</name> diff --git a/adaptors/base/http/pom.xml b/adaptors/base/http/pom.xml index 05840986d..d33eeed9c 100644 --- a/adaptors/base/http/pom.xml +++ b/adaptors/base/http/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors.base</groupId> <artifactId>http</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/adaptors/base/http/provider/pom.xml b/adaptors/base/http/provider/pom.xml index 5a3642fd2..5f21a8a8d 100644 --- a/adaptors/base/http/provider/pom.xml +++ b/adaptors/base/http/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>base-http-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/adaptors/base/pom.xml b/adaptors/base/pom.xml index a8e6b9193..6f5cb2103 100644 --- a/adaptors/base/pom.xml +++ b/adaptors/base/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>base-parent</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/adaptors/features/ccsdk-aai-service/pom.xml b/adaptors/features/ccsdk-aai-service/pom.xml index 2870ea50f..61c340375 100644 --- a/adaptors/features/ccsdk-aai-service/pom.xml +++ b/adaptors/features/ccsdk-aai-service/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ccsdk-aai-service</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name> diff --git a/adaptors/features/ccsdk-ansible-adapter/pom.xml b/adaptors/features/ccsdk-ansible-adapter/pom.xml index 652a3ee59..12e2ef28b 100644 --- a/adaptors/features/ccsdk-ansible-adapter/pom.xml +++ b/adaptors/features/ccsdk-ansible-adapter/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ccsdk-ansible-adapter</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId}</name> diff --git a/adaptors/features/ccsdk-base-http/pom.xml b/adaptors/features/ccsdk-base-http/pom.xml index 4f83f5de1..67ac058a1 100644 --- a/adaptors/features/ccsdk-base-http/pom.xml +++ b/adaptors/features/ccsdk-base-http/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ccsdk-base-http</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-adaptors :: base-http :: ${project.artifactId}</name> diff --git a/adaptors/features/ccsdk-mdsal-resource/pom.xml b/adaptors/features/ccsdk-mdsal-resource/pom.xml index fc5b9ae2f..c1ac42cd0 100644 --- a/adaptors/features/ccsdk-mdsal-resource/pom.xml +++ b/adaptors/features/ccsdk-mdsal-resource/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ccsdk-mdsal-resource</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name> diff --git a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml index 0030d92c8..1eaa15617 100755 --- a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>ccsdk-messagerouter-consumer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <dependencies> diff --git a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml index fcedcace0..43fa9b264 100755 --- a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>ccsdk-messagerouter-publisher</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <dependencies> diff --git a/adaptors/features/ccsdk-netbox-client/pom.xml b/adaptors/features/ccsdk-netbox-client/pom.xml index cff225740..9d79c7818 100644 --- a/adaptors/features/ccsdk-netbox-client/pom.xml +++ b/adaptors/features/ccsdk-netbox-client/pom.xml @@ -27,7 +27,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ccsdk-netbox-client</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name> diff --git a/adaptors/features/ccsdk-resource-assignment/pom.xml b/adaptors/features/ccsdk-resource-assignment/pom.xml index d73a1acda..4932e7456 100644 --- a/adaptors/features/ccsdk-resource-assignment/pom.xml +++ b/adaptors/features/ccsdk-resource-assignment/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ccsdk-resource-assignment</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name> diff --git a/adaptors/features/ccsdk-saltstack-adapter/pom.xml b/adaptors/features/ccsdk-saltstack-adapter/pom.xml index 3ac7fcf14..aca4707c4 100644 --- a/adaptors/features/ccsdk-saltstack-adapter/pom.xml +++ b/adaptors/features/ccsdk-saltstack-adapter/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ccsdk-saltstack-adapter</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId}</name> diff --git a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml index 821f1cb12..4fe10f7da 100644 --- a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml +++ b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ccsdk-sli-adaptors-all</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> diff --git a/adaptors/features/ccsdk-sql-resource/pom.xml b/adaptors/features/ccsdk-sql-resource/pom.xml index d8ff07047..c5c6db660 100644 --- a/adaptors/features/ccsdk-sql-resource/pom.xml +++ b/adaptors/features/ccsdk-sql-resource/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ccsdk-sql-resource</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name> diff --git a/adaptors/features/features-sli-adaptors/pom.xml b/adaptors/features/features-sli-adaptors/pom.xml index 5e98da302..697b5cdf2 100644 --- a/adaptors/features/features-sli-adaptors/pom.xml +++ b/adaptors/features/features-sli-adaptors/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>features-sli-adaptors</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> diff --git a/adaptors/features/installer/pom.xml b/adaptors/features/installer/pom.xml index fab35b5f0..385bc6e1c 100755 --- a/adaptors/features/installer/pom.xml +++ b/adaptors/features/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>sliadaptors-features-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> diff --git a/adaptors/features/pom.xml b/adaptors/features/pom.xml index e57a639ac..d8cda4541 100755 --- a/adaptors/features/pom.xml +++ b/adaptors/features/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>sliadaptors-feature-aggregator</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: features</name> diff --git a/adaptors/mdsal-resource/installer/pom.xml b/adaptors/mdsal-resource/installer/pom.xml index bb92cbff3..2fa1a0905 100755 --- a/adaptors/mdsal-resource/installer/pom.xml +++ b/adaptors/mdsal-resource/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>mdsal-resource-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name> diff --git a/adaptors/mdsal-resource/pom.xml b/adaptors/mdsal-resource/pom.xml index e770e504c..1969ab1c9 100755 --- a/adaptors/mdsal-resource/pom.xml +++ b/adaptors/mdsal-resource/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>mdsal-resource</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: mdsal-resource</name> diff --git a/adaptors/mdsal-resource/provider/pom.xml b/adaptors/mdsal-resource/provider/pom.xml index 255812b55..f077096cc 100755 --- a/adaptors/mdsal-resource/provider/pom.xml +++ b/adaptors/mdsal-resource/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>mdsal-resource-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name> diff --git a/adaptors/message-router/consumer/api/pom.xml b/adaptors/message-router/consumer/api/pom.xml index e77eb9793..0b7d638f7 100755 --- a/adaptors/message-router/consumer/api/pom.xml +++ b/adaptors/message-router/consumer/api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>consumer.aggregate</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>consumer.api</artifactId> diff --git a/adaptors/message-router/consumer/installer/pom.xml b/adaptors/message-router/consumer/installer/pom.xml index 2b8eb688e..69cec8b11 100755 --- a/adaptors/message-router/consumer/installer/pom.xml +++ b/adaptors/message-router/consumer/installer/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>consumer.aggregate</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>consumer.installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> diff --git a/adaptors/message-router/consumer/pom.xml b/adaptors/message-router/consumer/pom.xml index cad1bbba0..0295cffac 100755 --- a/adaptors/message-router/consumer/pom.xml +++ b/adaptors/message-router/consumer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>messagerouter-root</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>consumer.aggregate</artifactId> diff --git a/adaptors/message-router/consumer/provider/pom.xml b/adaptors/message-router/consumer/provider/pom.xml index d3e568c40..a0de316b5 100755 --- a/adaptors/message-router/consumer/provider/pom.xml +++ b/adaptors/message-router/consumer/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>consumer.aggregate</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>consumer.provider</artifactId> diff --git a/adaptors/message-router/pom.xml b/adaptors/message-router/pom.xml index 63d267d2a..74d77db6e 100755 --- a/adaptors/message-router/pom.xml +++ b/adaptors/message-router/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>messagerouter-root</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/adaptors/message-router/publisher/api/pom.xml b/adaptors/message-router/publisher/api/pom.xml index 7831284cf..4668e4417 100755 --- a/adaptors/message-router/publisher/api/pom.xml +++ b/adaptors/message-router/publisher/api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>publisher.aggregate</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>publisher.api</artifactId> diff --git a/adaptors/message-router/publisher/installer/pom.xml b/adaptors/message-router/publisher/installer/pom.xml index bc0565e5b..8b43dff59 100644 --- a/adaptors/message-router/publisher/installer/pom.xml +++ b/adaptors/message-router/publisher/installer/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>publisher.aggregate</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>publisher.installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> diff --git a/adaptors/message-router/publisher/pom.xml b/adaptors/message-router/publisher/pom.xml index 6fb9c82d3..98d032151 100755 --- a/adaptors/message-router/publisher/pom.xml +++ b/adaptors/message-router/publisher/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>messagerouter-root</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>publisher.aggregate</artifactId> diff --git a/adaptors/message-router/publisher/provider/pom.xml b/adaptors/message-router/publisher/provider/pom.xml index 7cd311448..e0a0499a7 100755 --- a/adaptors/message-router/publisher/provider/pom.xml +++ b/adaptors/message-router/publisher/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>publisher.aggregate</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>publisher.provider</artifactId> diff --git a/adaptors/message-router/publisher/sample.client/pom.xml b/adaptors/message-router/publisher/sample.client/pom.xml index 694af1f4a..17efd245e 100755 --- a/adaptors/message-router/publisher/sample.client/pom.xml +++ b/adaptors/message-router/publisher/sample.client/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>publisher.aggregate</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <artifactId>sample.client</artifactId> diff --git a/adaptors/netbox-client/installer/pom.xml b/adaptors/netbox-client/installer/pom.xml index 44fa16490..1d434a05a 100755 --- a/adaptors/netbox-client/installer/pom.xml +++ b/adaptors/netbox-client/installer/pom.xml @@ -27,7 +27,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>netbox-client-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name> diff --git a/adaptors/netbox-client/pom.xml b/adaptors/netbox-client/pom.xml index 6c9dbe85c..0f2019762 100644 --- a/adaptors/netbox-client/pom.xml +++ b/adaptors/netbox-client/pom.xml @@ -27,7 +27,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>netbox-client</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: netbox-client</name> diff --git a/adaptors/netbox-client/provider/pom.xml b/adaptors/netbox-client/provider/pom.xml index 2242a157b..23e3213a4 100644 --- a/adaptors/netbox-client/provider/pom.xml +++ b/adaptors/netbox-client/provider/pom.xml @@ -27,7 +27,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>netbox-client-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name> diff --git a/adaptors/pom.xml b/adaptors/pom.xml new file mode 100755 index 000000000..379c4e1b5 --- /dev/null +++ b/adaptors/pom.xml @@ -0,0 +1,154 @@ +<?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"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.0</version> + </parent> + + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-sli-adaptors</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>ccsdk-sli-adaptors</name> + <description>The CCSDK core components contains the SLI, dblib and root pom</description> + <url>https://wiki.onap.org</url> + <organization> + <name>ONAP</name> + </organization> + + <modules> + <module>aai-service</module> + <module>ansible-adapter</module> + <module>saltstack-adapter</module> + <module>netbox-client</module> + <module>mdsal-resource</module> + <module>resource-assignment</module> + <module>sql-resource</module> + <module>base</module> + <module>message-router</module> + <module>features</module> + <module>artifacts</module> + </modules> + + <scm> + <connection>scm:git:ssh://git@${onap.git.host}/ccsdk/sli/adaptors</connection> + <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/ccsdk/sli/adaptors</developerConnection> + <url>${onap.git.protocol}://${onap.git.host}/ccsdk/sli/adaptors</url> + <tag>ccsdk-adaptors-${project.version}</tag> + </scm> + <issueManagement> + <system>JIRA</system> + <url>https://jira.onap.org/</url> + </issueManagement> + <ciManagement> + <system>Jenkins</system> + <url>https://jenkins.onap.org/</url> + </ciManagement> + <distributionManagement> + <site> + <id>sdnc-javadoc</id> + <url> + dav:https://${onap.nexus.host}/content/sites/site/org/onap/sdnc/adaptors/${project.artifactId}/${project.version} + </url> + </site> + </distributionManagement> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.17</version> + <configuration> + <skipTests>false</skipTests> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>blackduck</id> + <activation> + <property> + <name>blackduck-scan</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>com.blackducksoftware.integration</groupId> + <artifactId>hub-maven-plugin</artifactId> + <version>1.4.0</version> + <inherited>false</inherited> + <configuration> + <hubProjectName>${project.name}</hubProjectName> + <outputDirectory>${project.basedir}</outputDirectory> + </configuration> + <executions> + <execution> + <id>create-bdio-file</id> + <phase>package</phase> + <goals> + <goal>createHubOutput</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + + </build> + + </profile> + + <profile> + <id>dependency-list</id> + <build> + <plugins> + <plugin> + <groupId>com.github.ferstl</groupId> + <artifactId>depgraph-maven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <inherited>false</inherited> + <goals> + <goal>aggregate</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <inherited>false</inherited> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${dependency-list.file}</file> + <type>txt</type> + <classifier>dependencies</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + </profiles> +</project> diff --git a/adaptors/resource-assignment/installer/pom.xml b/adaptors/resource-assignment/installer/pom.xml index 11ff40ce3..37abc05e1 100755 --- a/adaptors/resource-assignment/installer/pom.xml +++ b/adaptors/resource-assignment/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>resource-assignment-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name> diff --git a/adaptors/resource-assignment/pom.xml b/adaptors/resource-assignment/pom.xml index c2ef269ca..c06bcdd8d 100755 --- a/adaptors/resource-assignment/pom.xml +++ b/adaptors/resource-assignment/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>resource-assignment</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: resource-assignment</name> diff --git a/adaptors/resource-assignment/provider/pom.xml b/adaptors/resource-assignment/provider/pom.xml index 014daeae5..c0155a169 100755 --- a/adaptors/resource-assignment/provider/pom.xml +++ b/adaptors/resource-assignment/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>resource-assignment-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name> diff --git a/adaptors/saltstack-adapter/pom.xml b/adaptors/saltstack-adapter/pom.xml index de8a87b05..e94262efd 100644 --- a/adaptors/saltstack-adapter/pom.xml +++ b/adaptors/saltstack-adapter/pom.xml @@ -35,7 +35,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>saltstack-adaptor</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: saltstack-adapter</name> diff --git a/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml b/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml index 67e30fa02..895fec3c9 100644 --- a/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml +++ b/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml @@ -35,7 +35,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>saltstack-adapter-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} diff --git a/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml b/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml index 4b6868179..924e94098 100644 --- a/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml +++ b/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml @@ -24,7 +24,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>saltstack-adapter-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} diff --git a/adaptors/sql-resource/installer/pom.xml b/adaptors/sql-resource/installer/pom.xml index 5ec885ce0..44497a054 100755 --- a/adaptors/sql-resource/installer/pom.xml +++ b/adaptors/sql-resource/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>sql-resource-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name> diff --git a/adaptors/sql-resource/pom.xml b/adaptors/sql-resource/pom.xml index 5cbee1089..e448e8402 100755 --- a/adaptors/sql-resource/pom.xml +++ b/adaptors/sql-resource/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>sql-resource</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-adaptors :: sql-resource</name> diff --git a/adaptors/sql-resource/provider/pom.xml b/adaptors/sql-resource/provider/pom.xml index 94b0225c9..0afabe457 100755 --- a/adaptors/sql-resource/provider/pom.xml +++ b/adaptors/sql-resource/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>sql-resource-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId}</name> diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml index 9b5f92fd5..7a4252148 100755 --- a/core/artifacts/pom.xml +++ b/core/artifacts/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-core-artifacts</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sli-core-artifacts</name> diff --git a/core/dblib/installer/pom.xml b/core/dblib/installer/pom.xml index 44779753d..b97d11cfd 100755 --- a/core/dblib/installer/pom.xml +++ b/core/dblib/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>dblib-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name> diff --git a/core/dblib/pom.xml b/core/dblib/pom.xml index 00f4d5b37..efe43e1ae 100755 --- a/core/dblib/pom.xml +++ b/core/dblib/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>dblib</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: dblib</name> diff --git a/core/dblib/provider/pom.xml b/core/dblib/provider/pom.xml index c45513794..224f53aff 100755 --- a/core/dblib/provider/pom.xml +++ b/core/dblib/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>dblib-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name> diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml index 88a840a15..705309995 100644 --- a/core/features/ccsdk-dblib/pom.xml +++ b/core/features/ccsdk-dblib/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-dblib</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name> diff --git a/core/features/ccsdk-filters/pom.xml b/core/features/ccsdk-filters/pom.xml index b096df322..0a3f9afa3 100644 --- a/core/features/ccsdk-filters/pom.xml +++ b/core/features/ccsdk-filters/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-filters</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name> diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml index 270ed685f..984484e8c 100644 --- a/core/features/ccsdk-sli-core-all/pom.xml +++ b/core/features/ccsdk-sli-core-all/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli-core-all</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: features :: ${project.artifactId}</name> diff --git a/core/features/ccsdk-sli/pom.xml b/core/features/ccsdk-sli/pom.xml index f6e97ec20..5521d624b 100644 --- a/core/features/ccsdk-sli/pom.xml +++ b/core/features/ccsdk-sli/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name> diff --git a/core/features/ccsdk-sliPluginUtils/pom.xml b/core/features/ccsdk-sliPluginUtils/pom.xml index c050dcde5..04e76b445 100644 --- a/core/features/ccsdk-sliPluginUtils/pom.xml +++ b/core/features/ccsdk-sliPluginUtils/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sliPluginUtils</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name> diff --git a/core/features/ccsdk-sliapi/pom.xml b/core/features/ccsdk-sliapi/pom.xml index 89e7eec3e..3a026e2c9 100644 --- a/core/features/ccsdk-sliapi/pom.xml +++ b/core/features/ccsdk-sliapi/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sliapi</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name> diff --git a/core/features/ccsdk-slicore-utils/pom.xml b/core/features/ccsdk-slicore-utils/pom.xml index ea8492b75..bbba2b0d1 100644 --- a/core/features/ccsdk-slicore-utils/pom.xml +++ b/core/features/ccsdk-slicore-utils/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-slicore-utils</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name> diff --git a/core/features/features-sli-core/pom.xml b/core/features/features-sli-core/pom.xml index 1459cef01..e0502fe3f 100644 --- a/core/features/features-sli-core/pom.xml +++ b/core/features/features-sli-core/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>features-sli-core</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-core :: features :: ${project.artifactId}</name> diff --git a/core/features/installer/pom.xml b/core/features/installer/pom.xml index d02e5d8d3..53acc2686 100755 --- a/core/features/installer/pom.xml +++ b/core/features/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>slicore-features-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: features :: ${project.artifactId}</name> diff --git a/core/features/pom.xml b/core/features/pom.xml index 69355a4c7..9018b1707 100755 --- a/core/features/pom.xml +++ b/core/features/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>slicore-feature-aggregator</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: features</name> diff --git a/core/filters/installer/pom.xml b/core/filters/installer/pom.xml index fae31a12b..56a8692bc 100755 --- a/core/filters/installer/pom.xml +++ b/core/filters/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>filters-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name> diff --git a/core/filters/pom.xml b/core/filters/pom.xml index 8db5d810b..9549ccd16 100644 --- a/core/filters/pom.xml +++ b/core/filters/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>filters</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: filters</name> diff --git a/core/filters/provider/pom.xml b/core/filters/provider/pom.xml index ea7f9962e..657e50022 100755 --- a/core/filters/provider/pom.xml +++ b/core/filters/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>filters-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name> diff --git a/core/pom.xml b/core/pom.xml new file mode 100755 index 000000000..d53f5a8bc --- /dev/null +++ b/core/pom.xml @@ -0,0 +1,131 @@ +<?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"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.0-SNAPSHOT</version> + <relativePath/> + </parent> + + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>ccsdk-sli-core</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>ccsdk-sli-core</name> + <description>CCSDK core components contains the SLI, dblib</description> + <url>https://wiki.onap.org</url> + <organization> + <name>ONAP</name> + </organization> + + <modules> + <module>utils</module> + <module>dblib</module> + <module>sli</module> + <module>filters</module> + <module>sliPluginUtils</module> + <module>sliapi</module> + <module>features</module> + <module>artifacts</module> + </modules> + + <scm> + <connection>scm:git:ssh://git@${onap.git.host}/sdnc-code.git</connection> + <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-core.git</developerConnection> + <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-core/browse</url> + <tag>sdnc-core-1.1.0</tag> + </scm> + <distributionManagement> + <site> + <id>ecomp-site</id> + <url>dav:${onap.nexus.url}/${sitePath}</url> + </site> + </distributionManagement> + + <properties> + <sitePath>content/sites/site/org/onap/ccsdk/sli/core/${project.version}/</sitePath> + </properties> + + <profiles> + <profile> + <id>blackduck</id> + <activation> + <property> + <name>blackduck-scan</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>com.blackducksoftware.integration</groupId> + <artifactId>hub-maven-plugin</artifactId> + <version>1.4.0</version> + <inherited>false</inherited> + <configuration> + <hubProjectName>${project.name}</hubProjectName> + <outputDirectory>${project.basedir}</outputDirectory> + </configuration> + <executions> + <execution> + <id>create-bdio-file</id> + <phase>package</phase> + <goals> + <goal>createHubOutput</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + </profile> + + <profile> + <id>dependency-list</id> + <build> + <plugins> + <plugin> + <groupId>com.github.ferstl</groupId> + <artifactId>depgraph-maven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <inherited>false</inherited> + <goals> + <goal>aggregate</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <inherited>false</inherited> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${dependency-list.file}</file> + <type>txt</type> + <classifier>dependencies</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + </profiles> +</project> diff --git a/core/sli/common/pom.xml b/core/sli/common/pom.xml index 201c11bdd..748488bb2 100755 --- a/core/sli/common/pom.xml +++ b/core/sli/common/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name> diff --git a/core/sli/installer/pom.xml b/core/sli/installer/pom.xml index 40776bdcf..02b5c1ddc 100755 --- a/core/sli/installer/pom.xml +++ b/core/sli/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name> diff --git a/core/sli/model/pom.xml b/core/sli/model/pom.xml index 0b859e7d2..fbdb982f4 100755 --- a/core/sli/model/pom.xml +++ b/core/sli/model/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-model</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name> diff --git a/core/sli/pom.xml b/core/sli/pom.xml index cfb7656d1..74873649a 100755 --- a/core/sli/pom.xml +++ b/core/sli/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sli</name> diff --git a/core/sli/provider-base/pom.xml b/core/sli/provider-base/pom.xml index eedce9154..671c0610f 100644 --- a/core/sli/provider-base/pom.xml +++ b/core/sli/provider-base/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider-base</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name> diff --git a/core/sli/provider/pom.xml b/core/sli/provider/pom.xml index 3d5c389c4..7ad437d47 100755 --- a/core/sli/provider/pom.xml +++ b/core/sli/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name> diff --git a/core/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml index c133cd05b..f6f4d5588 100755 --- a/core/sliPluginUtils/installer/pom.xml +++ b/core/sliPluginUtils/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliPluginUtils-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name> diff --git a/core/sliPluginUtils/pom.xml b/core/sliPluginUtils/pom.xml index 974e0661c..4974d0003 100755 --- a/core/sliPluginUtils/pom.xml +++ b/core/sliPluginUtils/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliPluginUtils</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sliPluginUtils</name> diff --git a/core/sliPluginUtils/provider/pom.xml b/core/sliPluginUtils/provider/pom.xml index 086faf39e..393d982e4 100755 --- a/core/sliPluginUtils/provider/pom.xml +++ b/core/sliPluginUtils/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliPluginUtils-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name> diff --git a/core/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml index 1b3b24a45..5e11a3609 100755 --- a/core/sliapi/installer/pom.xml +++ b/core/sliapi/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliapi-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name> diff --git a/core/sliapi/model/pom.xml b/core/sliapi/model/pom.xml index f23ad8da7..20075e1e0 100755 --- a/core/sliapi/model/pom.xml +++ b/core/sliapi/model/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliapi-model</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sliapi</name> diff --git a/core/sliapi/model/swagger/pom.xml b/core/sliapi/model/swagger/pom.xml index db9ddbc42..eaa6d6039 100644 --- a/core/sliapi/model/swagger/pom.xml +++ b/core/sliapi/model/swagger/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliapi-model-swagger</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>jar</packaging> <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name> diff --git a/core/sliapi/model/swagger/src/main/json/sliapi.json b/core/sliapi/model/swagger/src/main/json/sliapi.json index b53663201..284defcc8 100644 --- a/core/sliapi/model/swagger/src/main/json/sliapi.json +++ b/core/sliapi/model/swagger/src/main/json/sliapi.json @@ -1 +1 @@ -{"swagger":"2.0","info":{"description":"Defines API to service logic interpreter,This module contains a collection of generally useful derived\nYANG data types.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.,This module contains a collection of generally useful derived\nYANG data types for Internet addresses and related things.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.","version":"1.1.0-SNAPSHOT","title":"SLI-API,ietf-yang-types,ietf-inet-types API"},"consumes":["application/json","application/xml"],"produces":["application/json","application/xml"],"paths":{"/config/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/config/SLI-API:test-results/SLI-API:test-result/":{"post":{"description":"creates sli.api.testresults.TestResult","parameters":[{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}}},"/config/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/operational/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}}},"/operational/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}}},"/operations/SLI-API:execute-graph/":{"post":{"tags":["SLI-API"],"parameters":[{"in":"body","name":"sli.api.executegraph.Input.body-param","required":false,"schema":{"properties":{"input":{"originalRef":"#/definitions/sli.api.executegraph.Input","$ref":"#/definitions/sli.api.executegraph.Input"}}}}],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","schema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"},"responseSchema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"}},"201":{"description":"No response"}}}},"/operations/SLI-API:healthcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","schema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"},"responseSchema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"}},"201":{"description":"No response"}}}},"/operations/SLI-API:vlbcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","schema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"},"responseSchema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"}},"201":{"description":"No response"}}}}},"definitions":{"sli.api.ExecuteGraph":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.Healthcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.ModeEnumeration":{"type":"string","enum":["sync","async"]},"sli.api.ParameterSetting":{"type":"object","properties":{"string-value":{"type":"string"},"boolean-value":{"type":"boolean"},"parameter-name":{"type":"string","description":"Parameter name"},"int-value":{"type":"integer","format":"int32"}}},"sli.api.ResponseFields":{"type":"object","properties":{"response-code":{"type":"string"},"response-message":{"type":"string"},"context-memory-json":{"type":"string"},"ack-final-indicator":{"type":"string"}}},"sli.api.TestResults":{"type":"object","properties":{"test-result":{"type":"array","items":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"sli.api.Vlbcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.executegraph.Input":{"type":"object","properties":{"mode":{"originalRef":"#/definitions/sli.api.ModeEnumeration","$ref":"#/definitions/sli.api.ModeEnumeration"},"module-name":{"type":"string"},"sli-parameter":{"type":"array","items":{"originalRef":"#/definitions/sli.api.ParameterSetting","$ref":"#/definitions/sli.api.ParameterSetting"}},"rpc-name":{"type":"string"}}},"sli.api.testresults.TestResult":{"type":"object","properties":{"results":{"type":"array","items":{"type":"string"}},"test-identifier":{"type":"string"}}}}}
\ No newline at end of file +{"swagger":"2.0","info":{"description":"Defines API to service logic interpreter,This module contains a collection of generally useful derived\nYANG data types.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.,This module contains a collection of generally useful derived\nYANG data types for Internet addresses and related things.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.","version":"1.2.0-SNAPSHOT","title":"SLI-API,ietf-yang-types,ietf-inet-types API"},"consumes":["application/json","application/xml"],"produces":["application/json","application/xml"],"paths":{"/config/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/config/SLI-API:test-results/SLI-API:test-result/":{"post":{"description":"creates sli.api.testresults.TestResult","parameters":[{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}}},"/config/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/operational/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}}},"/operational/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}}},"/operations/SLI-API:execute-graph/":{"post":{"tags":["SLI-API"],"parameters":[{"in":"body","name":"sli.api.executegraph.Input.body-param","required":false,"schema":{"properties":{"input":{"originalRef":"#/definitions/sli.api.executegraph.Input","$ref":"#/definitions/sli.api.executegraph.Input"}}}}],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","schema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"},"responseSchema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"}},"201":{"description":"No response"}}}},"/operations/SLI-API:healthcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","schema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"},"responseSchema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"}},"201":{"description":"No response"}}}},"/operations/SLI-API:vlbcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","schema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"},"responseSchema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"}},"201":{"description":"No response"}}}}},"definitions":{"sli.api.ExecuteGraph":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.Healthcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.ModeEnumeration":{"type":"string","enum":["sync","async"]},"sli.api.ParameterSetting":{"type":"object","properties":{"string-value":{"type":"string"},"boolean-value":{"type":"boolean"},"parameter-name":{"type":"string","description":"Parameter name"},"int-value":{"type":"integer","format":"int32"}}},"sli.api.ResponseFields":{"type":"object","properties":{"response-code":{"type":"string"},"response-message":{"type":"string"},"context-memory-json":{"type":"string"},"ack-final-indicator":{"type":"string"}}},"sli.api.TestResults":{"type":"object","properties":{"test-result":{"type":"array","items":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"sli.api.Vlbcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.executegraph.Input":{"type":"object","properties":{"mode":{"originalRef":"#/definitions/sli.api.ModeEnumeration","$ref":"#/definitions/sli.api.ModeEnumeration"},"module-name":{"type":"string"},"sli-parameter":{"type":"array","items":{"originalRef":"#/definitions/sli.api.ParameterSetting","$ref":"#/definitions/sli.api.ParameterSetting"}},"rpc-name":{"type":"string"}}},"sli.api.testresults.TestResult":{"type":"object","properties":{"results":{"type":"array","items":{"type":"string"}},"test-identifier":{"type":"string"}}}}}
\ No newline at end of file diff --git a/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml b/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml index b1a63be5d..d323e1058 100644 --- a/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml +++ b/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml @@ -18,7 +18,7 @@ info: Relating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version\ \ of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal\ \ notices." - version: "1.1.0-SNAPSHOT" + version: "1.2.0-SNAPSHOT" title: "SLI-API,ietf-yang-types,ietf-inet-types API" consumes: - "application/json" diff --git a/core/sliapi/model/yang/pom.xml b/core/sliapi/model/yang/pom.xml index 4d35f025c..3a443e0e9 100755 --- a/core/sliapi/model/yang/pom.xml +++ b/core/sliapi/model/yang/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliapi-model-yang</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name> diff --git a/core/sliapi/pom.xml b/core/sliapi/pom.xml index 2af92cf7e..8a8602ae5 100755 --- a/core/sliapi/pom.xml +++ b/core/sliapi/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliapi</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: sliapi</name> diff --git a/core/sliapi/provider/pom.xml b/core/sliapi/provider/pom.xml index 79f3d5560..447c6ef0f 100755 --- a/core/sliapi/provider/pom.xml +++ b/core/sliapi/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliapi-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name> diff --git a/core/utils/installer/pom.xml b/core/utils/installer/pom.xml index 829a33051..80e4072f8 100755 --- a/core/utils/installer/pom.xml +++ b/core/utils/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>utils-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name> diff --git a/core/utils/pom.xml b/core/utils/pom.xml index b8c196cff..a204f8175 100755 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>utils</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-core :: utils</name> diff --git a/core/utils/provider/pom.xml b/core/utils/provider/pom.xml index 3d4fd856d..8d3a785f4 100644 --- a/core/utils/provider/pom.xml +++ b/core/utils/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>utils-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name> diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml index c4fca9fb6..3e7ae12e5 100755 --- a/northbound/artifacts/pom.xml +++ b/northbound/artifacts/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>sli-northbound-artifacts</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: sli-northbound-artifacts</name> diff --git a/northbound/asdcApi/installer/pom.xml b/northbound/asdcApi/installer/pom.xml index bbdeb0cba..e5d5f2ce2 100755 --- a/northbound/asdcApi/installer/pom.xml +++ b/northbound/asdcApi/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> diff --git a/northbound/asdcApi/model/pom.xml b/northbound/asdcApi/model/pom.xml index 53fed3587..ede2bca16 100755 --- a/northbound/asdcApi/model/pom.xml +++ b/northbound/asdcApi/model/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-model</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml index b5cea9931..203946e2e 100755 --- a/northbound/asdcApi/pom.xml +++ b/northbound/asdcApi/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>asdcApi</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: asdcApi</name> diff --git a/northbound/asdcApi/provider/pom.xml b/northbound/asdcApi/provider/pom.xml index 97c4ba9aa..c267fc0c4 100755 --- a/northbound/asdcApi/provider/pom.xml +++ b/northbound/asdcApi/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> diff --git a/northbound/daexim-offsite-backup/installer/pom.xml b/northbound/daexim-offsite-backup/installer/pom.xml index 6fbabb426..7689471b4 100755 --- a/northbound/daexim-offsite-backup/installer/pom.xml +++ b/northbound/daexim-offsite-backup/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> diff --git a/northbound/daexim-offsite-backup/model/pom.xml b/northbound/daexim-offsite-backup/model/pom.xml index 4f338c786..17ca5b233 100755 --- a/northbound/daexim-offsite-backup/model/pom.xml +++ b/northbound/daexim-offsite-backup/model/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup-model</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> diff --git a/northbound/daexim-offsite-backup/pom.xml b/northbound/daexim-offsite-backup/pom.xml index aa98f5137..05d84514a 100755 --- a/northbound/daexim-offsite-backup/pom.xml +++ b/northbound/daexim-offsite-backup/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: daexim-offsite-backup</name> diff --git a/northbound/daexim-offsite-backup/provider/.gitignore b/northbound/daexim-offsite-backup/provider/.gitignore index 527bb69aa..eacf31a67 100755 --- a/northbound/daexim-offsite-backup/provider/.gitignore +++ b/northbound/daexim-offsite-backup/provider/.gitignore @@ -1,3 +1 @@ /target-ide/ -fileToZip1 -fileToZip2
\ No newline at end of file diff --git a/northbound/daexim-offsite-backup/provider/pom.xml b/northbound/daexim-offsite-backup/provider/pom.xml index 8d060bb94..265f2071c 100755 --- a/northbound/daexim-offsite-backup/provider/pom.xml +++ b/northbound/daexim-offsite-backup/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> diff --git a/northbound/daexim-offsite-backup/provider/src/test/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProviderTest.java b/northbound/daexim-offsite-backup/provider/src/test/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProviderTest.java index d070c30e2..0f0cee288 100644 --- a/northbound/daexim-offsite-backup/provider/src/test/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProviderTest.java +++ b/northbound/daexim-offsite-backup/provider/src/test/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProviderTest.java @@ -194,6 +194,7 @@ public class DaeximOffsiteBackupProviderTest { } catch(NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { + e.printStackTrace(); fail(); } diff --git a/northbound/daexim-offsite-backup/provider/src/test/resources/fileToZip1 b/northbound/daexim-offsite-backup/provider/src/test/resources/fileToZip1 new file mode 100644 index 000000000..c7ef4260e --- /dev/null +++ b/northbound/daexim-offsite-backup/provider/src/test/resources/fileToZip1 @@ -0,0 +1 @@ +Lorem ipsum.
\ No newline at end of file diff --git a/northbound/daexim-offsite-backup/provider/src/test/resources/fileToZip2 b/northbound/daexim-offsite-backup/provider/src/test/resources/fileToZip2 new file mode 100644 index 000000000..c7ef4260e --- /dev/null +++ b/northbound/daexim-offsite-backup/provider/src/test/resources/fileToZip2 @@ -0,0 +1 @@ +Lorem ipsum.
\ No newline at end of file diff --git a/northbound/dataChange/installer/pom.xml b/northbound/dataChange/installer/pom.xml index 60217baa6..74c131b55 100755 --- a/northbound/dataChange/installer/pom.xml +++ b/northbound/dataChange/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dataChange-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> diff --git a/northbound/dataChange/model/pom.xml b/northbound/dataChange/model/pom.xml index bce47e949..b006fffb5 100755 --- a/northbound/dataChange/model/pom.xml +++ b/northbound/dataChange/model/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dataChange-model</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> diff --git a/northbound/dataChange/pom.xml b/northbound/dataChange/pom.xml index 6110bdf1d..d8642bcd3 100755 --- a/northbound/dataChange/pom.xml +++ b/northbound/dataChange/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dataChange</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: dataChange</name> diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml index cdefb5437..70c9b0e45 100755 --- a/northbound/dataChange/provider/pom.xml +++ b/northbound/dataChange/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dataChange-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> diff --git a/northbound/dmaap-listener/lib/anr-changes-from-policy-to-sdnr.map b/northbound/dmaap-listener/lib/anr-changes-from-policy-to-sdnr.map new file mode 100644 index 000000000..5cd2b8371 --- /dev/null +++ b/northbound/dmaap-listener/lib/anr-changes-from-policy-to-sdnr.map @@ -0,0 +1,5 @@ +# SDN-C URL +SDNC.endpoint => SLI-API:execute-graph + +# Field mapping +SDNC.template => anr-pci-changes-from-policy-to-sdnr.vt diff --git a/northbound/dmaap-listener/lib/anr-pci-changes-from-policy-to-sdnr.vt b/northbound/dmaap-listener/lib/anr-pci-changes-from-policy-to-sdnr.vt new file mode 100644 index 000000000..1ded88dc7 --- /dev/null +++ b/northbound/dmaap-listener/lib/anr-pci-changes-from-policy-to-sdnr.vt @@ -0,0 +1,8 @@ +{ + "input": { + "module-name": "oofpcipoc-api", + "rpc-name": "$rpc_name", + "mode": "sync", + "sli-parameter": $sli_parameters + } +} diff --git a/northbound/dmaap-listener/lib/edgeRouterStatusChange.map b/northbound/dmaap-listener/lib/edgeRouterStatusChange.map new file mode 100644 index 000000000..fa5ff0784 --- /dev/null +++ b/northbound/dmaap-listener/lib/edgeRouterStatusChange.map @@ -0,0 +1,44 @@ +# SDN-C URL +SDNC.endpoint => FLOWRED-API:process-edge-router-status-change + +# Field mapping +equip_id => equip_id +ptnii_equip_name => equip-name +equip_type.equip_type => equip-type +ip_addr => loopback0 +router_prov_status => prov-status +country.region => region +country_abbr => country +equip_name_code => equip-name-code +as_number => as-number +loopback1 => loopback1 +loopback2 => loopback2 +loopback3 => loopback3 +loopback40 => loopback40 +loopback65535 => loopback65535 +inms_list => inms-list +encrypted_access_flag => encrypted-access-flag +sw_name => sw-name +nmipaddr => nm-addr +function_code => function-code + +EquipmentId => equip-id +PTNIIEquipmentName => equip-name +EquipmentType => equip-type +Loopback0 => loopback0 +RouterStatus => prov-status +Region => region +CountryAbbreviation => country +EquipmentNameCode => equip-name-code +ASNumber => as-number +SoftwareName => sw-name +NetworkManagementIPAddress => nm-addr +FunctionCode => function-code +Loopback1 => loopback1 +Loopback2 => loopback2 +Loopback3 => loopback3 +Loopback40 => loopback40 +Loopback65535 => loopback65535 +InmsList => inms-list +EncryptedAccessFlag => encrypted-access-flag + diff --git a/northbound/dmaap-listener/lib/esr-thirdparty-sdnc.map b/northbound/dmaap-listener/lib/esr-thirdparty-sdnc.map new file mode 100644 index 000000000..603645ebe --- /dev/null +++ b/northbound/dmaap-listener/lib/esr-thirdparty-sdnc.map @@ -0,0 +1,5 @@ +# SDN-C URL +SDNC.endpoint => DataChange:data-change-notification + +# Field mapping +SDNC.template => template-esr-thirdparty-sdnc.vt diff --git a/northbound/dmaap-listener/lib/generic-vnf.map b/northbound/dmaap-listener/lib/generic-vnf.map new file mode 100644 index 000000000..bc375eb28 --- /dev/null +++ b/northbound/dmaap-listener/lib/generic-vnf.map @@ -0,0 +1,5 @@ +# SDN-C URL +SDNC.endpoint => config-selfservice-api:notification-callback + +# Field mapping +SDNC.template => template-generic-vnf.vt diff --git a/northbound/dmaap-listener/lib/input.map b/northbound/dmaap-listener/lib/input.map new file mode 100644 index 000000000..9ae9bf6e8 --- /dev/null +++ b/northbound/dmaap-listener/lib/input.map @@ -0,0 +1 @@ +SDNC
\ No newline at end of file diff --git a/northbound/dmaap-listener/lib/log4j2.xml b/northbound/dmaap-listener/lib/log4j2.xml new file mode 100644 index 000000000..01ee93714 --- /dev/null +++ b/northbound/dmaap-listener/lib/log4j2.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<Configuration status="debug"> + <Properties> + <Property name="logDir">$${env:LOGDIR:-logs}</Property> + </Properties> + <Appenders> + <RollingFile name="LOGFILE" fileName="${logDir}/dmaap-listener.log" + filePattern="${logDir}/dmaap-listener-%i.log"> + <PatternLayout pattern="%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n" /> + <Policies> + <SizeBasedTriggeringPolicy size="10 MB" /> + </Policies> + <DefaultRolloverStrategy max="10"/> + </RollingFile> + <Console name="CONSOLE" target="SYSTEM_OUT"> + <PatternLayout pattern="%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n" /> + </Console> + </Appenders> + <Loggers> + <Root level="debug"> + <AppenderRef ref="LOGFILE"/> + <AppenderRef ref="CONSOLE"/> + </Root> + </Loggers> +</Configuration>
\ No newline at end of file diff --git a/northbound/dmaap-listener/lib/pci-changes-from-policy-to-sdnr.map b/northbound/dmaap-listener/lib/pci-changes-from-policy-to-sdnr.map new file mode 100644 index 000000000..5cd2b8371 --- /dev/null +++ b/northbound/dmaap-listener/lib/pci-changes-from-policy-to-sdnr.map @@ -0,0 +1,5 @@ +# SDN-C URL +SDNC.endpoint => SLI-API:execute-graph + +# Field mapping +SDNC.template => anr-pci-changes-from-policy-to-sdnr.vt diff --git a/northbound/dmaap-listener/lib/preferredRoute.txt b/northbound/dmaap-listener/lib/preferredRoute.txt new file mode 100644 index 000000000..662b0aa7d --- /dev/null +++ b/northbound/dmaap-listener/lib/preferredRoute.txt @@ -0,0 +1 @@ +preferredRouteKey=MR1
\ No newline at end of file diff --git a/northbound/dmaap-listener/lib/pserver.map b/northbound/dmaap-listener/lib/pserver.map new file mode 100644 index 000000000..8b3e463e7 --- /dev/null +++ b/northbound/dmaap-listener/lib/pserver.map @@ -0,0 +1,5 @@ +# SDN-C URL +SDNC.endpoint => config-selfservice-api:notification-callback + +# Field mapping +SDNC.template => template-pserver.vt diff --git a/northbound/dmaap-listener/lib/template-esr-thirdparty-sdnc.vt b/northbound/dmaap-listener/lib/template-esr-thirdparty-sdnc.vt new file mode 100644 index 000000000..225fce026 --- /dev/null +++ b/northbound/dmaap-listener/lib/template-esr-thirdparty-sdnc.vt @@ -0,0 +1,100 @@ +{ + "DataChange:input": { + "DataChange:aai-node-type": "$entitytype", + "DataChange:selflink": "$entitylink", + "DataChange:aai-event-id": "$id", + "DataChange:aai-event-trigger": "$action", + "DataChange:key-data": [{ + "DataChange:key-name": "thirdparty-sdnc-id", + "DataChange:key-value": "$thirdpartysdncid" + }, + { + "DataChange:key-name": "resource-version", + "DataChange:key-value": "$resourceversion" + }, + { + "DataChange:key-name": "location", + "DataChange:key-value": "$location" + }, + { + "DataChange:key-name": "product-name", + "DataChange:key-value": "$productname" + }, + { + "DataChange:key-name": "esr-system-info-id", + "DataChange:key-value": "$esrsysteminfoid" + }, + { + "DataChange:key-name": "system-type", + "DataChange:key-value": "$systemtype" + }, + { + "DataChange:key-name": "service-url", + "DataChange:key-value": "$serviceurl" + }, + { + "DataChange:key-name": "ssl-cacert", + "DataChange:key-value": "$sslcacert" + }, + { + "DataChange:key-name": "type", + "DataChange:key-value": "$type" + }, + { + "DataChange:key-name": "ssl-insecure", + "DataChange:key-value": "$sslinsecure" + }, + { + "DataChange:key-name": "system-status", + "DataChange:key-value": "$systemstatus" + }, + { + "DataChange:key-name": "version", + "DataChange:key-value": "$version" + }, + { + "DataChange:key-name": "passive", + "DataChange:key-value": "$passive" + }, + { + "DataChange:key-name": "password", + "DataChange:key-value": "$password" + }, + { + "DataChange:key-name": "protocol", + "DataChange:key-value": "$protocol" + }, + { + "DataChange:key-name": "ip-address", + "DataChange:key-value": "$ipaddress" + }, + { + "DataChange:key-name": "cloud-domain", + "DataChange:key-value": "$clouddomain" + }, + { + "DataChange:key-name": "user-name", + "DataChange:key-value": "$username" + }, + { + "DataChange:key-name": "system-name", + "DataChange:key-value": "$systemname" + }, + { + "DataChange:key-name": "port", + "DataChange:key-value": "$port" + }, + { + "DataChange:key-name": "vendor", + "DataChange:key-value": "$vendor" + }, + { + "DataChange:key-name": "remote-path", + "DataChange:key-value": "$remotepath" + }, + { + "DataChange:key-name": "default-tenant", + "DataChange:key-value": "$defaulttenant" + }] + } +} diff --git a/northbound/dmaap-listener/lib/template-generic-vnf.vt b/northbound/dmaap-listener/lib/template-generic-vnf.vt new file mode 100644 index 000000000..d57c9a0a4 --- /dev/null +++ b/northbound/dmaap-listener/lib/template-generic-vnf.vt @@ -0,0 +1,11 @@ +{ + "input": { + "common-header": { + "request-id": "$req_id", + "timestamp": "$curr_time", + "originator-id": "AAI", + "api-ver": "2.00" + }, + "payload": $full_message + } +}
\ No newline at end of file diff --git a/northbound/dmaap-listener/lib/template-pserver.vt b/northbound/dmaap-listener/lib/template-pserver.vt new file mode 100644 index 000000000..d57c9a0a4 --- /dev/null +++ b/northbound/dmaap-listener/lib/template-pserver.vt @@ -0,0 +1,11 @@ +{ + "input": { + "common-header": { + "request-id": "$req_id", + "timestamp": "$curr_time", + "originator-id": "AAI", + "api-ver": "2.00" + }, + "payload": $full_message + } +}
\ No newline at end of file diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml index 65e43886c..664c8cc47 100755 --- a/northbound/dmaap-listener/pom.xml +++ b/northbound/dmaap-listener/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dmaap-listener</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>jar</packaging> <name>ccsdk-sli-northbound :: dmaap-listener</name> diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml index a744c4a08..951c8a792 100644 --- a/northbound/features/ccsdk-asdcApi/pom.xml +++ b/northbound/features/ccsdk-asdcApi/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-asdcApi</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml index 6f57b66ea..b7ce893ac 100644 --- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-daexim-offsite-backup</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml index ada12eccc..a39d456bd 100644 --- a/northbound/features/ccsdk-dataChange/pom.xml +++ b/northbound/features/ccsdk-dataChange/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-dataChange</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml index 013786d24..b4869bf71 100644 --- a/northbound/features/ccsdk-lcm/pom.xml +++ b/northbound/features/ccsdk-lcm/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-lcm</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml index fc7081fbc..80d68d99b 100644 --- a/northbound/features/ccsdk-sli-northbound-all/pom.xml +++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-sli-northbound-all</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name> diff --git a/northbound/features/features-sli-northbound/pom.xml b/northbound/features/features-sli-northbound/pom.xml index 37f961b9e..95671fc25 100644 --- a/northbound/features/features-sli-northbound/pom.xml +++ b/northbound/features/features-sli-northbound/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>features-sli-northbound</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name> diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml index b87f855b8..be23e6011 100755 --- a/northbound/features/installer/pom.xml +++ b/northbound/features/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>slinorthbound-features-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name> diff --git a/northbound/features/pom.xml b/northbound/features/pom.xml index 88a4cbbec..69825084f 100755 --- a/northbound/features/pom.xml +++ b/northbound/features/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: features</name> diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml index 75bc22ac4..3601a3188 100755 --- a/northbound/lcm/installer/pom.xml +++ b/northbound/lcm/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>lcm-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> diff --git a/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml index 916345f68..f467200e0 100755 --- a/northbound/lcm/model/pom.xml +++ b/northbound/lcm/model/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>lcm-model</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> diff --git a/northbound/lcm/pom.xml b/northbound/lcm/pom.xml index e210b2451..b0898e4bd 100755 --- a/northbound/lcm/pom.xml +++ b/northbound/lcm/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>lcm</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: lcm</name> diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml index 03f34e6ba..9f7aae85c 100755 --- a/northbound/lcm/provider/pom.xml +++ b/northbound/lcm/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>lcm-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> diff --git a/northbound/pom.xml b/northbound/pom.xml new file mode 100644 index 000000000..a67afc542 --- /dev/null +++ b/northbound/pom.xml @@ -0,0 +1,146 @@ +<?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"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.0</version> + </parent> + + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>ccsdk-sli-northbound</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>ccsdk-sli-northbound</name> + <description>The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL applications</description> + <url>https://wiki.onap.org</url> + <organization> + <name>ONAP</name> + </organization> + + <modules> + <module>asdcApi</module> + <module>dataChange</module> + <module>lcm</module> + <module>dmaap-listener</module> + <module>ueb-listener</module> + <module>daexim-offsite-backup</module> + <module>features</module> + <module>artifacts</module> + </modules> + + <scm> + <connection>scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git</connection> + + <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-northbound.git</developerConnection> + <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-northbound/browse</url> + </scm> + <issueManagement> + <system>JIRA</system> + <url>https://jira.onap.org/</url> + </issueManagement> + <ciManagement> + <system>Jenkins</system> + <url>https://jenkins.onap.org/</url> + </ciManagement> + <distributionManagement> + <site> + <id>sdnc-javadoc</id> + <url>dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url> + </site> + </distributionManagement> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>false</skipTests> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>blackduck</id> + <activation> + <property> + <name>blackduck-scan</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>com.blackducksoftware.integration</groupId> + <artifactId>hub-maven-plugin</artifactId> + <version>1.4.0</version> + <inherited>false</inherited> + <configuration> + <hubProjectName>${project.name}</hubProjectName> + <outputDirectory>${project.basedir}</outputDirectory> + </configuration> + <executions> + <execution> + <id>create-bdio-file</id> + <phase>package</phase> + <goals> + <goal>createHubOutput</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + + </build> + + </profile> + <profile> + <id>dependency-list</id> + <build> + <plugins> + <plugin> + <groupId>com.github.ferstl</groupId> + <artifactId>depgraph-maven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <inherited>false</inherited> + <goals> + <goal>aggregate</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <inherited>false</inherited> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${dependency-list.file}</file> + <type>txt</type> + <classifier>dependencies</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> diff --git a/northbound/ueb-listener/pom.xml b/northbound/ueb-listener/pom.xml index 9e04efb07..81898a53d 100755 --- a/northbound/ueb-listener/pom.xml +++ b/northbound/ueb-listener/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ueb-listener</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>jar</packaging> <name>ccsdk-sli-northbound :: ueb-listener</name> diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml index fd52035b6..c57b93800 100755 --- a/plugins/artifacts/pom.xml +++ b/plugins/artifacts/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sli-plugins-artifacts</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: sli-plugins-artifacts</name> diff --git a/plugins/features/ccsdk-gr-toolkit/pom.xml b/plugins/features/ccsdk-gr-toolkit/pom.xml index 21464ef94..5767bccc9 100644 --- a/plugins/features/ccsdk-gr-toolkit/pom.xml +++ b/plugins/features/ccsdk-gr-toolkit/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-gr-toolkit</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> diff --git a/plugins/features/ccsdk-properties-node/pom.xml b/plugins/features/ccsdk-properties-node/pom.xml index e11366986..a1e30a949 100644 --- a/plugins/features/ccsdk-properties-node/pom.xml +++ b/plugins/features/ccsdk-properties-node/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-properties-node</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> diff --git a/plugins/features/ccsdk-restapi-call-node/pom.xml b/plugins/features/ccsdk-restapi-call-node/pom.xml index c5dcf096e..6566af7b8 100644 --- a/plugins/features/ccsdk-restapi-call-node/pom.xml +++ b/plugins/features/ccsdk-restapi-call-node/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-restapi-call-node</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> diff --git a/plugins/features/ccsdk-restconf-client/pom.xml b/plugins/features/ccsdk-restconf-client/pom.xml index 3d2e6d0e8..1ebfa6d83 100644 --- a/plugins/features/ccsdk-restconf-client/pom.xml +++ b/plugins/features/ccsdk-restconf-client/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-restconf-client</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name> diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml index fb73584f5..7533aa808 100644 --- a/plugins/features/ccsdk-sli-plugins-all/pom.xml +++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-sli-plugins-all</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name> diff --git a/plugins/features/ccsdk-sshapi-call-node/pom.xml b/plugins/features/ccsdk-sshapi-call-node/pom.xml index 0441c12cd..2e0436cf2 100644 --- a/plugins/features/ccsdk-sshapi-call-node/pom.xml +++ b/plugins/features/ccsdk-sshapi-call-node/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-sshapi-call-node</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name> diff --git a/plugins/features/ccsdk-template-node/pom.xml b/plugins/features/ccsdk-template-node/pom.xml index 4c6721643..4deb5362c 100644 --- a/plugins/features/ccsdk-template-node/pom.xml +++ b/plugins/features/ccsdk-template-node/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>ccsdk-template-node</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name> diff --git a/plugins/features/features-sli-plugins/pom.xml b/plugins/features/features-sli-plugins/pom.xml index f91c1bd56..848828b3c 100644 --- a/plugins/features/features-sli-plugins/pom.xml +++ b/plugins/features/features-sli-plugins/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>features-sli-plugins</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name> diff --git a/plugins/features/installer/pom.xml b/plugins/features/installer/pom.xml index f58851eca..0ef6a107e 100755 --- a/plugins/features/installer/pom.xml +++ b/plugins/features/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sliplugins-features-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name> diff --git a/plugins/features/pom.xml b/plugins/features/pom.xml index e95874196..a7c8ffa69 100755 --- a/plugins/features/pom.xml +++ b/plugins/features/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sliplugins-feature-aggregator</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: features</name> diff --git a/plugins/grToolkit/installer/pom.xml b/plugins/grToolkit/installer/pom.xml index d0392a65d..b7a48e80f 100755 --- a/plugins/grToolkit/installer/pom.xml +++ b/plugins/grToolkit/installer/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>gr-toolkit-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> diff --git a/plugins/grToolkit/model/pom.xml b/plugins/grToolkit/model/pom.xml index 5d518d744..1b3ce6802 100755 --- a/plugins/grToolkit/model/pom.xml +++ b/plugins/grToolkit/model/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>gr-toolkit-model</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> diff --git a/plugins/grToolkit/pom.xml b/plugins/grToolkit/pom.xml index 499876b3b..8e264c476 100755 --- a/plugins/grToolkit/pom.xml +++ b/plugins/grToolkit/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>gr-toolkit</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: gr-toolkit</name> diff --git a/plugins/grToolkit/provider/pom.xml b/plugins/grToolkit/provider/pom.xml index 2fc981b46..035d6830a 100755 --- a/plugins/grToolkit/provider/pom.xml +++ b/plugins/grToolkit/provider/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>gr-toolkit-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name> diff --git a/plugins/pom.xml b/plugins/pom.xml new file mode 100755 index 000000000..11027f22a --- /dev/null +++ b/plugins/pom.xml @@ -0,0 +1,144 @@ +<?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"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.0</version> + </parent> + + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>ccsdk-sli-plugins</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>ccsdk-sli-plugins</name> + <description>CCSDK Java Plugins</description> + <url>https://wiki.onap.org</url> + <organization> + <name>ONAP</name> + </organization> + + <modules> + <module>properties-node</module> + <module>restapi-call-node</module> + <module>sshapi-call-node</module> + <module>restconf-client</module> + <module>template-node</module> + <module>grToolkit</module> + <module>features</module> + <module>artifacts</module> + </modules> + + <scm> + <connection>scm:git:ssh://git@${onap.git.host}/ccsdk/sli/plugins.git</connection> + <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/ccsdk/sli/plugins.git</developerConnection> + <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/ccsdk/sli/plugins/browse</url> + <tag>HEAD</tag> + </scm> + <issueManagement> + <system>JIRA</system> + <url>https://jira.onap.org/</url> + </issueManagement> + <ciManagement> + <system>Jenkins</system> + <url>https://jenkins.onap.org</url> + </ciManagement> + <distributionManagement> + <site> + <id>sdnc-javadoc</id> + <url>dav:https://${onap.nexus.host}/content/sites/site/org/onap/sdnc/plugins/${project.artifactId}/${project.version}</url> + </site> + </distributionManagement> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.17</version> + <configuration> + <skipTests>false</skipTests> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>blackduck</id> + <activation> + <property> + <name>blackduck-scan</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>com.blackducksoftware.integration</groupId> + <artifactId>hub-maven-plugin</artifactId> + <version>1.4.0</version> + <inherited>false</inherited> + <configuration> + <hubProjectName>${project.name}</hubProjectName> + <outputDirectory>${project.basedir}</outputDirectory> + </configuration> + <executions> + <execution> + <id>create-bdio-file</id> + <phase>package</phase> + <goals> + <goal>createHubOutput</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>dependency-list</id> + <build> + <plugins> + <plugin> + <groupId>com.github.ferstl</groupId> + <artifactId>depgraph-maven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <inherited>false</inherited> + <goals> + <goal>aggregate</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <inherited>false</inherited> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${dependency-list.file}</file> + <type>txt</type> + <classifier>dependencies</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> diff --git a/plugins/properties-node/installer/pom.xml b/plugins/properties-node/installer/pom.xml index 4dc62faae..a2f1a8522 100755 --- a/plugins/properties-node/installer/pom.xml +++ b/plugins/properties-node/installer/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>properties-node-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> diff --git a/plugins/properties-node/pom.xml b/plugins/properties-node/pom.xml index 71fffe4d3..ae9b4d37b 100755 --- a/plugins/properties-node/pom.xml +++ b/plugins/properties-node/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>properties-node</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: properties-node</name> diff --git a/plugins/properties-node/provider/pom.xml b/plugins/properties-node/provider/pom.xml index fdfb4b3cb..8f0b80551 100755 --- a/plugins/properties-node/provider/pom.xml +++ b/plugins/properties-node/provider/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>properties-node-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> diff --git a/plugins/restapi-call-node/installer/pom.xml b/plugins/restapi-call-node/installer/pom.xml index fbf2cff60..51f3a3d2f 100755 --- a/plugins/restapi-call-node/installer/pom.xml +++ b/plugins/restapi-call-node/installer/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restapi-call-node-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> diff --git a/plugins/restapi-call-node/pom.xml b/plugins/restapi-call-node/pom.xml index c5b753305..faac0884a 100755 --- a/plugins/restapi-call-node/pom.xml +++ b/plugins/restapi-call-node/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restapi-call-node</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: restapi-call-node</name> diff --git a/plugins/restapi-call-node/provider/pom.xml b/plugins/restapi-call-node/provider/pom.xml index 89711519a..750915ca3 100755 --- a/plugins/restapi-call-node/provider/pom.xml +++ b/plugins/restapi-call-node/provider/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restapi-call-node-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml index 9114c7a22..5b9ff7555 100755 --- a/plugins/restconf-client/installer/pom.xml +++ b/plugins/restconf-client/installer/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restconf-client-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name> diff --git a/plugins/restconf-client/pom.xml b/plugins/restconf-client/pom.xml index ee2d0423c..d3f833fd4 100755 --- a/plugins/restconf-client/pom.xml +++ b/plugins/restconf-client/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restconf-client</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: restconf-client</name> diff --git a/plugins/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml index ab57af017..990b68cb2 100755 --- a/plugins/restconf-client/provider/pom.xml +++ b/plugins/restconf-client/provider/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restconf-client-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name> diff --git a/plugins/sshapi-call-node/installer/pom.xml b/plugins/sshapi-call-node/installer/pom.xml index de7509dbc..a91212acd 100755 --- a/plugins/sshapi-call-node/installer/pom.xml +++ b/plugins/sshapi-call-node/installer/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sshapi-call-node-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name> diff --git a/plugins/sshapi-call-node/pom.xml b/plugins/sshapi-call-node/pom.xml index a9dc52e4b..d55046f3e 100755 --- a/plugins/sshapi-call-node/pom.xml +++ b/plugins/sshapi-call-node/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sshapi-call-node</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node</name> diff --git a/plugins/sshapi-call-node/provider/pom.xml b/plugins/sshapi-call-node/provider/pom.xml index 49bceb122..df234194e 100755 --- a/plugins/sshapi-call-node/provider/pom.xml +++ b/plugins/sshapi-call-node/provider/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sshapi-call-node-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name> diff --git a/plugins/template-node/installer/pom.xml b/plugins/template-node/installer/pom.xml index c6ed6312f..d3dc569df 100644 --- a/plugins/template-node/installer/pom.xml +++ b/plugins/template-node/installer/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>template-node-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name> diff --git a/plugins/template-node/pom.xml b/plugins/template-node/pom.xml index 615c5d348..2dbbe5e70 100644 --- a/plugins/template-node/pom.xml +++ b/plugins/template-node/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>template-node</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/plugins/template-node/provider/pom.xml b/plugins/template-node/provider/pom.xml index d7bc54fc6..d71781752 100644 --- a/plugins/template-node/provider/pom.xml +++ b/plugins/template-node/provider/pom.xml @@ -10,7 +10,7 @@ <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>template-node-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name> @@ -1,123 +1,126 @@ <?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"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>oparent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>oparent</artifactId> + <version>2.1.0-SNAPSHOT</version> + <relativePath/> + </parent> - <groupId>org.onap.ccsdk.sli</groupId> - <artifactId>ccsdk-sli</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.sli</groupId> + <artifactId>ccsdk-sli</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>pom</packaging> - <name>ccsdk-sli</name> - <description>Service Logic Interpreter</description> - <url>https://wiki.onap.org</url> - <organization> - <name>ONAP</name> - </organization> + <name>ccsdk-sli</name> + <description>Service Logic Interpreter</description> + <url>https://wiki.onap.org</url> + <organization> + <name>ONAP</name> + </organization> - <modules> - </modules> + <modules> + <module>core</module> + <module>adaptors</module> + <module>northbound</module> + <module>plugins</module> + </modules> - <scm> - <connection>scm:git:ssh://git@${onap.git.host}/sdnc-code.git</connection> - <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sli.git</developerConnection> - <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sli/browse</url> - <tag>sli-1.1.0</tag> - </scm> - <distributionManagement> - <site> - <id>ecomp-site</id> - <url>dav:${onap.nexus.url}/${sitePath}</url> - </site> - </distributionManagement> + <scm> + <connection>scm:git:ssh://git@${onap.git.host}/sdnc-code.git</connection> + <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sli.git</developerConnection> + <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sli/browse</url> + <tag>sli-1.1.0</tag> + </scm> + <distributionManagement> + <site> + <id>ecomp-site</id> + <url>dav:${onap.nexus.url}/${sitePath}</url> + </site> + </distributionManagement> - <properties> - <sitePath>content/sites/site/org/onap/ccsdk/sli/${project.version}/</sitePath> - </properties> + <properties> + <sitePath>content/sites/site/org/onap/ccsdk/sli/${project.version}/</sitePath> + </properties> - <profiles> - <profile> - <id>blackduck</id> - <activation> - <property> - <name>blackduck-scan</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>com.blackducksoftware.integration</groupId> - <artifactId>hub-maven-plugin</artifactId> - <version>1.4.0</version> - <inherited>false</inherited> - <configuration> - <hubProjectName>${project.name}</hubProjectName> - <outputDirectory>${project.basedir}</outputDirectory> - </configuration> - <executions> - <execution> - <id>create-bdio-file</id> - <phase>package</phase> - <goals> - <goal>createHubOutput</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <profiles> + <profile> + <id>blackduck</id> + <activation> + <property> + <name>blackduck-scan</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>com.blackducksoftware.integration</groupId> + <artifactId>hub-maven-plugin</artifactId> + <version>1.4.0</version> + <inherited>false</inherited> + <configuration> + <hubProjectName>${project.name}</hubProjectName> + <outputDirectory>${project.basedir}</outputDirectory> + </configuration> + <executions> + <execution> + <id>create-bdio-file</id> + <phase>package</phase> + <goals> + <goal>createHubOutput</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - </profile> + </profile> - <profile> - <id>dependency-list</id> - <build> - <plugins> - <plugin> - <groupId>com.github.ferstl</groupId> - <artifactId>depgraph-maven-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <inherited>false</inherited> - <goals> - <goal>aggregate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <inherited>false</inherited> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${dependency-list.file}</file> - <type>txt</type> - <classifier>dependencies</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - </profiles> + <profile> + <id>dependency-list</id> + <build> + <plugins> + <plugin> + <groupId>com.github.ferstl</groupId> + <artifactId>depgraph-maven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <inherited>false</inherited> + <goals> + <goal>aggregate</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <inherited>false</inherited> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${dependency-list.file}</file> + <type>txt</type> + <classifier>dependencies</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/version.properties b/version.properties index 977efc0e3..24081890d 100644 --- a/version.properties +++ b/version.properties @@ -2,3 +2,14 @@ # Versioning variables # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support + + +release_name=1 +sprint_number=2 +feature_revision=0 + +base_version=${release_name}.${sprint_number}.${feature_revision} + +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT + |