summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dcae-analytics-aai/pom.xml4
-rw-r--r--dcae-analytics-cdap-common/pom.xml2
-rw-r--r--dcae-analytics-cdap-plugins/pom.xml2
-rw-r--r--dcae-analytics-cdap-tca/pom.xml2
-rw-r--r--dcae-analytics-common/pom.xml2
-rw-r--r--dcae-analytics-dmaap/pom.xml4
-rw-r--r--dcae-analytics-it/pom.xml2
-rw-r--r--dcae-analytics-model/pom.xml3
-rw-r--r--dcae-analytics-tca/pom.xml2
-rw-r--r--dcae-analytics-test/pom.xml2
-rw-r--r--pom.xml9
-rw-r--r--version.properties4
12 files changed, 24 insertions, 14 deletions
diff --git a/dcae-analytics-aai/pom.xml b/dcae-analytics-aai/pom.xml
index ce9835b..14e89ca 100644
--- a/dcae-analytics-aai/pom.xml
+++ b/dcae-analytics-aai/pom.xml
@@ -28,7 +28,7 @@
<parent>
<artifactId>dcae-analytics</artifactId>
<groupId>org.onap.dcaegen2.analytics.tca</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
@@ -85,6 +85,7 @@
<!-- JACKSON JSON -->
+ <!--
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@@ -97,6 +98,7 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
+ -->
<!-- TEST DEPENDENCIES -->
<dependency>
diff --git a/dcae-analytics-cdap-common/pom.xml b/dcae-analytics-cdap-common/pom.xml
index 8d71189..b52b736 100644
--- a/dcae-analytics-cdap-common/pom.xml
+++ b/dcae-analytics-cdap-common/pom.xml
@@ -28,7 +28,7 @@
<parent>
<artifactId>dcae-analytics</artifactId>
<groupId>org.onap.dcaegen2.analytics.tca</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
diff --git a/dcae-analytics-cdap-plugins/pom.xml b/dcae-analytics-cdap-plugins/pom.xml
index 3cbefcf..320f3cb 100644
--- a/dcae-analytics-cdap-plugins/pom.xml
+++ b/dcae-analytics-cdap-plugins/pom.xml
@@ -28,7 +28,7 @@
<parent>
<artifactId>dcae-analytics</artifactId>
<groupId>org.onap.dcaegen2.analytics.tca</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<artifactId>dcae-analytics-cdap-plugins</artifactId>
diff --git a/dcae-analytics-cdap-tca/pom.xml b/dcae-analytics-cdap-tca/pom.xml
index d437740..e580d47 100644
--- a/dcae-analytics-cdap-tca/pom.xml
+++ b/dcae-analytics-cdap-tca/pom.xml
@@ -28,7 +28,7 @@
<parent>
<artifactId>dcae-analytics</artifactId>
<groupId>org.onap.dcaegen2.analytics.tca</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<artifactId>dcae-analytics-cdap-tca</artifactId>
diff --git a/dcae-analytics-common/pom.xml b/dcae-analytics-common/pom.xml
index a01a8d6..c02ca23 100644
--- a/dcae-analytics-common/pom.xml
+++ b/dcae-analytics-common/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.dcaegen2.analytics.tca</groupId>
<artifactId>dcae-analytics</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<artifactId>dcae-analytics-common</artifactId>
diff --git a/dcae-analytics-dmaap/pom.xml b/dcae-analytics-dmaap/pom.xml
index 2319f6a..feffced 100644
--- a/dcae-analytics-dmaap/pom.xml
+++ b/dcae-analytics-dmaap/pom.xml
@@ -28,7 +28,7 @@
<parent>
<artifactId>dcae-analytics</artifactId>
<groupId>org.onap.dcaegen2.analytics.tca</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<artifactId>dcae-analytics-dmaap</artifactId>
@@ -87,6 +87,7 @@
<!-- JACKSON JSON -->
+ <!--
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@@ -99,6 +100,7 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
+ -->
<!-- TEST DEPENDENCIES -->
<dependency>
diff --git a/dcae-analytics-it/pom.xml b/dcae-analytics-it/pom.xml
index 260deca..3303a83 100644
--- a/dcae-analytics-it/pom.xml
+++ b/dcae-analytics-it/pom.xml
@@ -28,7 +28,7 @@
<parent>
<artifactId>dcae-analytics</artifactId>
<groupId>org.onap.dcaegen2.analytics.tca</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
diff --git a/dcae-analytics-model/pom.xml b/dcae-analytics-model/pom.xml
index 4747fa0..ffa8bc2 100644
--- a/dcae-analytics-model/pom.xml
+++ b/dcae-analytics-model/pom.xml
@@ -28,7 +28,7 @@
<parent>
<artifactId>dcae-analytics</artifactId>
<groupId>org.onap.dcaegen2.analytics.tca</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<artifactId>dcae-analytics-model</artifactId>
@@ -98,7 +98,6 @@
<artifactId>jackson-annotations</artifactId>
</dependency>
-
<!-- JSON PATH -->
<dependency>
<groupId>com.jayway.jsonpath</groupId>
diff --git a/dcae-analytics-tca/pom.xml b/dcae-analytics-tca/pom.xml
index 48f1142..b39d4ca 100644
--- a/dcae-analytics-tca/pom.xml
+++ b/dcae-analytics-tca/pom.xml
@@ -28,7 +28,7 @@
<parent>
<artifactId>dcae-analytics</artifactId>
<groupId>org.onap.dcaegen2.analytics.tca</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<artifactId>dcae-analytics-tca</artifactId>
diff --git a/dcae-analytics-test/pom.xml b/dcae-analytics-test/pom.xml
index 9d12324..4935f6f 100644
--- a/dcae-analytics-test/pom.xml
+++ b/dcae-analytics-test/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.dcaegen2.analytics.tca</groupId>
<artifactId>dcae-analytics</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<artifactId>dcae-analytics-test</artifactId>
diff --git a/pom.xml b/pom.xml
index b84ea15..4c22c5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<groupId>org.onap.dcaegen2.analytics.tca</groupId>
<artifactId>dcae-analytics</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>dcaegen2-analytics-tca</name>
@@ -189,6 +189,13 @@
<version>${netty.http.version}</version>
</dependency>
+ <!-- Override Cask and Hadoop default dependency versions for Nexus-IQ scan issues -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.10.6.Final</version>
+ </dependency>
+
<dependency>
<groupId>co.cask.common</groupId>
diff --git a/version.properties b/version.properties
index 7a7808c..3843d76 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=2
-minor=1
-patch=0
+minor=2
+patch=1
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT