From c44d1531417745535c0ebd8962359686d4a598cf Mon Sep 17 00:00:00 2001
From: mohan <mohan.vive@gmail.com>
Date: Sat, 13 Apr 2019 02:10:09 +0530
Subject: [PATCH] Update analytics dependencies and related license file update

---
 modules/distribution/carbon-home/LICENSE.txt | 84 ++++++++++----------
 pom.xml                                      | 11 +--
 2 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/modules/distribution/carbon-home/LICENSE.txt b/modules/distribution/carbon-home/LICENSE.txt
index 8bf3889df..7dda991cf 100644
--- a/modules/distribution/carbon-home/LICENSE.txt
+++ b/modules/distribution/carbon-home/LICENSE.txt
@@ -69,15 +69,15 @@ javax.websocket-api_1.1.0.jar
 javax.ws.rs-api_2.0.0.jar                                                       bundle         cddl+gpl  1538
 jaxb-api-2.2.12.jar                                                             bundle         cddl1     2892
 jaxb-impl-2.2.2.jar                                                             jar            cddl1     2891
-jaxrs-delegates_2.7.2.jar                                                       bundle         apache2   3583
+jaxrs-delegates_2.7.3.jar                                                       bundle         apache2   3583
 jdbc-pool-7.0.81.wso2v2.jar                                                     bundle         apache2   16075
 json-simple-1.1.jar                                                             jar            apache2   634
 json_3.0.0.wso2v1.jar                                                           bundle         apache2   6503
 libthrift_0.9.2.wso2v1.jar                                                      bundle         apache2   5912
 log4j-1.2.17.jar                                                                bundle         apache2   802
-msf4j-analytics_2.7.2.jar                                                       bundle         apache2   3570
-msf4j-core_2.7.2.jar                                                            bundle         apache2   3576
-msf4j-swagger_2.7.2.jar                                                         bundle         apache2   3575
+msf4j-analytics_2.7.3.jar                                                       bundle         apache2   3570
+msf4j-core_2.7.3.jar                                                            bundle         apache2   3576
+msf4j-swagger_2.7.3.jar                                                         bundle         apache2   3575
 okhttp_3.8.0.wso2v2.jar                                                         bundle         apache2   14643
 okio_1.13.0.wso2v1.jar                                                          bundle         apache2   14642
 org.antlr.antlr4-runtime-osgi_4.5.1.1.jar                                       bundle         asm       2515
@@ -122,13 +122,13 @@ org.hdrhistogram.HdrHistogram_2.1.10.jar
 org.ops4j.pax.logging.pax-logging-api_1.10.0.jar                                bundle         apache2   2209
 org.ops4j.pax.logging.pax-logging-log4j2_1.10.0.jar                             bundle         apache2   2208
 org.osgi.core-6.0.0.jar                                                         bundle         apache2   1407
-org.wso2.analytics.apim.rest.api.file_1.0.40.jar                                bundle         apache2   19003
-org.wso2.carbon.analytics.auth.rest.api_2.1.0.jar                               bundle         apache2   18990
-org.wso2.carbon.analytics.idp.client_6.1.15.jar                                 bundle         apache2   19004
-org.wso2.carbon.analytics.msf4j.interceptor.common_2.1.0.jar                    bundle         apache2   18986
-org.wso2.carbon.analytics.permissions_6.1.15.jar                                bundle         apache2   18978
-org.wso2.carbon.business.rules.core_2.1.0.jar                                   bundle         apache2   18996
-org.wso2.carbon.business.rules.templates.editor.core_2.1.0.jar                  bundle         apache2   19010
+org.wso2.analytics.apim.rest.api.file_1.0.41.jar                                bundle         apache2   19003
+org.wso2.carbon.analytics.auth.rest.api_2.1.1.jar                               bundle         apache2   18990
+org.wso2.carbon.analytics.idp.client_6.1.17.jar                                 bundle         apache2   19004
+org.wso2.carbon.analytics.msf4j.interceptor.common_2.1.1.jar                    bundle         apache2   18986
+org.wso2.carbon.analytics.permissions_6.1.17.jar                                bundle         apache2   18978
+org.wso2.carbon.business.rules.core_2.1.1.jar                                   bundle         apache2   18996
+org.wso2.carbon.business.rules.templates.editor.core_2.1.1.jar                  bundle         apache2   19010
 org.wso2.carbon.caching_1.1.3.jar                                               bundle         apache2   14020
 org.wso2.carbon.cluster.coordinator.commons_2.1.1.jar                           bundle         apache2   19007
 org.wso2.carbon.cluster.coordinator.rdbms_2.1.1.jar                             bundle         apache2   18983
