diff options
Diffstat (limited to 'northbound')
22 files changed, 83 insertions, 90 deletions
diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml index 4cfa8c924..59edd9f93 100755 --- a/northbound/artifacts/pom.xml +++ b/northbound/artifacts/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>northbound-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>parent</artifactId> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/asdcApi/installer/pom.xml b/northbound/asdcApi/installer/pom.xml index f8d3eae14..2c56b4abe 100755 --- a/northbound/asdcApi/installer/pom.xml +++ b/northbound/asdcApi/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>asdcApi</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml index 8bd482873..b12248893 100755 --- a/northbound/asdcApi/pom.xml +++ b/northbound/asdcApi/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>northbound-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/daexim-offsite-backup/installer/pom.xml b/northbound/daexim-offsite-backup/installer/pom.xml index bff0096d6..0d49dc8d3 100755 --- a/northbound/daexim-offsite-backup/installer/pom.xml +++ b/northbound/daexim-offsite-backup/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>daexim-offsite-backup</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/daexim-offsite-backup/pom.xml b/northbound/daexim-offsite-backup/pom.xml index e6a0a8db6..64289dd92 100755 --- a/northbound/daexim-offsite-backup/pom.xml +++ b/northbound/daexim-offsite-backup/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>northbound-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/daexim-offsite-backup/provider/pom.xml b/northbound/daexim-offsite-backup/provider/pom.xml index a600cdbaa..c7b7d1c86 100755 --- a/northbound/daexim-offsite-backup/provider/pom.xml +++ b/northbound/daexim-offsite-backup/provider/pom.xml @@ -54,12 +54,12 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> - <version>${project.version}</version> + <version>${ccsdk.sli.core.version}</version> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> - <version>${project.version}</version> + <version>${ccsdk.sli.core.version}</version> </dependency> <dependency> <groupId>com.google.code.findbugs</groupId> diff --git a/northbound/dataChange/installer/pom.xml b/northbound/dataChange/installer/pom.xml index 3a30086f6..066a840b7 100755 --- a/northbound/dataChange/installer/pom.xml +++ b/northbound/dataChange/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>dataChange</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/dataChange/pom.xml b/northbound/dataChange/pom.xml index b642ad185..2bede417e 100755 --- a/northbound/dataChange/pom.xml +++ b/northbound/dataChange/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>northbound-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml index b1369895b..10f6f001a 100755 --- a/northbound/dataChange/provider/pom.xml +++ b/northbound/dataChange/provider/pom.xml @@ -6,7 +6,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.1.1-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> @@ -17,15 +17,15 @@ <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-core-artifacts</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> </dependencyManagement> <dependencies> <dependency> diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml index fb0724989..702ad369e 100755 --- a/northbound/dmaap-listener/pom.xml +++ b/northbound/dmaap-listener/pom.xml @@ -23,8 +23,6 @@ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <build.number>${maven.build.timestamp}</build.number> <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION> - <!-- dmaap client requires an older jersey version --> - <jersey.version>2.22.1</jersey.version> </properties> @@ -51,7 +49,6 @@ <dependency> <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> <artifactId>dmaapClient</artifactId> - <version>1.1.12</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -73,28 +70,10 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> </dependency> - - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-common</artifactId> - <version>${jersey.version}</version> - </dependency> - - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - <version>${jersey.version}</version> - </dependency> - - <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-json-jackson</artifactId> - <version>${jersey.version}</version> - </dependency> <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity-engine-core</artifactId> - </dependency> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> 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 60925120c..ee8bb4d6e 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 org.onap.dmaap.mr.client.MRClientFactory; -import org.onap.dmaap.mr.client.MRConsumer; -import org.onap.dmaap.mr.client.response.MRConsumerResponse; +import com.att.nsa.mr.client.MRClientFactory; +import com.att.nsa.mr.client.MRConsumer; +import com.att.nsa.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 c33a2ce8a..eef81ba51 100644 --- a/northbound/features/ccsdk-asdcApi/pom.xml +++ b/northbound/features/ccsdk-asdcApi/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml index 31f6010df..5bcb1822f 100644 --- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml index 0f6850768..4a62b1d2e 100644 --- a/northbound/features/ccsdk-dataChange/pom.xml +++ b/northbound/features/ccsdk-dataChange/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml index cde3cc8f5..3c24a7922 100644 --- a/northbound/features/ccsdk-lcm/pom.xml +++ b/northbound/features/ccsdk-lcm/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml index 6302aacf4..4fd04b113 100644 --- a/northbound/features/ccsdk-sli-northbound-all/pom.xml +++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml index f175832a1..1b7783b2a 100755 --- a/northbound/features/installer/pom.xml +++ b/northbound/features/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/features/pom.xml b/northbound/features/pom.xml index 7f59f5824..4de0fe76a 100755 --- a/northbound/features/pom.xml +++ b/northbound/features/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> + <artifactId>odlparent-lite</artifactId> <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml index 9b38006ae..d566ba8ed 100755 --- a/northbound/lcm/installer/pom.xml +++ b/northbound/lcm/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>lcm</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/lcm/pom.xml b/northbound/lcm/pom.xml index 3e9e6555c..4bbd301e9 100755 --- a/northbound/lcm/pom.xml +++ b/northbound/lcm/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>northbound-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/pom.xml b/northbound/pom.xml index 475ad22f2..5491f7043 100644 --- a/northbound/pom.xml +++ b/northbound/pom.xml @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli</groupId> - <artifactId>sli-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>northbound-root</artifactId> + <artifactId>ccsdk-sli-northbound</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> diff --git a/northbound/ueb-listener/pom.xml b/northbound/ueb-listener/pom.xml index cf6048f94..e253830c8 100755 --- a/northbound/ueb-listener/pom.xml +++ b/northbound/ueb-listener/pom.xml @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>northbound-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>standalone-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> |