Revert "Limit use of odlparent poms"
This reverts commit 7de29bfea89ff53a446bea07d8f74d1aaa87045b,
due to issues encountered in the odlsli container in ccsdk/distribution.
Issue-ID: CCSDK-3001
Issue-ID: CCSDK-3099
Change-Id: I79252b74693895f483eb390c575bb244195fe7ed
Signed-off-by: Dan Timoney <dtimoney@att.com>
diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml
index 4cfa8c9..59edd9f 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 f8d3eae..2c56b4a 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 8bd4828..b122488 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 bff0096..0d49dc8 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 e6a0a8d..64289dd 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 a600cdb..c7b7d1c 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 3a30086..066a840 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 b642ad1..2bede41 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 b136989..10f6f00 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 fb07249..702ad36 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 6092512..ee8bb4d 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.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 c33a2ce..eef81ba 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 31f6010..5bcb182 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 0f68507..4a62b1d 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 cde3cc8..3c24a79 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 6302aac..4fd04b1 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 f175832..1b7783b 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 7f59f58..4de0fe7 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 9b38006..d566ba8 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 3e9e655..4bbd301 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 475ad22..5491f70 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 cf6048f..e253830 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>