From bf926edb33ca32e5c0c26054383d27312c2f8151 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 3 Dec 2020 11:05:19 -0500 Subject: Sync ccsdk/sli guilin branch Sync ccsdk/sli guilin branch to make contents identical with ccsdk/sli/[core|adaptors|northbound|plugins] repositories Issue-ID: CCSDK-3009 Signed-off-by: Dan Timoney Change-Id: I0f167680d04e65069fd2c0ba0a01681a9b334f0b --- northbound/artifacts/pom.xml | 5 +++-- northbound/asdcApi/installer/pom.xml | 4 ++-- northbound/asdcApi/model/pom.xml | 4 ++-- northbound/asdcApi/pom.xml | 4 ++-- northbound/asdcApi/provider/pom.xml | 4 ++-- northbound/daexim-offsite-backup/installer/pom.xml | 4 ++-- northbound/daexim-offsite-backup/model/pom.xml | 4 ++-- northbound/daexim-offsite-backup/pom.xml | 4 ++-- northbound/daexim-offsite-backup/provider/.gitignore | 2 ++ northbound/daexim-offsite-backup/provider/pom.xml | 4 ++-- .../daeximoffsitebackup/DaeximOffsiteBackupProviderTest.java | 1 - northbound/dataChange/installer/pom.xml | 4 ++-- northbound/dataChange/model/pom.xml | 4 ++-- northbound/dataChange/pom.xml | 4 ++-- northbound/dataChange/provider/pom.xml | 4 ++-- northbound/dmaap-listener/pom.xml | 6 +++--- northbound/features/ccsdk-asdcApi/pom.xml | 4 ++-- northbound/features/ccsdk-daexim-offsite-backup/pom.xml | 4 ++-- northbound/features/ccsdk-dataChange/pom.xml | 4 ++-- northbound/features/ccsdk-lcm/pom.xml | 4 ++-- northbound/features/ccsdk-sli-northbound-all/pom.xml | 4 ++-- northbound/features/features-sli-northbound/pom.xml | 4 ++-- northbound/features/installer/pom.xml | 4 ++-- northbound/features/pom.xml | 4 ++-- northbound/lcm/installer/pom.xml | 4 ++-- northbound/lcm/model/pom.xml | 4 ++-- northbound/lcm/pom.xml | 4 ++-- northbound/lcm/provider/pom.xml | 4 ++-- northbound/pom.xml | 4 ++-- northbound/ueb-listener/pom.xml | 8 ++++---- 30 files changed, 62 insertions(+), 60 deletions(-) (limited to 'northbound') diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml index 3e7ae12e5..36423762d 100755 --- a/northbound/artifacts/pom.xml +++ b/northbound/artifacts/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound sli-northbound-artifacts - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT pom ccsdk-sli-northbound :: sli-northbound-artifacts @@ -21,6 +21,7 @@ + 1.0.2 ${project.version} diff --git a/northbound/asdcApi/installer/pom.xml b/northbound/asdcApi/installer/pom.xml index e5d5f2ce2..a96b91b7c 100755 --- a/northbound/asdcApi/installer/pom.xml +++ b/northbound/asdcApi/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound asdcApi-installer - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT pom ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} diff --git a/northbound/asdcApi/model/pom.xml b/northbound/asdcApi/model/pom.xml index ede2bca16..660cf6d03 100755 --- a/northbound/asdcApi/model/pom.xml +++ b/northbound/asdcApi/model/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound asdcApi-model - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT bundle ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml index 203946e2e..d7fc77251 100755 --- a/northbound/asdcApi/pom.xml +++ b/northbound/asdcApi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound asdcApi - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT pom ccsdk-sli-northbound :: asdcApi diff --git a/northbound/asdcApi/provider/pom.xml b/northbound/asdcApi/provider/pom.xml index c267fc0c4..8858c6bec 100755 --- a/northbound/asdcApi/provider/pom.xml +++ b/northbound/asdcApi/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound asdcApi-provider - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT bundle ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} diff --git a/northbound/daexim-offsite-backup/installer/pom.xml b/northbound/daexim-offsite-backup/installer/pom.xml index 7689471b4..efd8eed19 100755 --- a/northbound/daexim-offsite-backup/installer/pom.xml +++ b/northbound/daexim-offsite-backup/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound daexim-offsite-backup-installer - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT pom ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} diff --git a/northbound/daexim-offsite-backup/model/pom.xml b/northbound/daexim-offsite-backup/model/pom.xml index 17ca5b233..12a70cd2f 100755 --- a/northbound/daexim-offsite-backup/model/pom.xml +++ b/northbound/daexim-offsite-backup/model/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound daexim-offsite-backup-model - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT bundle ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} diff --git a/northbound/daexim-offsite-backup/pom.xml b/northbound/daexim-offsite-backup/pom.xml index 05d84514a..c69ab0a8a 100755 --- a/northbound/daexim-offsite-backup/pom.xml +++ b/northbound/daexim-offsite-backup/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound daexim-offsite-backup - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT pom ccsdk-sli-northbound :: daexim-offsite-backup diff --git a/northbound/daexim-offsite-backup/provider/.gitignore b/northbound/daexim-offsite-backup/provider/.gitignore index eacf31a67..527bb69aa 100755 --- a/northbound/daexim-offsite-backup/provider/.gitignore +++ b/northbound/daexim-offsite-backup/provider/.gitignore @@ -1 +1,3 @@ /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 265f2071c..cc22ba543 100755 --- a/northbound/daexim-offsite-backup/provider/pom.xml +++ b/northbound/daexim-offsite-backup/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound daexim-offsite-backup-provider - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT bundle ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} 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 0f0cee288..d070c30e2 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,7 +194,6 @@ public class DaeximOffsiteBackupProviderTest { } catch(NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { - e.printStackTrace(); fail(); } diff --git a/northbound/dataChange/installer/pom.xml b/northbound/dataChange/installer/pom.xml index 74c131b55..e4fb82bac 100755 --- a/northbound/dataChange/installer/pom.xml +++ b/northbound/dataChange/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound dataChange-installer - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT pom ccsdk-sli-northbound :: dataChange :: ${project.artifactId} diff --git a/northbound/dataChange/model/pom.xml b/northbound/dataChange/model/pom.xml index b006fffb5..54b2cd687 100755 --- a/northbound/dataChange/model/pom.xml +++ b/northbound/dataChange/model/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound dataChange-model - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT bundle ccsdk-sli-northbound :: dataChange :: ${project.artifactId} diff --git a/northbound/dataChange/pom.xml b/northbound/dataChange/pom.xml index d8642bcd3..7e5493301 100755 --- a/northbound/dataChange/pom.xml +++ b/northbound/dataChange/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound dataChange - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT pom ccsdk-sli-northbound :: dataChange diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml index 70c9b0e45..60d3398a0 100755 --- a/northbound/dataChange/provider/pom.xml +++ b/northbound/dataChange/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound dataChange-provider - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT bundle ccsdk-sli-northbound :: dataChange :: ${project.artifactId} diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml index 664c8cc47..7a8aa80a0 100755 --- a/northbound/dmaap-listener/pom.xml +++ b/northbound/dmaap-listener/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent standalone-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound dmaap-listener - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT jar ccsdk-sli-northbound :: dmaap-listener @@ -24,7 +24,7 @@ ${maven.build.timestamp} ${project.version}-${build.number} - 1.1.0 + 1.0.2 ${project.version} diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml index 951c8a792..de4e6d661 100644 --- a/northbound/features/ccsdk-asdcApi/pom.xml +++ b/northbound/features/ccsdk-asdcApi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound ccsdk-asdcApi - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT feature ccsdk-sli-northbound :: asdcApi :: ${project.artifactId} diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml index b7ce893ac..9517664b6 100644 --- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound ccsdk-daexim-offsite-backup - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT feature ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId} diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml index a39d456bd..daf46dd02 100644 --- a/northbound/features/ccsdk-dataChange/pom.xml +++ b/northbound/features/ccsdk-dataChange/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound ccsdk-dataChange - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT feature ccsdk-sli-northbound :: dataChange :: ${project.artifactId} diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml index b4869bf71..ad426587c 100644 --- a/northbound/features/ccsdk-lcm/pom.xml +++ b/northbound/features/ccsdk-lcm/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound ccsdk-lcm - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT feature ccsdk-sli-northbound :: lcm :: ${project.artifactId} diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml index 80d68d99b..5abde1145 100644 --- a/northbound/features/ccsdk-sli-northbound-all/pom.xml +++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound ccsdk-sli-northbound-all - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT feature ccsdk-sli-northbound :: features :: ${project.artifactId} diff --git a/northbound/features/features-sli-northbound/pom.xml b/northbound/features/features-sli-northbound/pom.xml index 95671fc25..97144c73d 100644 --- a/northbound/features/features-sli-northbound/pom.xml +++ b/northbound/features/features-sli-northbound/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound features-sli-northbound - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT feature ccsdk-sli-northbound :: features :: ${project.artifactId} diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml index be23e6011..204ba741a 100755 --- a/northbound/features/installer/pom.xml +++ b/northbound/features/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound slinorthbound-features-installer - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT pom ccsdk-sli-northbound :: features :: ${project.artifactId} diff --git a/northbound/features/pom.xml b/northbound/features/pom.xml index 69825084f..f639272bd 100755 --- a/northbound/features/pom.xml +++ b/northbound/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound slinorthbound-feature-aggregator - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT pom ccsdk-sli-northbound :: features diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml index 3601a3188..2f5c20223 100755 --- a/northbound/lcm/installer/pom.xml +++ b/northbound/lcm/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound lcm-installer - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT pom ccsdk-sli-northbound :: lcm :: ${project.artifactId} diff --git a/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml index f467200e0..497498688 100755 --- a/northbound/lcm/model/pom.xml +++ b/northbound/lcm/model/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound lcm-model - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT bundle ccsdk-sli-northbound :: lcm :: ${project.artifactId} diff --git a/northbound/lcm/pom.xml b/northbound/lcm/pom.xml index b0898e4bd..20986b111 100755 --- a/northbound/lcm/pom.xml +++ b/northbound/lcm/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound lcm - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT pom ccsdk-sli-northbound :: lcm diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml index 9f7aae85c..63c33d73a 100755 --- a/northbound/lcm/provider/pom.xml +++ b/northbound/lcm/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound lcm-provider - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT bundle ccsdk-sli-northbound :: lcm :: ${project.artifactId} diff --git a/northbound/pom.xml b/northbound/pom.xml index a67afc542..6730b047c 100644 --- a/northbound/pom.xml +++ b/northbound/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-lite - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound ccsdk-sli-northbound - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT pom ccsdk-sli-northbound diff --git a/northbound/ueb-listener/pom.xml b/northbound/ueb-listener/pom.xml index 81898a53d..abbf2b696 100755 --- a/northbound/ueb-listener/pom.xml +++ b/northbound/ueb-listener/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent standalone-parent - 2.1.0 + 2.0.2 org.onap.ccsdk.sli.northbound ueb-listener - 1.2.0-SNAPSHOT + 1.0.4-SNAPSHOT jar ccsdk-sli-northbound :: ueb-listener @@ -22,10 +22,10 @@ yyyyMMdd'T'HHmmss'Z' ${maven.build.timestamp} ${project.version}-${build.number} - 1.1.0 + 1.0.2 ${project.version} 1.4.1 - 1.6.5 + 1.6.5 -- cgit 1.2.3-korg