@@ -139,23 +139,23 @@ org.wso2.carbon.core_5.2.8.jar
 org.wso2.carbon.dashboards.api_4.0.62.jar                                       bundle         apache2   18997
 org.wso2.carbon.dashboards.core_4.0.62.jar                                      bundle         apache2   19013
 org.wso2.carbon.dashboards.siddhi.apps.api_4.0.62.jar                           bundle         apache2   19014
-org.wso2.carbon.data.provider_2.1.0.jar                                         bundle         apache2   19002
-org.wso2.carbon.database.query.manager_6.1.15.jar                               bundle         apache2   18992
-org.wso2.carbon.databridge.agent_6.1.15.jar                                     bundle         apache2   18977
-org.wso2.carbon.databridge.commons.binary_6.1.15.jar                            bundle         apache2   19023
-org.wso2.carbon.databridge.commons.thrift_6.1.15.jar                            bundle         apache2   18993
-org.wso2.carbon.databridge.commons_6.1.15.jar                                   bundle         apache2   19019
-org.wso2.carbon.databridge.core_6.1.15.jar                                      bundle         apache2   19000
-org.wso2.carbon.databridge.receiver.binary_6.1.15.jar                           bundle         apache2   19008
-org.wso2.carbon.databridge.receiver.thrift_6.1.15.jar                           bundle         apache2   18984
+org.wso2.carbon.data.provider_2.1.1.jar                                         bundle         apache2   19002
+org.wso2.carbon.database.query.manager_6.1.17.jar                               bundle         apache2   18992
+org.wso2.carbon.databridge.agent_6.1.17.jar                                     bundle         apache2   18977
+org.wso2.carbon.databridge.commons.binary_6.1.17.jar                            bundle         apache2   19023
+org.wso2.carbon.databridge.commons.thrift_6.1.17.jar                            bundle         apache2   18993
+org.wso2.carbon.databridge.commons_6.1.17.jar                                   bundle         apache2   19019
+org.wso2.carbon.databridge.core_6.1.17.jar                                      bundle         apache2   19000
+org.wso2.carbon.databridge.receiver.binary_6.1.17.jar                           bundle         apache2   19008
+org.wso2.carbon.databridge.receiver.thrift_6.1.17.jar                           bundle         apache2   18984
 org.wso2.carbon.datasource.core-1.0.2.jar                                       bundle         apache2   16073
 org.wso2.carbon.datasource.core_1.1.4.jar                                       bundle         apache2   14014
 org.wso2.carbon.deployment.engine_5.2.0.jar                                     bundle         apache2   14797
 org.wso2.carbon.deployment.notifier_5.2.0.jar                                   bundle         apache2   14796
-org.wso2.carbon.editor.log.appender_2.1.0.jar                                   bundle         apache2   19006
-org.wso2.carbon.event.simulator.core_2.1.0.jar                                  bundle         apache2   19021
+org.wso2.carbon.editor.log.appender_2.1.1.jar                                   bundle         apache2   19006
+org.wso2.carbon.event.simulator.core_2.1.1.jar                                  bundle         apache2   19021
 org.wso2.carbon.extensions.touchpoint_1.1.1.jar                                 bundle         apache2   14616
-org.wso2.carbon.health.check.core_2.1.0.jar                                     bundle         apache2   18981
+org.wso2.carbon.health.check.core_2.1.1.jar                                     bundle         apache2   18981
 org.wso2.carbon.jndi-1.0.0-alpha.jar                                            bundle         apache2   16072
 org.wso2.carbon.jndi_1.0.5.jar                                                  bundle         apache2   14012
 org.wso2.carbon.launcher-5.2.8.jar                                              bundle         apache2   18121
@@ -165,7 +165,7 @@ org.wso2.carbon.metrics.das.core_2.3.8.jar
 org.wso2.carbon.metrics.das.reporter_2.3.8.jar                                  bundle         apache2   19005
 org.wso2.carbon.metrics.jdbc.core_2.3.8.jar                                     bundle         apache2   19009
 org.wso2.carbon.metrics.jdbc.reporter_2.3.8.jar                                 bundle         apache2   19011
-org.wso2.carbon.permissions.rest.api_2.1.0.jar                                  bundle         apache2   19020
+org.wso2.carbon.permissions.rest.api_2.1.1.jar                                  bundle         apache2   19020
 org.wso2.carbon.privacy.forgetme.analytics.streams-1.1.21.jar                   bundle         apache2   17914
 org.wso2.carbon.privacy.forgetme.api-1.1.21.jar                                 bundle         apache2   17913
 org.wso2.carbon.privacy.forgetme.logs-1.1.21.jar                                bundle         apache2   17912
