From 7de29bfea89ff53a446bea07d8f74d1aaa87045b Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 25 Nov 2020 08:29:23 -0500 Subject: Limit use of odlparent poms Updated pom.xmls to use standard maven project structure (i.e. parent of pom is pom in directory above), and updated top level pom to use org.ccsdk.parent:oparent as parent - EXCEPT in cases where module has true OpenDaylight dependencies and therefore needs to use ODL parent pom. Change-Id: I50429f28225152251ac2086235c14bb00f09c05c Issue-ID: CCSDK-3001 Signed-off-by: Dan Timoney --- northbound/artifacts/pom.xml | 6 +++--- northbound/asdcApi/installer/pom.xml | 7 +++--- northbound/asdcApi/model/pom.xml | 2 +- northbound/asdcApi/pom.xml | 7 +++--- northbound/asdcApi/provider/pom.xml | 2 +- northbound/daexim-offsite-backup/installer/pom.xml | 7 +++--- northbound/daexim-offsite-backup/model/pom.xml | 2 +- northbound/daexim-offsite-backup/pom.xml | 7 +++--- northbound/daexim-offsite-backup/provider/pom.xml | 6 +++--- northbound/dataChange/installer/pom.xml | 7 +++--- northbound/dataChange/model/pom.xml | 2 +- northbound/dataChange/pom.xml | 7 +++--- northbound/dataChange/provider/pom.xml | 22 +++++++++---------- northbound/dmaap-listener/pom.xml | 25 ++++++++++++++++++++-- .../dmaapclient/SdncDmaapConsumerImpl.java | 6 +++--- northbound/features/ccsdk-asdcApi/pom.xml | 7 +++--- .../features/ccsdk-daexim-offsite-backup/pom.xml | 7 +++--- northbound/features/ccsdk-dataChange/pom.xml | 7 +++--- northbound/features/ccsdk-lcm/pom.xml | 7 +++--- .../features/ccsdk-sli-northbound-all/pom.xml | 7 +++--- .../features/features-sli-northbound/pom.xml | 2 +- northbound/features/installer/pom.xml | 7 +++--- northbound/features/pom.xml | 4 ++-- northbound/lcm/installer/pom.xml | 7 +++--- northbound/lcm/model/pom.xml | 2 +- northbound/lcm/pom.xml | 7 +++--- northbound/lcm/provider/pom.xml | 2 +- northbound/pom.xml | 8 +++---- northbound/ueb-listener/pom.xml | 6 +++--- 29 files changed, 101 insertions(+), 94 deletions(-) (limited to 'northbound') diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml index fc3496ebd..4cfa8c924 100755 --- a/northbound/artifacts/pom.xml +++ b/northbound/artifacts/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - parent - 2.1.0 + org.onap.ccsdk.sli.northbound + northbound-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/asdcApi/installer/pom.xml b/northbound/asdcApi/installer/pom.xml index e5d5f2ce2..f8d3eae14 100755 --- a/northbound/asdcApi/installer/pom.xml +++ b/northbound/asdcApi/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + asdcApi + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/asdcApi/model/pom.xml b/northbound/asdcApi/model/pom.xml index a31cd3079..6796e71b5 100755 --- a/northbound/asdcApi/model/pom.xml +++ b/northbound/asdcApi/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml index 9dfe29782..8bd482873 100755 --- a/northbound/asdcApi/pom.xml +++ b/northbound/asdcApi/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + northbound-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/asdcApi/provider/pom.xml b/northbound/asdcApi/provider/pom.xml index a308ff5a1..19e5660f7 100755 --- a/northbound/asdcApi/provider/pom.xml +++ b/northbound/asdcApi/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/daexim-offsite-backup/installer/pom.xml b/northbound/daexim-offsite-backup/installer/pom.xml index 7689471b4..bff0096d6 100755 --- a/northbound/daexim-offsite-backup/installer/pom.xml +++ b/northbound/daexim-offsite-backup/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + daexim-offsite-backup + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/daexim-offsite-backup/model/pom.xml b/northbound/daexim-offsite-backup/model/pom.xml index 17ca5b233..ff9a12dfc 100755 --- a/northbound/daexim-offsite-backup/model/pom.xml +++ b/northbound/daexim-offsite-backup/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/daexim-offsite-backup/pom.xml b/northbound/daexim-offsite-backup/pom.xml index 05d84514a..e6a0a8db6 100755 --- a/northbound/daexim-offsite-backup/pom.xml +++ b/northbound/daexim-offsite-backup/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + northbound-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/daexim-offsite-backup/provider/pom.xml b/northbound/daexim-offsite-backup/provider/pom.xml index 265f2071c..a600cdbaa 100755 --- a/northbound/daexim-offsite-backup/provider/pom.xml +++ b/northbound/daexim-offsite-backup/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT @@ -54,12 +54,12 @@ org.onap.ccsdk.sli.core sli-common - ${sdnctl.sli.version} + ${project.version} org.onap.ccsdk.sli.core sli-provider - ${sdnctl.sli.version} + ${project.version} com.google.code.findbugs diff --git a/northbound/dataChange/installer/pom.xml b/northbound/dataChange/installer/pom.xml index 74c131b55..3a30086f6 100755 --- a/northbound/dataChange/installer/pom.xml +++ b/northbound/dataChange/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + dataChange + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/dataChange/model/pom.xml b/northbound/dataChange/model/pom.xml index 1e8202670..59effb0d2 100755 --- a/northbound/dataChange/model/pom.xml +++ b/northbound/dataChange/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/dataChange/pom.xml b/northbound/dataChange/pom.xml index d8642bcd3..b642ad185 100755 --- a/northbound/dataChange/pom.xml +++ b/northbound/dataChange/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + northbound-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml index 5c4d259d3..b1369895b 100755 --- a/northbound/dataChange/provider/pom.xml +++ b/northbound/dataChange/provider/pom.xml @@ -5,8 +5,8 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 - + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.northbound @@ -17,15 +17,15 @@ ccsdk-sli-northbound :: dataChange :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml index fcc069607..fb0724989 100755 --- a/northbound/dmaap-listener/pom.xml +++ b/northbound/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent standalone-parent - 2.1.0 + 2.1.1-SNAPSHOT org.onap.ccsdk.sli.northbound @@ -23,6 +23,8 @@ yyyyMMdd'T'HHmmss'Z' ${maven.build.timestamp} ${project.version}-${build.number} + + 2.22.1 @@ -49,6 +51,7 @@ org.onap.dmaap.messagerouter.dmaapclient dmaapClient + 1.1.12 org.slf4j @@ -70,10 +73,28 @@ com.fasterxml.jackson.core jackson-annotations + + + org.glassfish.jersey.core + jersey-common + ${jersey.version} + + + + org.glassfish.jersey.core + jersey-client + ${jersey.version} + + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey.version} + org.apache.velocity velocity-engine-core - + junit junit diff --git a/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java b/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java index ee8bb4d6e..60925120c 100644 --- a/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java +++ b/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java @@ -27,9 +27,9 @@ import java.io.FileInputStream; import java.util.Properties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.att.nsa.mr.client.MRClientFactory; -import com.att.nsa.mr.client.MRConsumer; -import com.att.nsa.mr.client.response.MRConsumerResponse; +import org.onap.dmaap.mr.client.MRClientFactory; +import org.onap.dmaap.mr.client.MRConsumer; +import org.onap.dmaap.mr.client.response.MRConsumerResponse; public abstract class SdncDmaapConsumerImpl implements SdncDmaapConsumer { diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml index 799d499c7..c33a2ce8a 100644 --- a/northbound/features/ccsdk-asdcApi/pom.xml +++ b/northbound/features/ccsdk-asdcApi/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml index 932c55aa2..31f6010df 100644 --- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml index 4d6aec730..0f6850768 100644 --- a/northbound/features/ccsdk-dataChange/pom.xml +++ b/northbound/features/ccsdk-dataChange/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml index aef5e161a..cde3cc8f5 100644 --- a/northbound/features/ccsdk-lcm/pom.xml +++ b/northbound/features/ccsdk-lcm/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml index 75675e3bb..6302aacf4 100644 --- a/northbound/features/ccsdk-sli-northbound-all/pom.xml +++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/features-sli-northbound/pom.xml b/northbound/features/features-sli-northbound/pom.xml index 6afb797d0..77b6e2f62 100644 --- a/northbound/features/features-sli-northbound/pom.xml +++ b/northbound/features/features-sli-northbound/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml index be23e6011..f175832a1 100755 --- a/northbound/features/installer/pom.xml +++ b/northbound/features/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/pom.xml b/northbound/features/pom.xml index 69825084f..7f59f5824 100755 --- a/northbound/features/pom.xml +++ b/northbound/features/pom.xml @@ -4,8 +4,8 @@ org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + single-feature-parent + 2.1.1-SNAPSHOT diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml index 3601a3188..9b38006ae 100755 --- a/northbound/lcm/installer/pom.xml +++ b/northbound/lcm/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + lcm + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml index c86b9caff..6f2c1f2ed 100755 --- a/northbound/lcm/model/pom.xml +++ b/northbound/lcm/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/lcm/pom.xml b/northbound/lcm/pom.xml index b0898e4bd..3e9e6555c 100755 --- a/northbound/lcm/pom.xml +++ b/northbound/lcm/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + northbound-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml index 0414f8f2f..5c32d4501 100755 --- a/northbound/lcm/provider/pom.xml +++ b/northbound/lcm/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/pom.xml b/northbound/pom.xml index a67afc542..475ad22f2 100644 --- a/northbound/pom.xml +++ b/northbound/pom.xml @@ -3,13 +3,13 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli + sli-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound - ccsdk-sli-northbound + northbound-root 1.2.0-SNAPSHOT pom diff --git a/northbound/ueb-listener/pom.xml b/northbound/ueb-listener/pom.xml index cd9429704..cf6048f94 100755 --- a/northbound/ueb-listener/pom.xml +++ b/northbound/ueb-listener/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - standalone-parent - 2.1.0 + org.onap.ccsdk.sli.northbound + northbound-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound -- cgit 1.2.3-korg