From 80ecba8528f650dcbcc4b6a8151459ce336b6e45 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 1 Jun 2017 10:47:59 +0530 Subject: [PATCH] migrated new kernel and mb version --- .../src/analytics/conf/log4j.properties | 3 + .../src/assembly/filter.properties | 2 +- .../distribution/src/broker/conf/broker.xml | 1107 +++++++++-------- .../src/broker/conf/log4j.properties | 3 + .../identity-providers/iot_default.xml | 4 +- .../keystores/products/client-truststore.jks | Bin 103867 -> 101446 bytes .../keystores/products/wso2carbon.jks | Bin 35863 -> 33498 bytes .../keystores/stratos/client-truststore.jks | Bin 103867 -> 101446 bytes .../keystores/stratos/wso2carbon.jks | Bin 35863 -> 33498 bytes .../analytics-profile/carbon.product | 2 +- .../p2-profile/broker-profile/carbon.product | 2 +- .../iot-core-profile/carbon.product | 2 +- modules/p2-profile/iot-core-profile/pom.xml | 19 + pom.xml | 10 +- 14 files changed, 595 insertions(+), 559 deletions(-) diff --git a/modules/distribution/src/analytics/conf/log4j.properties b/modules/distribution/src/analytics/conf/log4j.properties index a7ba02bc..8424bc6e 100644 --- a/modules/distribution/src/analytics/conf/log4j.properties +++ b/modules/distribution/src/analytics/conf/log4j.properties @@ -86,6 +86,9 @@ log4j.logger.org.spark-project=WARN log4j.logger.akka=WARN log4j.logger.org.apache.spark.util.ClosureCleaner=ERROR +# uncomment the following logs to see http calls headers and messages +#log4j.logger.feign=DEBUG + log4j.additivity.org.apache.axis2.clustering=false log4j.additivity.com.atomikos=false log4j.additivity.org.apache=false diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties index aeefa12d..e27e6d46 100644 --- a/modules/distribution/src/assembly/filter.properties +++ b/modules/distribution/src/assembly/filter.properties @@ -21,7 +21,7 @@ product.key=IoT product.version=3.1.0-SNAPSHOT product.doc.version=310 -carbon.version=4.4.14 +carbon.version=4.4.16 default.server.role=IoTServer cep.server.role=ComplexEventProcessor das.server.role=DataAnalyticsServer diff --git a/modules/distribution/src/broker/conf/broker.xml b/modules/distribution/src/broker/conf/broker.xml index 9e525b7b..b7be838a 100755 --- a/modules/distribution/src/broker/conf/broker.xml +++ b/modules/distribution/src/broker/conf/broker.xml @@ -27,560 +27,573 @@ expression of the property. This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/cipher-text.properties for examples.--> - - - default - - localhost - 7611 - 0 - - 5 - - 10 - - - - - 5000 - - - 3000 - - - 4000 - - - - - - - 1000 - - - - - - - - 0.0.0.0 - - - - - - repository/resources/security/wso2carbon.jks - wso2carbon - SunX509 - - - repository/resources/security/client-truststore.jks - wso2carbon - SunX509 - - - - 10 - false - true - - - - - 0.0.0.0 - - - - - - repository/resources/security/wso2carbon.jks - wso2carbon - SunX509 - - - repository/resources/security/client-truststore.jks - wso2carbon - SunX509 - - - - - 32768 - - - 32768 - - - - - REQUIRED - - - - https://localhost:9443/services/OAuth2TokenValidationService - admin - admin - 10 - 150 - - - - REQUIRED - - - - - - - /permission/device-mgt/user/groups/device_events - - /permission/device-mgt/user/groups/device_operation - - admin - admin - https://localhost:8243 - - 100 - https://localhost:8243 - - - - - - - + default + + localhost + 7611 + 0 + + 5 + + 10 + + + + + 5000 + + + 3000 + + + 4000 + + + + + + + 1000 + + + + + + + + 0.0.0.0 + + + + + + repository/resources/security/wso2carbon.jks + wso2carbon + SunX509 + + + repository/resources/security/client-truststore.jks + wso2carbon + SunX509 + + + + 10 + false + true + + + + + 0.0.0.0 + + + + + + repository/resources/security/wso2carbon.jks + wso2carbon + SunX509 + + + repository/resources/security/client-truststore.jks + wso2carbon + SunX509 + + + + + 32768 + + + 32768 + + + + + REQUIRED + + + + https://localhost:9443/services/OAuth2TokenValidationService + admin + admin + 10 + 150 + + + + REQUIRED + + + + + + + /permission/device-mgt/user/groups/device_events + + /permission/device-mgt/user/groups/device_operation + + admin + admin + https://localhost:8243 + + 100 + https://localhost:8243 + + + + + + + - - - - - - - - WSO2MBStoreDB - 08 - 23,27,44 - 21,22 - 40 - - - - WSO2MBStoreDB - 08 - 23,27,44 - 21,22 - 40 - - - - - 256 - - 4 - - 2 - - - strong - - - false - - - - org.wso2.andes.server.cluster.coordination.TimeStampBasedMessageIdGenerator - - - 10 - - - - - - - 10000000 - - - - - - - - 2000 - - - 1000 - - - 1000 - - - 5 - - - - - - 1000 - - - 4096 - - - 5 - - - 5 - - - 5 - - - 65000 - - - - 100 - - 120 - - - - - DISCARD_NONE - - 60 - - - - - - 1 - - - 100 - - - 1000 - - - - - - 3 - - - 65500 - - - false - - - 1000 - - - - - - 1 - - - 65536 - - - 70 - - - 180 - - - 1 - - - - - - 10 - - - 900 - - - 3 - - - - - - - - 100 - - - 100000 - - - false - - - + + 1. For message persistence ("messageStore") + 2. To persist and access other information relevant to messaging protocols.("contextStore").--> + + + + + + + + WSO2MBStoreDB + 08 + 23,27,44 + 21,22 + 40 + + + + WSO2MBStoreDB + 08 + 23,27,44 + 21,22 + 40 + + + + + 256 + + 4 + + 2 + + + strong + + + false + + + + org.wso2.andes.server.cluster.coordination.TimeStampBasedMessageIdGenerator + + + 10 + + + + + + + 10240 + + + 20 + + + + + + + + + 1000 + + + 2000 + + + 1000 + + + 5 + + + 5 + + + 1000 + + + 10 + + + + + + 1000 + + + 4096 + + + 5 + + + 5 + + + 5 + + + 65000 + + + + 100 + + 120 + + + + + DISCARD_NONE + + 60 + + + + + + 1 + + + 100 + + + 1000 + + + + + + 3 + + + 65500 + + + false + + + 1000 + + + + + + 1 + + + 65536 + + + 70 + + + 180 + + + 1 + + + + + + 10 + + + 900 + + + 3 + + + + + + + + 100 + + + 100000 + + + false + + + - - - - 800 - 8000 - - - + + + + 800 + 8000 + + + - - 100 - 1000 - - - - - - RDBMS - - - - - - 5 - - - 900 - - - - - - 1 - - - - - - - default - + the internal state to previous state. + --> + + + 5 + + + 900 + + + + + + 1 + + + + + + + default + diff --git a/modules/distribution/src/broker/conf/log4j.properties b/modules/distribution/src/broker/conf/log4j.properties index f078312c..2b24d892 100644 --- a/modules/distribution/src/broker/conf/log4j.properties +++ b/modules/distribution/src/broker/conf/log4j.properties @@ -144,6 +144,9 @@ log4j.appender.CARBON_MEMORY.layout.TenantPattern=%U%@%D [%T] [%S] log4j.appender.CARBON_MEMORY.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace log4j.appender.CARBON_MEMORY.threshold=DEBUG +# uncomment the following logs to see http calls headers and messages +#log4j.logger.feign=DEBUG + # CARBON_LOGFILE is set to be a DailyRollingFileAppender using a PatternLayout. log4j.appender.CARBON_LOGFILE=org.apache.log4j.DailyRollingFileAppender # Log file will be overridden by the configuration setting in the DB diff --git a/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml b/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml index 9ef53ce1..3fb420bd 100644 --- a/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml +++ b/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml @@ -36,9 +36,7 @@ - -MIICNTCCAZ6gAwIBAgIES343gjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcxDTALBgNVBAoMBFdTTzIxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0xMDAyMTkwNzAyMjZaFw0zNTAyMTMwNzAyMjZaMFUxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzENMAsGA1UECgwEV1NPMjESMBAGA1UEAwwJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCUp/oV1vWc8/TkQSiAvTousMzOM4asB2iltr2QKozni5aVFu818MpOLZIr8LMnTzWllJvvaA5RAAdpbECb+48FjbBe0hseUdN5HpwvnH/DW8ZccGvk53I6Orq7hLCv1ZHtuOCokghz/ATrhyPq+QktMfXnRS4HrKGJTzxaCcU7OQIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCBPAwDQYJKoZIhvcNAQEFBQADgYEAW5wPR7cr1LAdq+IrR44iQlRG5ITCZXY9hI0PygLP2rHANh+PYfTmxbuOnykNGyhM6FjFLbW2uZHQTY1jMrPprjOrmyK5sjJRO4d1DeGHT/YnIjs9JogRKv4XHECwLtIVdAbIdWHEtVZJyMSktcyysFcvuhPQK8Qc/E/Wq8uHSCo= - + MIIDSTCCAjGgAwIBAgIERUubMzANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxDTALBgNVBAoTBFdTTzIxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNzAzMjEwOTEzMDdaFw0xNzA2MTkwOTEzMDdaMFUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzENMAsGA1UEChMEV1NPMjESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu8lfLCQV2hbiz8OGA8baKI1E1cgE/QLKefa4Od2G2KextaAwSESr5ICakVX8w6tU5+IhKYQQKt9U3/U0ae9tXf04g6iWh0dRllsr9mOgjSZxQK09/ygUsFH8syL5aD3heRUYzJWZ/KOsd57BXuI2QZnuEjN0g0+5jNvnswfwD/tM01totaJpI3xN+2JZsaBRCc0G5yA/pdW83Aa4IE30EL57wkK7u8YDl3UTcmi+HO74XQmK1VEqSnA+/mFo3M16cRlm2PTZ2Z1E5gd4j+5sV1P5v63uqyFniEU0zPXforBb06pgSBoIRQBintSSDyEmyuVzW0pc2eYC5Dhfgk337QIDAQABoyEwHzAdBgNVHQ4EFgQU4lneZCvKn04NH5DtJItdRXdXankwDQYJKoZIhvcNAQELBQADggEBAEnCNr0JEcAxtF/ypwGgFu1rYOv3i02PB4jDWbFj8s58l1zF1tMr480khVX4d3AmLjsUpvV+Jg83JFIk1rJFLEb48EFv0nJ/G7pTQrCypNKozyuyLzx5UvKNFBMmnGvkHVqt6j4MSiOjnRdlo7ofDluA/umSkSf/VmsOIZ+5610pCJpahnPUkb8GYK0HcwNV2NLU/0X4nSjKjGwWYv0tX8XW8RwJKb/r0GDehA8PESi76XOVrpXSjP9WPK8XaK//8B0SH3hm0xpzmSQYgtkNQwP2MqBe/ZEUuKxrn3pP6oxo9RxeSIQ8dTLiBA/mcsBmAlpQPPi0LqqDKpkyHt8Ar2w= \ No newline at end of file diff --git a/modules/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks index ab222fdd343e6a44d2c1c0b82fbc7e2538509618..c477431cbee1aa8d78f20cbad10b1e8b86fbbe55 100644 GIT binary patch delta 1598 zcmbu-Yc!N;00;1SFEi7WnZb-pA=g}HGTxa92^%#c8FrHUozz&CGOXB6BU$VsQCJa5 z#fA)T8kenX;*?9tZPQIj6o*u9<+fvWcH7R`Pknek{Gaoj^FPo3{OU__&A;NL7RMIH zFc=IdIX;zAu0&heC_xx2z%SfCER+!zvNs?wJOYCOJYC*$k}z0Th9P1id2NEkfrdyN zkY5Oa00_dnju^)wL>z&ZV3ROI1OO}+gE*bERFn6U0=HW-%Joj=y`LPk)Q!Eig&}IY%T6f6^DkVzc7m2NoSc;@ z|Hg2l#a=&yK7r~u7+yG)`-V^AVemmA7P)h2*i?~sr_y>}SM>TkgFIoQN3-XF;KAYW zEnDj9<3$xc>0>p|N-|an=Hbyq&5;iTedg4#6$4*(_Gbq(cS4h?&;*143{WIl0U=3t zP$2`r5)4BiJn_Y}(9xq9k36!qnBFZ?DIK6&AJ^EnXUAat&A=bb<5S5k;Jt^H4MwVI zev?B@^~VeJh)TM4uUwn-tFP9kcW_e!Sm^7^?9yC~+A0>$G%=F+JkeoVM}uK%uAL-9 zTU1cC5HULCB5=1O{ccq|@4S8Me05uu$i<+J(m}taJnzt3+L~xXL+vQDSadIO42yEs z&XCZ7jkPdps#^@Bxy%ea2gI!Y7t#u#=->VU1aXl#Xr}}b^AjMeUAgSff4SxpAVr_g z_)z|b59PmnC|~d~M%XMSVzO*T!iQ;$7)dm(#J~9{ntxTt$+L~>!umTt8@1#f$`9OY zOn{mn>ZWpfZo>;;OZ0S&$&-W!#g)~Chz+N7F!pr1(|lv;p5Xy?y?AL_|DOJ-O+jzI z_gdI|tRySZnwRB4pAINY)jnuZZoZ^T74ha#jSqbD=h1SCZJ9aqMP*U>e|QfVS>}w( zvLlW;)TTTdM)4D5;hbHU2fzAUkmh0ToWEOTA&=0G8&=zTq38Fux5pe@yYIndU*8$d5dKiwc!-PRha2VNrRw{W ztTwex^`8@YbY1ebS+~jxsTZe?Xp@b#c5C%kS#8`gJ7F2t87@?+bKEAX zI^S7xk6vY97QOpjDwU$07d)uqUOw`Tl&xmb8HK>2I#rTK?BeT;be$#VV3K-4?WmVf zZ`En{1VMND4V-T|UH~~g=WIEI;>{vi z12B0gykQ^c{;k>U6~?7wv>ev@ehgRDUtkTR_A!61 zMUQ9oLFk54K_I&Sw50)>)!qW3C3nUl)c5`?659SE1w482F$r~k76qYhL*bg@J~FTi z61Nfn5>Bi|0Um+kk4k_oBwmyQ=CI-*O@IZ8IjX=0Se&~7aEHbB*?>JPZZH63VDXe5 x(25naEPy~*JYoviz+%s_Xmc(1}=n!evLJLu&Ygj4Upc{1>(oWU>GN delta 4135 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 diff --git a/modules/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks index 79784a5e4d152d54f54d75e7fd8db4b58902f140..11686670c43a58e1850e7461f1da67cb524df384 100644 GIT binary patch delta 2522 zcmZ{mc{J2-8^&j2Of_WR_uYgUTP91E#=Z^4GL~d1hLBN~{F=$ug2-e`meQgcF@2GY zhKlMZR76OWENKWKl;y2&|GnpZ|9H;xxvz8G*K^MEob#N!s2Db!0n^-?+nR$wAh6#{ z1>6O~qT}O^Q{zLTB7RfIAqWIYUNC?+0Yxxz9-iNbv;qL63YP|=xyKzLx-RKymR zpLYj_7m9#t!33dD9ta{8@ioK6r&>cg3Ck-aF>*EH5x~ho&x&fRyVfxoJ?Tn`R*BSr zn>UrEx{GfY2<|ww*>bJKieNIT(NL zYLVaVn5~T9rPQWtB^9F+8#msR+cMvrMEBdBm{VLgT$A7RnB4swm(%!jFVD*NHtCF= zs?jIQxz&xN;g@`|-#NK8NqzMp%g5*L(kRbk-n&mnJJ1YtxnV64F*%c*=f&)VkN=(` z-c&*;^mjCvTq<=6-x%tzY0n=Mo2f+%LNivDJcZ%~9l7=R!ZSG3TXmVNODt!t?7nwb zauu>arMYBvQ6}F{AXf&D)it=l zjR_hpbI6N&1O3u4{{SdVOZDtdIYKh~bYB~JNLE0cbHTuFxbFfd<3gxXz3k6X3qH>o zd!%b=p~gpMU-O9}N$=HN5pDF6D>HH)l-G)w3HGfvQGxAOf1de4&6gZ)R9LvE_v9++#Drs7w8XwY9zXSa`Sd35So<-w{dAf0*@W z+wV$oLkVoOdSIIM3z@{k^kB#0I5!gu8u}(*{{qE|f`74iL}bLcb0#)n_->|v#`8+v zo|3%A>ko_P>v}QmUyzq|96QciC}wK;q_>L&c6R7YRHe&w_On?ZI(Bxm7nNLEZcrx8 zU5U4odn4~=$;iUY#XRGef{{}!QyT>8jjB@F z>Xn&cn5q0|$@WP9WaF~)b+WFL!%^FUC=R#E$f-pxlM~_5k(16_p1iug`3@8KuE{EF z3eyLV7oL|6yH-Hv>`8mywJ2n>G+M(XSc_EGl$GAr^h}uu^GBn<{Qg3r5FQ^LLo6Nw zfjeVU;r7^67_JfygTi14f@7&Z7R`&&%CyT|MMI%Gc_55e_7eQUFl$Sk7*>QAPC_7s z8K>;U@xlmi4_7^$5O((;5iX31iU~Os6&^#4$I6MLaeJ})dN?c|r;puB21_Fx{%^_X zv6uWGfs+3>kdb#tiN^l-;2ssxVX^U7Pcz}qhBa~y^uIuC!a9?FG~qvF4&GulRATK8 z+?}9bzDU}5de?J$Tv0Q9x7L{F*or~K{Lz3-MN`F2m$snyI z#H#6-h}>K`r6#af#a(6KK4Fi|8g0QcrZQpEYF8pB zWXUyO&38E{SCxr}RW-}=`_Z>%@-M1ydqwgqRy^beX!2bqXHwr@Y~>BAK~mwQ!QQvq zgtan_&g>|$;7#p=9RrIpD9u*x>!8te0Rce`_6)V)UO{j6wwGzGczEshf`zP*eB$9g zDQby|MCuUQ8vaACGH~;vNE0)%BH8t8cKC`+pk2D@alLVbz*Jn@VHnxXbgf?JPMTJU zp4=FuHj06klKV3p?AQTdr5xdZa90yRm$gIuK>>fDTagH=LTEr)bti}-mjQhZ6gX3e zTLPBae+`mTKoPbU_NPrI4RF-|tI7=lSBVV~e%RtJJP%zMTKQI~L3!;4&U>%hXW;@#e zU9l8Ub&Cc}sAoa+Z~})EP<*d5{SN`z-Gz^5dF^qV{|Pr;b0lSpFspM1On(;Y#rMSj17`AUfdBvi delta 4899 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 diff --git a/modules/integration/tests-integration/src/test/resources/keystores/stratos/client-truststore.jks b/modules/integration/tests-integration/src/test/resources/keystores/stratos/client-truststore.jks index ab222fdd343e6a44d2c1c0b82fbc7e2538509618..c477431cbee1aa8d78f20cbad10b1e8b86fbbe55 100644 GIT binary patch delta 1598 zcmbu-Yc!N;00;1SFEi7WnZb-pA=g}HGTxa92^%#c8FrHUozz&CGOXB6BU$VsQCJa5 z#fA)T8kenX;*?9tZPQIj6o*u9<+fvWcH7R`Pknek{Gaoj^FPo3{OU__&A;NL7RMIH zFc=IdIX;zAu0&heC_xx2z%SfCER+!zvNs?wJOYCOJYC*$k}z0Th9P1id2NEkfrdyN zkY5Oa00_dnju^)wL>z&ZV3ROI1OO}+gE*bERFn6U0=HW-%Joj=y`LPk)Q!Eig&}IY%T6f6^DkVzc7m2NoSc;@ z|Hg2l#a=&yK7r~u7+yG)`-V^AVemmA7P)h2*i?~sr_y>}SM>TkgFIoQN3-XF;KAYW zEnDj9<3$xc>0>p|N-|an=Hbyq&5;iTedg4#6$4*(_Gbq(cS4h?&;*143{WIl0U=3t zP$2`r5)4BiJn_Y}(9xq9k36!qnBFZ?DIK6&AJ^EnXUAat&A=bb<5S5k;Jt^H4MwVI zev?B@^~VeJh)TM4uUwn-tFP9kcW_e!Sm^7^?9yC~+A0>$G%=F+JkeoVM}uK%uAL-9 zTU1cC5HULCB5=1O{ccq|@4S8Me05uu$i<+J(m}taJnzt3+L~xXL+vQDSadIO42yEs z&XCZ7jkPdps#^@Bxy%ea2gI!Y7t#u#=->VU1aXl#Xr}}b^AjMeUAgSff4SxpAVr_g z_)z|b59PmnC|~d~M%XMSVzO*T!iQ;$7)dm(#J~9{ntxTt$+L~>!umTt8@1#f$`9OY zOn{mn>ZWpfZo>;;OZ0S&$&-W!#g)~Chz+N7F!pr1(|lv;p5Xy?y?AL_|DOJ-O+jzI z_gdI|tRySZnwRB4pAINY)jnuZZoZ^T74ha#jSqbD=h1SCZJ9aqMP*U>e|QfVS>}w( zvLlW;)TTTdM)4D5;hbHU2fzAUkmh0ToWEOTA&=0G8&=zTq38Fux5pe@yYIndU*8$d5dKiwc!-PRha2VNrRw{W ztTwex^`8@YbY1ebS+~jxsTZe?Xp@b#c5C%kS#8`gJ7F2t87@?+bKEAX zI^S7xk6vY97QOpjDwU$07d)uqUOw`Tl&xmb8HK>2I#rTK?BeT;be$#VV3K-4?WmVf zZ`En{1VMND4V-T|UH~~g=WIEI;>{vi z12B0gykQ^c{;k>U6~?7wv>ev@ehgRDUtkTR_A!61 zMUQ9oLFk54K_I&Sw50)>)!qW3C3nUl)c5`?659SE1w482F$r~k76qYhL*bg@J~FTi z61Nfn5>Bi|0Um+kk4k_oBwmyQ=CI-*O@IZ8IjX=0Se&~7aEHbB*?>JPZZH63VDXe5 x(25naEPy~*JYoviz+%s_Xmc(1}=n!evLJLu&Ygj4Upc{1>(oWU>GN delta 4135 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 diff --git a/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2carbon.jks b/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2carbon.jks index 79784a5e4d152d54f54d75e7fd8db4b58902f140..11686670c43a58e1850e7461f1da67cb524df384 100644 GIT binary patch delta 2522 zcmZ{mc{J2-8^&j2Of_WR_uYgUTP91E#=Z^4GL~d1hLBN~{F=$ug2-e`meQgcF@2GY zhKlMZR76OWENKWKl;y2&|GnpZ|9H;xxvz8G*K^MEob#N!s2Db!0n^-?+nR$wAh6#{ z1>6O~qT}O^Q{zLTB7RfIAqWIYUNC?+0Yxxz9-iNbv;qL63YP|=xyKzLx-RKymR zpLYj_7m9#t!33dD9ta{8@ioK6r&>cg3Ck-aF>*EH5x~ho&x&fRyVfxoJ?Tn`R*BSr zn>UrEx{GfY2<|ww*>bJKieNIT(NL zYLVaVn5~T9rPQWtB^9F+8#msR+cMvrMEBdBm{VLgT$A7RnB4swm(%!jFVD*NHtCF= zs?jIQxz&xN;g@`|-#NK8NqzMp%g5*L(kRbk-n&mnJJ1YtxnV64F*%c*=f&)VkN=(` z-c&*;^mjCvTq<=6-x%tzY0n=Mo2f+%LNivDJcZ%~9l7=R!ZSG3TXmVNODt!t?7nwb zauu>arMYBvQ6}F{AXf&D)it=l zjR_hpbI6N&1O3u4{{SdVOZDtdIYKh~bYB~JNLE0cbHTuFxbFfd<3gxXz3k6X3qH>o zd!%b=p~gpMU-O9}N$=HN5pDF6D>HH)l-G)w3HGfvQGxAOf1de4&6gZ)R9LvE_v9++#Drs7w8XwY9zXSa`Sd35So<-w{dAf0*@W z+wV$oLkVoOdSIIM3z@{k^kB#0I5!gu8u}(*{{qE|f`74iL}bLcb0#)n_->|v#`8+v zo|3%A>ko_P>v}QmUyzq|96QciC}wK;q_>L&c6R7YRHe&w_On?ZI(Bxm7nNLEZcrx8 zU5U4odn4~=$;iUY#XRGef{{}!QyT>8jjB@F z>Xn&cn5q0|$@WP9WaF~)b+WFL!%^FUC=R#E$f-pxlM~_5k(16_p1iug`3@8KuE{EF z3eyLV7oL|6yH-Hv>`8mywJ2n>G+M(XSc_EGl$GAr^h}uu^GBn<{Qg3r5FQ^LLo6Nw zfjeVU;r7^67_JfygTi14f@7&Z7R`&&%CyT|MMI%Gc_55e_7eQUFl$Sk7*>QAPC_7s z8K>;U@xlmi4_7^$5O((;5iX31iU~Os6&^#4$I6MLaeJ})dN?c|r;puB21_Fx{%^_X zv6uWGfs+3>kdb#tiN^l-;2ssxVX^U7Pcz}qhBa~y^uIuC!a9?FG~qvF4&GulRATK8 z+?}9bzDU}5de?J$Tv0Q9x7L{F*or~K{Lz3-MN`F2m$snyI z#H#6-h}>K`r6#af#a(6KK4Fi|8g0QcrZQpEYF8pB zWXUyO&38E{SCxr}RW-}=`_Z>%@-M1ydqwgqRy^beX!2bqXHwr@Y~>BAK~mwQ!QQvq zgtan_&g>|$;7#p=9RrIpD9u*x>!8te0Rce`_6)V)UO{j6wwGzGczEshf`zP*eB$9g zDQby|MCuUQ8vaACGH~;vNE0)%BH8t8cKC`+pk2D@alLVbz*Jn@VHnxXbgf?JPMTJU zp4=FuHj06klKV3p?AQTdr5xdZa90yRm$gIuK>>fDTagH=LTEr)bti}-mjQhZ6gX3e zTLPBae+`mTKoPbU_NPrI4RF-|tI7=lSBVV~e%RtJJP%zMTKQI~L3!;4&U>%hXW;@#e zU9l8Ub&Cc}sAoa+Z~})EP<*d5{SN`z-Gz^5dF^qV{|Pr;b0lSpFspM1On(;Y#rMSj17`AUfdBvi delta 4899 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 diff --git a/modules/p2-profile/analytics-profile/carbon.product b/modules/p2-profile/analytics-profile/carbon.product index 896c2c70..a2006154 100644 --- a/modules/p2-profile/analytics-profile/carbon.product +++ b/modules/p2-profile/analytics-profile/carbon.product @@ -13,7 +13,7 @@ - + diff --git a/modules/p2-profile/broker-profile/carbon.product b/modules/p2-profile/broker-profile/carbon.product index 896c2c70..a2006154 100644 --- a/modules/p2-profile/broker-profile/carbon.product +++ b/modules/p2-profile/broker-profile/carbon.product @@ -13,7 +13,7 @@ - + diff --git a/modules/p2-profile/iot-core-profile/carbon.product b/modules/p2-profile/iot-core-profile/carbon.product index c3ac5fa7..8420ed11 100644 --- a/modules/p2-profile/iot-core-profile/carbon.product +++ b/modules/p2-profile/iot-core-profile/carbon.product @@ -14,7 +14,7 @@ version="4.4.14" useFeatures="true" includeLaunchers="true"> - + diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index c46b7ffb..177a7501 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -182,6 +182,9 @@ org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.backend.feature:${carbon.device.mgt.plugin.version} + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version} + @@ -1016,6 +1019,10 @@ org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group ${carbon.device.mgt.plugin.version} + + org.wso2.carbon.device.mgt.notification.listener.feature.group + ${carbon.device.mgt.plugin.version} + org.wso2.carbon.device.mgt.adapter.feature.group @@ -1136,6 +1143,10 @@ org.wso2.carbon.databridge.datapublisher.feature.group ${carbon.analytics.common.version} + + org.wso2.carbon.event.input.adapter.server.feature.group + ${carbon.analytics.common.version} + @@ -2015,6 +2026,10 @@ org.wso2.carbon.device.mgt.mobile.windows.feature.group ${carbon.device.mgt.plugin.version} + + org.wso2.carbon.device.mgt.notification.listener.feature.group + ${carbon.device.mgt.plugin.version} + org.wso2.carbon.device.mgt.analytics.dashboard.feature.group ${carbon.device.mgt.version} @@ -2647,6 +2662,10 @@ org.wso2.carbon.device.mgt.mobile.windows.feature.group ${carbon.device.mgt.plugin.version} + + org.wso2.carbon.device.mgt.notification.listener.feature.group + ${carbon.device.mgt.plugin.version} + org.wso2.carbon.device.mgt.analytics.dashboard.feature.group ${carbon.device.mgt.version} diff --git a/pom.xml b/pom.xml index 643baf36..b9a4a003 100644 --- a/pom.xml +++ b/pom.xml @@ -1440,7 +1440,7 @@ - 4.4.14 + 4.4.16 [4.4.0, 4.5.0) 2.2.0 @@ -1512,7 +1512,7 @@ - 2.0.68 + 2.0.69-SNAPSHOT [2.0.0, 3.0.0) @@ -1520,7 +1520,7 @@ - 3.0.36 + 3.0.37-SNAPSHOT 6.1.80 @@ -1551,8 +1551,8 @@ ${product.iot.version} - 3.1.15 - 3.1.17 + 3.2.19 + 3.2.15 1.51.0.0