@@ -173,22 +173,22 @@ org.wso2.carbon.privacy.forgetme.sql-1.1.21.jar
 org.wso2.carbon.privacy.forgetme.tool-1.1.21.jar                                bundle         apache2   17910
 org.wso2.carbon.secvault.ciphertool.5.0.13.jar                                  bundle         apache2   19024
 org.wso2.carbon.secvault_5.0.13.jar                                             bundle         apache2   18995
-org.wso2.carbon.siddhi.editor.core_2.1.0.jar                                    bundle         apache2   19001
-org.wso2.carbon.siddhi.store.api.rest_2.1.0.jar                                 bundle         apache2   18989
-org.wso2.carbon.sp.coordination.listener_2.1.0.jar                              bundle         apache2   18999
-org.wso2.carbon.sp.distributed.resource.core_2.1.0.jar                          bundle         apache2   18998
-org.wso2.carbon.sp.jobmanager.core_2.1.0.jar                                    bundle         apache2   19016
-org.wso2.carbon.sp.metrics.core_2.1.0.jar                                       bundle         apache2   18980
-org.wso2.carbon.status.dashboard.core_2.1.0.jar                                 bundle         apache2   18988
-org.wso2.carbon.stream.processor.common_2.1.0.jar                               bundle         apache2   19018
-org.wso2.carbon.stream.processor.core_2.1.0.jar                                 bundle         apache2   19022
-org.wso2.carbon.stream.processor.statistics_2.1.0.jar                           bundle         apache2   19017
+org.wso2.carbon.siddhi.editor.core_2.1.1.jar                                    bundle         apache2   19001
+org.wso2.carbon.siddhi.store.api.rest_2.1.1.jar                                 bundle         apache2   18989
+org.wso2.carbon.sp.coordination.listener_2.1.1.jar                              bundle         apache2   18999
+org.wso2.carbon.sp.distributed.resource.core_2.1.1.jar                          bundle         apache2   18998
+org.wso2.carbon.sp.jobmanager.core_2.1.1.jar                                    bundle         apache2   19016
+org.wso2.carbon.sp.metrics.core_2.1.1.jar                                       bundle         apache2   18980
+org.wso2.carbon.status.dashboard.core_2.1.1.jar                                 bundle         apache2   18988
+org.wso2.carbon.stream.processor.common_2.1.1.jar                               bundle         apache2   19018
+org.wso2.carbon.stream.processor.core_2.1.1.jar                                 bundle         apache2   19022
+org.wso2.carbon.stream.processor.statistics_2.1.1.jar                           bundle         apache2   19017
 org.wso2.carbon.tools.core-5.2.8.jar                                            bundle         apache2   18122
 org.wso2.carbon.uiserver_1.0.2.jar                                              bundle         apache2   18985
 org.wso2.carbon.utils_2.0.8.jar                                                 bundle         apache2   18126
-org.wso2.sp.extension.siddhi.io.mgwfile_1.0.40.jar                              bundle         apache2   19012
-org.wso2.sp.open.tracer.client-1.0.40.jar                                       bundle         apache2   18976
-org.wso2.transport.http.netty_6.0.272.jar                                       bundle         apache2   18994
+org.wso2.sp.extension.siddhi.io.mgwfile_1.0.41.jar                              bundle         apache2   19012
+org.wso2.sp.open.tracer.client-1.0.41.jar                                       bundle         apache2   18976
+org.wso2.transport.http.netty_6.0.289.jar                                       bundle         apache2   18994
 org.yaml.snakeyaml_1.19.0.jar                                                   bundle         apache2   2503
 org.yaml.snakeyaml_1.23.0.jar                                                   bundle         apache2   3590
 quartz_2.1.1.wso2v1.jar                                                         bundle         apache2   975
@@ -197,11 +197,11 @@ Saxon-HE_9.7.0.wso2v1.jar
 siddhi-annotations_4.5.4.jar                                                    bundle         apache2   3574
 siddhi-core_4.5.4.jar                                                           bundle         apache2   3589
 siddhi-execution-approximate-1.1.1.jar                                          bundle         apache2   3623
-siddhi-execution-country-1.0.40.jar                                             bundle         apache2   3602
+siddhi-execution-country-1.0.41.jar                                             bundle         apache2   3602
 siddhi-execution-env-1.1.0.jar                                                  bundle         apache2   3622
-siddhi-execution-esbanalytics-1.0.40.jar                                        bundle         apache2   3641
+siddhi-execution-esbanalytics-1.0.41.jar                                        bundle         apache2   3641
 siddhi-execution-extrema-4.1.1.jar                                              bundle         apache2   3615
-siddhi-execution-filterwords-1.0.40.jar                                         bundle         apache2   3640
+siddhi-execution-filterwords-1.0.41.jar                                         bundle         apache2   3640
 siddhi-execution-geo-4.1.1.jar                                                  bundle         apache2   3603
 siddhi-execution-graph-1.1.1.jar                                                bundle         apache2   3632
 siddhi-execution-json-1.1.1.jar                                                 bundle         apache2   3599
@@ -219,10 +219,10 @@ siddhi-execution-string-4.1.0.jar
 siddhi-execution-tensorflow-1.1.1.jar                                           bundle         apache2   3624
 siddhi-execution-time-4.1.1.jar                                                 bundle         apache2   3629
 siddhi-execution-timeseries-4.1.2.jar                                           bundle         apache2   3612
-siddhi-execution-tokenizer-1.0.40.jar                                           bundle         apache2   3613
+siddhi-execution-tokenizer-1.0.41.jar                                           bundle         apache2   3613
 siddhi-execution-unique-4.1.1.jar                                               bundle         apache2   3620
 siddhi-execution-unitconversion-1.1.1.jar                                       bundle         apache2   3605
-siddhi-execution-word-1.0.40.jar                                                bundle         apache2   3606
+siddhi-execution-word-1.0.41.jar                                                bundle         apache2   3606
 siddhi-io-cdc-1.0.9.jar                                                         bundle         apache2   3596
 siddhi-io-email-1.1.0.jar                                                       bundle         apache2   3625
 siddhi-io-file-1.1.0.jar                                                        bundle         apache2   3594
diff --git a/pom.xml b/pom.xml
index a183ce5a3..73d946aee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1324,11 +1324,11 @@
     </build>
     <properties>
 
-        <carbon.analytics.version>2.1.0</carbon.analytics.version>
+        <carbon.analytics.version>2.1.1</carbon.analytics.version>
         <siddhi.version>4.5.4</siddhi.version>
 
-        <carbon.analytics-common.version>6.1.15</carbon.analytics-common.version>
-        <analytics.solutions.version>1.0.40</analytics.solutions.version>
+        <carbon.analytics-common.version>6.1.17</carbon.analytics-common.version>
+        <analytics.solutions.version>1.0.41</analytics.solutions.version>
         <!-- Maven plugins -->
         <!--Bundle Plugin - Overridden from parent due to a bug in latest version related to capability providers-->
         <maven.bundle.plugin.version>2.5.4</maven.bundle.plugin.version>
@@ -1419,7 +1419,7 @@
         <common.collections4.version>4.0</common.collections4.version>
 
         <!--MSF4J related-->
-        <msf4j.version>2.7.2</msf4j.version>
+        <msf4j.version>2.7.3</msf4j.version>
         <com.fasterxml.jackson.core.version>2.8.9</com.fasterxml.jackson.core.version>
         <io.swagger.version>1.5.22</io.swagger.version>
         <javax.ws.rs-api.version>2.0</javax.ws.rs-api.version>
@@ -1471,6 +1471,7 @@
         <siddhi.io.mqtt.version>1.1.1</siddhi.io.mqtt.version>
         <siddhi.io.kafka.version>4.2.1</siddhi.io.kafka.version>
         <siddhi.io.wso2event.version>4.1.1</siddhi.io.wso2event.version>
+        <siddhi.io.wso2event.version>4.1.1</siddhi.io.wso2event.version>
         <siddhi.io.http.version>1.1.6</siddhi.io.http.version>
         <siddhi.io.twitter.version>1.1.0</siddhi.io.twitter.version>
         <siddhi.io.sqs.version>1.1.0</siddhi.io.sqs.version>
@@ -1515,7 +1516,7 @@
         <org.snakeyaml.version>1.17</org.snakeyaml.version>
         <mysql.con.version>6.0.5</mysql.con.version>
         <googlecode.json-simple.version>1.1.wso2v1</googlecode.json-simple.version>
-        <io.netty.version>4.1.16.Final</io.netty.version>
+        <io.netty.version>4.1.19.Final</io.netty.version>
         <log4j.version>1.2.17</log4j.version>
         <commons-codec.wso2.version>1.3.0.wso2v1</commons-codec.wso2.version>