From aa19cccfe828df6f75c4426995ac75b1d8759155 Mon Sep 17 00:00:00 2001 From: charitha Date: Wed, 14 Mar 2018 12:34:51 +0530 Subject: [PATCH 01/12] Bump kernel version & removed web xml customizations --- modules/distribution/pom.xml | 103 ----- .../analytics/conf/input-adapter-change.xml | 2 +- .../analytics/conf/output-adapter-change.xml | 4 +- modules/distribution/src/assembly/bin.xml | 36 -- .../src/core/bin/profile-creator.bat | 12 +- .../src/core/bin/profile-creator.sh | 10 +- .../src/core/conf/input-adapter-change.xml | 2 +- .../src/core/conf/output-adapter-change.xml | 2 +- .../web-xml/api#identity#entitlement/web.xml | 127 ------ .../web-xml/authenticationendpoint/web.xml | 280 ------------ .../web-xml/client-registration#v0.11/web.xml | 87 ---- .../resources/web-apps/web-xml/oauth2/web.xml | 100 ----- .../web-apps/web-xml/shindig/web.xml | 423 ------------------ .../analytics-profile/carbon.product | 4 +- .../p2-profile/broker-profile/carbon.product | 4 +- .../iot-core-profile/carbon.product | 4 +- pom.xml | 8 +- 17 files changed, 26 insertions(+), 1182 deletions(-) delete mode 100644 modules/distribution/src/core/resources/web-apps/web-xml/api#identity#entitlement/web.xml delete mode 100644 modules/distribution/src/core/resources/web-apps/web-xml/authenticationendpoint/web.xml delete mode 100644 modules/distribution/src/core/resources/web-apps/web-xml/client-registration#v0.11/web.xml delete mode 100644 modules/distribution/src/core/resources/web-apps/web-xml/oauth2/web.xml delete mode 100644 modules/distribution/src/core/resources/web-apps/web-xml/shindig/web.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 07090c41..9b7a5745 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -760,109 +760,6 @@ - - - replace-web-xmls-in-war-files - prepare-package - - run - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/distribution/src/analytics/conf/input-adapter-change.xml b/modules/distribution/src/analytics/conf/input-adapter-change.xml index b1f0161f..e18884d5 100644 --- a/modules/distribution/src/analytics/conf/input-adapter-change.xml +++ b/modules/distribution/src/analytics/conf/input-adapter-change.xml @@ -24,7 +24,7 @@ 20000 10000 60 - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.12/register tcp://${mqtt.broker.host}:${mqtt.broker.port} admin admin diff --git a/modules/distribution/src/analytics/conf/output-adapter-change.xml b/modules/distribution/src/analytics/conf/output-adapter-change.xml index b1d69837..07e305f0 100644 --- a/modules/distribution/src/analytics/conf/output-adapter-change.xml +++ b/modules/distribution/src/analytics/conf/output-adapter-change.xml @@ -9,7 +9,7 @@ 20000 10000 60 - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.12/register https://${iot.gateway.host}:${iot.gateway.https.port}/token tcp://${mqtt.broker.host}:${mqtt.broker.port} admin @@ -23,7 +23,7 @@ 20000 10000 60 - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.12/register https://${iot.gateway.host}:${iot.gateway.https.port}/token tcp://${mqtt.broker.host}:${mqtt.broker.port} admin diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 4c9b10d6..e1acdd5a 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -1657,42 +1657,6 @@ 755 - - - - - - - - - - target/webapp-temp/api#identity#entitlement.war - - ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps - - 755 - - - target/webapp-temp/authenticationendpoint.war - - ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps - - 755 - - - target/webapp-temp/oauth2.war - - ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps - - 755 - - - target/webapp-temp/shindig.war - - ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps - - 755 - src/core/cloud/portal/common.css diff --git a/modules/distribution/src/core/bin/profile-creator.bat b/modules/distribution/src/core/bin/profile-creator.bat index 83ca0597..db9db21a 100644 --- a/modules/distribution/src/core/bin/profile-creator.bat +++ b/modules/distribution/src/core/bin/profile-creator.bat @@ -99,7 +99,7 @@ goto :eof IF EXIST %DIR%..\conf\datasources\cdm-datasources.xml del %DIR%..\conf\datasources\cdm-datasources.xml mkdir %DIR%..\repository\deployment\server\tempwebapp copy /y %DIR%..\repository\deployment\server\webapps\oauth2.war %DIR%..\repository\deployment\server\tempwebapp\ - copy /y %DIR%..\repository\deployment\server\webapps\client-registration#v0.11.war %DIR%..\repository\deployment\server\tempwebapp\ + copy /y %DIR%..\repository\deployment\server\webapps\client-registration#v0.12.war %DIR%..\repository\deployment\server\tempwebapp\ copy /y %DIR%..\repository\deployment\server\webapps\authenticationendpoint.war %DIR%..\repository\deployment\server\tempwebapp\ IF EXIST %DIR%..\repository\deployment\server\webapps @RD /S /Q %DIR%..\repository\deployment\server\webapps mkdir %DIR%..\repository\deployment\server\jaggeryapps @@ -132,12 +132,12 @@ goto :eof IF EXIST %DIR%..\repository\deployment\server\jaggeryapps @RD /S /Q %DIR%..\repository\deployment\server\jaggeryapps IF EXIST %DIR%..\repository\deployment\server\axis2services @RD /S /Q %DIR%..\repository\deployment\server\axis2services IF EXIST %DIR%..\repository\deployment\server\webapps\shindig.war del %DIR%..\repository\deployment\server\webapps\shindig.war - IF EXIST %DIR%..\repository\deployment\server\webapps\api#am#publisher#v0.11.war del %DIR%..\repository\deployment\server\webapps\api#am#publisher#v0.11.war - IF EXIST %DIR%..\repository\deployment\server\webapps\api#am#store#v0.11.war del %DIR%..\repository\deployment\server\webapps\api#am#store#v0.11.war + IF EXIST %DIR%..\repository\deployment\server\webapps\api#am#publisher#v0.12.war del %DIR%..\repository\deployment\server\webapps\api#am#publisher#v0.11.war + IF EXIST %DIR%..\repository\deployment\server\webapps\api#am#store#v0.12.war del %DIR%..\repository\deployment\server\webapps\api#am#store#v0.11.war IF EXIST %DIR%..\repository\deployment\server\webapps\api#appm#oauth#v1.0.war del %DIR%..\repository\deployment\server\webapps\api#appm#oauth#v1.0.war IF EXIST %DIR%..\repository\deployment\server\webapps\api#appm#publisher#v1.1.war del %DIR%..\repository\deployment\server\webapps\api#appm#publisher#v1.1.war IF EXIST %DIR%..\repository\deployment\server\webapps\api#appm#store#v1.1.war del %DIR%..\repository\deployment\server\webapps\api#appm#store#v1.1.war - IF EXIST %DIR%..\repository\deployment\server\webapps\client-registration#v0.11.war del %DIR%..\repository\deployment\server\webapps\client-registration#v0.11.war + IF EXIST %DIR%..\repository\deployment\server\webapps\client-registration#v0.12.war del %DIR%..\repository\deployment\server\webapps\client-registration#v0.11.war mkdir %DIR%..\repository\deployment\server\jaggeryapps mkdir %DIR%..\repository\deployment\server\axis2services IF EXIST %DIR%..\conf\identity\sso-idp-config.xml del %DIR%..\conf\identity\sso-idp-config.xml @@ -168,8 +168,8 @@ goto :eof IF EXIST %DIR%..\conf\synapse.properties del %DIR%..\conf\synapse.properties IF EXIST %DIR%..\conf\passthru-http.properties del %DIR%..\conf\passthru-http.properties mkdir %DIR%..\repository\deployment\server\tempwebapp - copy /y %DIR%..\repository\deployment\server\webapps\api#am#publisher#v0.11.war %DIR%..\repository\deployment\server\tempwebapp\ - copy /y %DIR%..\repository\deployment\server\webapps\api#am#store#v0.11.war %DIR%..\repository\deployment\server\tempwebapp\ + copy /y %DIR%..\repository\deployment\server\webapps\api#am#publisher#v0.12.war %DIR%..\repository\deployment\server\tempwebapp\ + copy /y %DIR%..\repository\deployment\server\webapps\api#am#store#v0.12.war %DIR%..\repository\deployment\server\tempwebapp\ copy /y %DIR%..\repository\deployment\server\webapps\api#appm#oauth#v1.0.war %DIR%..\repository\deployment\server\tempwebapp\ copy /y %DIR%..\repository\deployment\server\webapps\api#appm#publisher#v1.1.war %DIR%..\repository\deployment\server\tempwebapp\ copy /y %DIR%..\repository\deployment\server\webapps\api#appm#store#v1.1.war %DIR%..\repository\deployment\server\tempwebapp\ diff --git a/modules/distribution/src/core/bin/profile-creator.sh b/modules/distribution/src/core/bin/profile-creator.sh index 27e9bb64..bcfc8480 100644 --- a/modules/distribution/src/core/bin/profile-creator.sh +++ b/modules/distribution/src/core/bin/profile-creator.sh @@ -83,8 +83,8 @@ then cp -rf ${DIR}/../repository/resources/profiles/backend/*.sh ${DIR}/../bin/ cp -rf ${DIR}/../repository/resources/profiles/backend/*.bat ${DIR}/../bin/ cp -rf ${DIR}/../repository/resources/profiles/backend/carbon.xml ${DIR}/../conf/ - rm -rf ${DIR}/../repository/deployment/server/webapps/oauth2.war ${DIR}/../repository/deployment/server/webapps/shindig.war ${DIR}/../repository/deployment/server/webapps/api#am#publisher#v0.11.war ${DIR}/../repository/deployment/server/webapps/api#am#store#v0.11.war ${DIR}/../repository/deployment/server/webapps/api#appm#oauth#v1.0.war ${DIR}/../repository/deployment/server/webapps/api#appm#publisher#v1.1.war ${DIR}/../repository/deployment/server/webapps/api#appm#store#v1.1.war - rm -rf ${DIR}/../repository/deployment/server/webapps/dynamic-client-web.war ${DIR}/../repository/deployment/server/webapps/client-registration#v0.11.war + rm -rf ${DIR}/../repository/deployment/server/webapps/oauth2.war ${DIR}/../repository/deployment/server/webapps/shindig.war ${DIR}/../repository/deployment/server/webapps/api#am#publisher#v0.12.war ${DIR}/../repository/deployment/server/webapps/api#am#store#v0.11.war ${DIR}/../repository/deployment/server/webapps/api#appm#oauth#v1.0.war ${DIR}/../repository/deployment/server/webapps/api#appm#publisher#v1.1.war ${DIR}/../repository/deployment/server/webapps/api#appm#store#v1.1.war + rm -rf ${DIR}/../repository/deployment/server/webapps/dynamic-client-web.war ${DIR}/../repository/deployment/server/webapps/client-registration#v0.12.war rm -rf ${DIR}/../repository/deployment/server/jaggeryapps/* rm -rf ${DIR}/../repository/deployment/server/axis2services/* rm -rf ${DIR}/../conf/identity/sso-idp-config.xml @@ -122,8 +122,8 @@ then cp -rf ${DIR}/../repository/resources/profiles/manager/carbon.xml ${DIR}/../conf/ cp -rf ${DIR}/../repository/resources/profiles/manager/axis2/axis2.xml ${DIR}/../conf/axis2/ mkdir ${DIR}/../repository/deployment/server/tempwebapp - cp ${DIR}/../repository/deployment/server/webapps/api#am#publisher#v0.11.war ${DIR}/../repository/deployment/server/tempwebapp/ - cp ${DIR}/../repository/deployment/server/webapps/api#am#store#v0.11.war ${DIR}/../repository/deployment/server/tempwebapp/ + cp ${DIR}/../repository/deployment/server/webapps/api#am#publisher#v0.12.war ${DIR}/../repository/deployment/server/tempwebapp/ + cp ${DIR}/../repository/deployment/server/webapps/api#am#store#v0.12.war ${DIR}/../repository/deployment/server/tempwebapp/ cp ${DIR}/../repository/deployment/server/webapps/api#appm#oauth#v1.0.war ${DIR}/../repository/deployment/server/tempwebapp/ cp ${DIR}/../repository/deployment/server/webapps/api#appm#publisher#v1.1.war ${DIR}/../repository/deployment/server/tempwebapp/ cp ${DIR}/../repository/deployment/server/webapps/api#appm#store#v1.1.war ${DIR}/../repository/deployment/server/tempwebapp/ @@ -196,7 +196,7 @@ then mkdir ${DIR}/../repository/deployment/server/tempwebapp cp ${DIR}/../repository/deployment/server/webapps/oauth2.war ${DIR}/../repository/deployment/server/tempwebapp/ cp ${DIR}/../repository/deployment/server/webapps/throttle#data#v1.war ${DIR}/../repository/deployment/server/tempwebapp/ - cp ${DIR}/../repository/deployment/server/webapps/client-registration#v0.11.war ${DIR}/../repository/deployment/server/tempwebapp/ + cp ${DIR}/../repository/deployment/server/webapps/client-registration#v0.12.war ${DIR}/../repository/deployment/server/tempwebapp/ cp ${DIR}/../repository/deployment/server/webapps/authenticationendpoint.war ${DIR}/../repository/deployment/server/tempwebapp/ rm -rf ${DIR}/../repository/deployment/server/webapps/* cp -rf ${DIR}/../repository/deployment/server/tempwebapp/* ${DIR}/../repository/deployment/server/webapps/ diff --git a/modules/distribution/src/core/conf/input-adapter-change.xml b/modules/distribution/src/core/conf/input-adapter-change.xml index dd1d5be2..44e4d69c 100644 --- a/modules/distribution/src/core/conf/input-adapter-change.xml +++ b/modules/distribution/src/core/conf/input-adapter-change.xml @@ -25,7 +25,7 @@ 20000 10000 60 - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.12/register tcp://${mqtt.broker.host}:${mqtt.broker.port} admin admin diff --git a/modules/distribution/src/core/conf/output-adapter-change.xml b/modules/distribution/src/core/conf/output-adapter-change.xml index 66bd32df..b5757210 100644 --- a/modules/distribution/src/core/conf/output-adapter-change.xml +++ b/modules/distribution/src/core/conf/output-adapter-change.xml @@ -9,7 +9,7 @@ 20000 10000 60 - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.12/register https://${iot.gateway.host}:${iot.gateway.https.port}/token tcp://${mqtt.broker.host}:${mqtt.broker.port} admin diff --git a/modules/distribution/src/core/resources/web-apps/web-xml/api#identity#entitlement/web.xml b/modules/distribution/src/core/resources/web-apps/web-xml/api#identity#entitlement/web.xml deleted file mode 100644 index ef693381..00000000 --- a/modules/distribution/src/core/resources/web-apps/web-xml/api#identity#entitlement/web.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - Entitlement-Service-Provider - - - - ApiOriginFilter - org.wso2.carbon.identity.entitlement.endpoint.filter.ApiOriginFilter - - - - HttpHeaderSecurityFilter - org.apache.catalina.filters.HttpHeaderSecurityFilter - - hstsEnabled - false - - - - - ContentTypeBasedCachePreventionFilter - org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter - - patterns - text/html" ,application/json" ,text/plain - - - filterAction - enforce - - - httpHeaders - Cache-Control: no-store, no-cache, must-revalidate, private - - - - - HttpHeaderSecurityFilter - /* - - - - ContentTypeBasedCachePreventionFilter - /* - - - - ApiOriginFilter - /* - - - - EntitlementServlet - EntitlementServlet - Entitlement Endpoints - org.apache.cxf.transport.servlet.CXFServlet - 1 - - - - swagger.api.basepath - https://localhost:9443/entitlement - - - - - EntitlementServlet - /* - - - - 60 - - true - - - - - - secured services - /decision/* - - - - - - CONFIDENTIAL - - - - - org.wso2.carbon.identity.entitlement.endpoint.impl.ApplicationInitializer - - - - - - diff --git a/modules/distribution/src/core/resources/web-apps/web-xml/authenticationendpoint/web.xml b/modules/distribution/src/core/resources/web-apps/web-xml/authenticationendpoint/web.xml deleted file mode 100644 index 466e8313..00000000 --- a/modules/distribution/src/core/resources/web-apps/web-xml/authenticationendpoint/web.xml +++ /dev/null @@ -1,280 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - AccountRecoveryRESTEndpointURL - https://localhost:9443/t/tenant-domain/api/identity/user/v0.9/ - - - - - - displayScopes - true - - - - HttpHeaderSecurityFilter - org.apache.catalina.filters.HttpHeaderSecurityFilter - - hstsEnabled - false - - - - - HttpHeaderSecurityFilter - * - - - - AuthenticationEndpointFilter - - org.wso2.carbon.identity.application.authentication.endpoint.util.filter.AuthenticationEndpointFilter - - - - - AuthenticationEndpointFilter - /* - - - - - org.wso2.carbon.identity.application.authentication.endpoint.util.listener.AuthenticationEndpointContextListener - - - - - retry.do - /retry.jsp - - - - claims.do - /requested-claims.jsp - - - - oauth2_login.do - /login.jsp - - - - oauth2_authz.do - /oauth2_authz.jsp - - - - oauth2_consent.do - /oauth2_consent.jsp - - - - oauth2_logout_consent.do - /oauth2_logout_consent.jsp - - - - oauth2_logout.do - /logout.jsp - - - - oauth2_error.do - /oauth2_error.jsp - - - - samlsso_login.do - /login.jsp - - - - samlsso_logout.do - /logout.jsp - - - - samlsso_redirect.do - /login.jsp - - - - samlsso_notification.do - /samlsso_notification.jsp - - - - openid_login.do - /login.jsp - - - - openid_profile.do - /openid_profile.jsp - - - - passivests_login.do - /login.jsp - - - - tenantlistrefresher.do - /tenant_refresh_endpoint.jsp - - - - registration.do - /registration.jsp - - - - retry.do - /retry.do - - - - oauth2_login.do - /oauth2_login.do - - - - oauth2_authz.do - /oauth2_authz.do - - - - oauth2_consent.do - /oauth2_consent.do - - - - oauth2_logout_consent.do - /oauth2_logout_consent.do - - - - oauth2_logout.do - /oauth2_logout.do - - - - oauth2_error.do - /oauth2_error.do - - - - samlsso_login.do - /samlsso_login.do - - - - samlsso_logout.do - /samlsso_logout.do - - - - samlsso_redirect.do - /samlsso_redirect.do - - - - samlsso_notification.do - /samlsso_notification.do - - - - openid_login.do - /openid_login.do - - - - openid_profile.do - /openid_profile.do - - - - passivests_login.do - /passivests_login.do - - - - tenantlistrefresher.do - /tenantlistrefresher.do - - - - registration.do - /registration.do - - - - claims.do - /claims.do - - - - java.lang.Throwable - /generic-exception-response.jsp - - - - - true - - - - diff --git a/modules/distribution/src/core/resources/web-apps/web-xml/client-registration#v0.11/web.xml b/modules/distribution/src/core/resources/web-apps/web-xml/client-registration#v0.11/web.xml deleted file mode 100644 index 19b51c7a..00000000 --- a/modules/distribution/src/core/resources/web-apps/web-xml/client-registration#v0.11/web.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - -JAX-WS/JAX-RS Device Registration Agent Endpoint -JAX-WS/JAX-RS Servlet - - contextConfigLocation - WEB-INF/beans.xml - - - - org.springframework.web.context.ContextLoaderListener - - - - JAX-WS/JAX-RS Device Registration Agent Endpoint - JAX-WS/JAX-RS Servlet - CXFServlet - - org.apache.cxf.transport.servlet.CXFServlet - - 1 - - - CXFServlet - /* - - - - HttpHeaderSecurityFilter - org.apache.catalina.filters.HttpHeaderSecurityFilter - - hstsEnabled - false - - - - - ContentTypeBasedCachePreventionFilter - org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter - - patterns - text/html" ,application/json" ,text/plain - - - filterAction - enforce - - - httpHeaders - Cache-Control: no-store, no-cache, must-revalidate, private - - - - - HttpHeaderSecurityFilter - /* - - - - ContentTypeBasedCachePreventionFilter - /* - - - diff --git a/modules/distribution/src/core/resources/web-apps/web-xml/oauth2/web.xml b/modules/distribution/src/core/resources/web-apps/web-xml/oauth2/web.xml deleted file mode 100644 index 02b4a9e4..00000000 --- a/modules/distribution/src/core/resources/web-apps/web-xml/oauth2/web.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - OAuth2 Endpoints - - - HttpHeaderSecurityFilter - org.apache.catalina.filters.HttpHeaderSecurityFilter - - hstsEnabled - false - - - - - ContentTypeBasedCachePreventionFilter - org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter - - patterns - text/html" ,application/json" ,text/plain - - - filterAction - enforce - - - httpHeaders - Cache-Control: no-store, no-cache, must-revalidate, private - - - - - HttpHeaderSecurityFilter - /* - - - - ContentTypeBasedCachePreventionFilter - /* - - - - - OAuth2Endpoints - org.apache.cxf.transport.servlet.CXFServlet - 1 - - - - - - - - - - - OAuth2Endpoints - /* - - - - - true - - - - diff --git a/modules/distribution/src/core/resources/web-apps/web-xml/shindig/web.xml b/modules/distribution/src/core/resources/web-apps/web-xml/shindig/web.xml deleted file mode 100644 index 857a8334..00000000 --- a/modules/distribution/src/core/resources/web-apps/web-xml/shindig/web.xml +++ /dev/null @@ -1,423 +0,0 @@ - - - - Shindig - - - - - guice-modules - - org.apache.shindig.common.PropertiesModule: - org.apache.shindig.gadgets.DefaultGuiceModule: - org.apache.shindig.social.core.config.SocialApiGuiceModule: - org.apache.shindig.social.sample.SampleModule: - org.apache.shindig.gadgets.oauth.OAuthModule: - org.apache.shindig.gadgets.oauth2.OAuth2Module: - org.apache.shindig.gadgets.oauth2.OAuth2MessageModule: - org.apache.shindig.gadgets.oauth2.handler.OAuth2HandlerModule: - org.apache.shindig.gadgets.oauth2.persistence.sample.OAuth2PersistenceModule: - org.apache.shindig.common.cache.ehcache.EhCacheModule: - org.apache.shindig.sample.shiro.ShiroGuiceModule: - org.apache.shindig.sample.container.SampleContainerGuiceModule: - org.apache.shindig.extras.ShindigExtrasGuiceModule: - org.apache.shindig.gadgets.admin.GadgetAdminModule: - org.wso2.carbon.dashboard.shindig.features.WSO2ShindigFeaturesModule - - - - - - system.properties - - - - - - - HttpHeaderSecurityFilter - org.apache.catalina.filters.HttpHeaderSecurityFilter - - hstsEnabled - false - - - antiClickJackingOption - SAMEORIGIN - - - - - - ContentTypeBasedCachePreventionFilter - org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter - - patterns - text/html" ,application/json" ,text/plain - - - filterAction - enforce - - - httpHeaders - Cache-Control: no-store, no-cache, must-revalidate, private - - - - - HttpHeaderSecurityFilter - /* - - - - ContentTypeBasedCachePreventionFilter - /* - - - - HttpHeaderSecurityFilter - * - - - - hostFilter - org.apache.shindig.common.servlet.HostFilter - - - hostFilter - /gadgets/ifr - /gadgets/js/* - /gadgets/proxy/* - /gadgets/concat - /gadgets/makeRequest - /rpc/* - /rest/* - - - - ShiroFilter - org.apache.shiro.web.servlet.IniShiroFilter - - config - - - - - - - - authFilter - org.apache.shindig.auth.AuthenticationServletFilter - - - - etagFilter - org.apache.shindig.gadgets.servlet.ETagFilter - - - - - ShiroFilter - /oauth/authorize - - - - ShiroFilter - /oauth2/authorize - - - - ShiroFilter - *.jsp - - - - authFilter - /social/* - /gadgets/ifr - /gadgets/makeRequest - /gadgets/proxy - /gadgets/api/rpc/* - /gadgets/api/rest/* - /rpc/* - /rest/* - - - - etagFilter - * - - - - org.apache.shindig.common.servlet.GuiceServletContextListener - - - - - xml-to-html - - org.wso2.carbon.dashboard.shindig.extensions.WSO2GadgetRenderingServlet - - - - - accel - - org.apache.shindig.gadgets.servlet.HtmlAccelServlet - - - - - - proxy - - org.apache.shindig.gadgets.servlet.ProxyServlet - - - - - - makeRequest - - org.apache.shindig.gadgets.servlet.MakeRequestServlet - - - - - - concat - - org.apache.shindig.gadgets.servlet.ConcatProxyServlet - - - - - - oauthCallback - - org.apache.shindig.gadgets.servlet.OAuthCallbackServlet - - - - - - oauth2callback - - org.apache.shindig.gadgets.servlet.OAuth2CallbackServlet - - - - - - metadata - - org.apache.shindig.gadgets.servlet.RpcServlet - - - - - - js - org.apache.shindig.gadgets.servlet.JsServlet - - - - restapiServlet - - org.apache.shindig.protocol.DataServiceServlet - - - handlers - org.apache.shindig.handlers - - - - - - jsonRpcServlet - - org.apache.shindig.protocol.JsonRpcServlet - - - handlers - org.apache.shindig.handlers - - - - - - sampleOAuth - - org.apache.shindig.social.sample.oauth.SampleOAuthServlet - - - - - - OAuth2Servlet - - org.apache.shindig.social.core.oauth2.OAuth2Servlet - - - - - rpcSwf - - org.apache.shindig.gadgets.servlet.RpcSwfServlet - - - - - js - /gadgets/js/* - - - - proxy - /gadgets/proxy/* - - - - makeRequest - /gadgets/makeRequest - - - - jsonRpcServlet - /rpc/* - /gadgets/api/rpc/* - /social/rpc/* - - - - restapiServlet - /rest/* - /gadgets/api/rest/* - /social/rest/* - - - - concat - /gadgets/concat - - - - oauthCallback - /gadgets/oauthcallback - - - - oauth2callback - /gadgets/oauth2callback - - - - xml-to-html - /gadgets/ifr - - - - accel - /gadgets/accel - - - - metadata - /gadgets/metadata - - - - sampleOAuth - /oauth/* - - - - OAuth2Servlet - /oauth2/* - - - - rpcSwf - /xpc* - - - - 404 - /error-pages/error404.html - - - - 401 - /error-pages/error401.html - - - - 403 - /error-pages/error403.html - - - - 405 - /error-pages/error405.html - - - - 500 - /error-pages/error500.html - - diff --git a/modules/p2-profile/analytics-profile/carbon.product b/modules/p2-profile/analytics-profile/carbon.product index e6000463..ac2aaa13 100644 --- a/modules/p2-profile/analytics-profile/carbon.product +++ b/modules/p2-profile/analytics-profile/carbon.product @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/modules/p2-profile/broker-profile/carbon.product b/modules/p2-profile/broker-profile/carbon.product index e6000463..ac2aaa13 100644 --- a/modules/p2-profile/broker-profile/carbon.product +++ b/modules/p2-profile/broker-profile/carbon.product @@ -1,7 +1,7 @@ - + @@ -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 125b454c..42f3deeb 100644 --- a/modules/p2-profile/iot-core-profile/carbon.product +++ b/modules/p2-profile/iot-core-profile/carbon.product @@ -2,7 +2,7 @@ +version="4.4.26" useFeatures="true" includeLaunchers="true"> @@ -14,7 +14,7 @@ version="4.4.25" useFeatures="true" includeLaunchers="true"> - + diff --git a/pom.xml b/pom.xml index 239e1260..cc07cc85 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ modules/cxf-filters modules/p2-profile modules/distribution - + modules/integration @@ -1460,7 +1460,7 @@ - 4.4.25 + 4.4.26 [4.4.0, 4.5.0) 2.2.0 @@ -1539,7 +1539,7 @@ 4.7.23 - 3.1.3 + 3.1.5 [3.1.0, 4.0.0) @@ -1623,7 +1623,7 @@ 3.3.2 2.2 2.4 - 1.6.1.wso2v23 + 1.6.1-wso2v24 1.5.4 2.3.1 1.6.1 From 88256979dd30efcfacd14ab0817efcd16f28d007 Mon Sep 17 00:00:00 2001 From: Ruwan Yatawara Date: Wed, 14 Mar 2018 13:17:23 +0530 Subject: [PATCH 02/12] Adding identity-consent mgt configs and changing login redirection page --- .../identity/application-authentication.xml | 4 +- .../src/core/conf/identity/identity.xml | 370 ++++++++++++++++-- .../web-xml/authenticationendpoint/web.xml | 64 ++- 3 files changed, 391 insertions(+), 47 deletions(-) diff --git a/modules/distribution/src/core/conf/identity/application-authentication.xml b/modules/distribution/src/core/conf/identity/application-authentication.xml index 6f8bcd22..37dc1140 100644 --- a/modules/distribution/src/core/conf/identity/application-authentication.xml +++ b/modules/distribution/src/core/conf/identity/application-authentication.xml @@ -29,7 +29,7 @@ AuthenticationEndpointURL is location of the web app containing the authentication related pages --> - /devicemgt/login + /authenticationendpoint/login.do /authenticationendpoint/retry.do - \ No newline at end of file + diff --git a/modules/distribution/src/core/conf/identity/identity.xml b/modules/distribution/src/core/conf/identity/identity.xml index 5529255b..b0417def 100644 --- a/modules/distribution/src/core/conf/identity/identity.xml +++ b/modules/distribution/src/core/conf/identity/identity.xml @@ -33,6 +33,12 @@ true 20160 1140 + + + 50000 + + + 50000 true @@ -217,13 +223,45 @@ org.wso2.carbon.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator + + + + + authorization_code + + + implicit + + + - - + + + + + + + + + + + + + + false @@ -254,6 +292,26 @@ org.wso2.carbon.identity.openidconnect.DefaultIDTokenBuilder SHA256withRSA + + + RSA-OAEP + + A128GCM + + + + RSA1_5 + RSA-OAEP + + + A128GCM + A192GCM + A256GCM + A128CBC-HS256 + A128CBC+HS256 + + + true ${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth2/token org.wso2.carbon.identity.openidconnect.SAMLAssertionClaimsCallback + SHA256withRSA 3600 org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoUserStoreClaimRetriever org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInforRequestDefaultValidator org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoISAccessTokenValidator org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoJSONResponseBuilder false + + false + + 120 + + + + + request_param_value_builder + org.wso2.carbon.identity.openidconnect.RequestParamRequestObjectBuilder + + + + + org.wso2.carbon.identity.openidconnect.RequestObjectValidatorImpl + + + true + 0 + 5 + @@ -315,6 +404,12 @@ http://www.w3.org/2000/09/xmldsig#sha1 true + + + + true + + + + + + + true + + true + true + + + true + + - - - - - + + + + + + + org.wso2.carbon.identity.governance.store.JDBCIdentityDataStore - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + /permission/admin/manage/identity/usermgt/view + + + /permission/admin/manage/identity/usermgt/view + + + + + + + /permission/admin/manage/identity/consentmgt/add + + + + /permission/admin/manage/identity/consentmgt/delete + + + + /permission/admin/manage/identity/consentmgt/add + + + + /permission/admin/manage/identity/consentmgt/delete + + + + /permission/admin/manage/identity/consentmgt/add + + + + /permission/admin/manage/identity/consentmgt/delete + + + + + + /permission/admin/manage/identity/applicationmgt/create + + /permission/admin/manage/identity/applicationmgt/delete - + + /permission/admin/manage/identity/applicationmgt/update + + + /permission/admin/manage/identity/applicationmgt/view + + + /permission/admin/manage/identity/applicationmgt/delete + + /permission/admin/manage/identity/applicationmgt/create - + /permission/admin/manage/identity/applicationmgt/view - + /permission/admin/manage/identity/pep + + /permission/admin/manage/identity/usermgt/create + + + /permission/admin/manage/identity/usermgt/list + + + /permission/admin/manage/identity/rolemgt/create + + + /permission/admin/manage/identity/rolemgt/view + + + /permission/admin/manage/identity/usermgt/view + + + /permission/admin/manage/identity/usermgt/update + + + /permission/admin/manage/identity/usermgt/update + + + /permission/admin/manage/identity/usermgt/delete + + + /permission/admin/manage/identity/rolemgt/view + + + /permission/admin/manage/identity/rolemgt/update + + + /permission/admin/manage/identity/rolemgt/update + + + /permission/admin/manage/identity/rolemgt/delete + + + /permission/admin/login + + + /permission/admin/manage/identity/usermgt/delete + + + /permission/admin/login + + + /permission/admin/login + + + /permission/admin/manage/identity/usermgt/create + + + + + + + + + /permission/admin/manage/identity/usermgt + + + /permission/admin/manage/identity/applicationmgt + + - + + - /api/identity/user/v0.9 - /api/identity/recovery/v0.9 - /oauth2 - /api/identity/entitlement + /api/identity/user/v1.0/ + /api/identity/consent-mgt/v1.0/ + /api/identity/recovery/v0.9/ + /oauth2/ + /scim2/ + /api/identity/entitlement/ + /api/identity/oauth2/dcr/v1.0/ /identity/(.*) + 300 diff --git a/modules/distribution/src/core/resources/web-apps/web-xml/authenticationendpoint/web.xml b/modules/distribution/src/core/resources/web-apps/web-xml/authenticationendpoint/web.xml index 466e8313..9b67df3f 100644 --- a/modules/distribution/src/core/resources/web-apps/web-xml/authenticationendpoint/web.xml +++ b/modules/distribution/src/core/resources/web-apps/web-xml/authenticationendpoint/web.xml @@ -53,9 +53,9 @@ https://localhost:9443/accountrecoveryendpoint - AccountRecoveryRESTEndpointURL - https://localhost:9443/t/tenant-domain/api/identity/user/v0.9/ - + AccountRecoveryRESTEndpointURL + https://localhost:9443/t/tenant-domain/api/identity/user/v1.0/ + @@ -90,6 +90,32 @@ /* + + ContentTypeBasedCachePreventionFilter + + org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter + + + patterns + "text/html" ,"application/json" ,"plain/text" + + + filterAction + enforce + + + httpHeaders + + Cache-Control: no-store, no-cache, must-revalidate, private + + + + + + ContentTypeBasedCachePreventionFilter + * + + org.wso2.carbon.identity.application.authentication.endpoint.util.listener.AuthenticationEndpointContextListener @@ -181,6 +207,21 @@ /registration.jsp + + consent.do + /consent.jsp + + + + cookie_policy.do + /cookie_policy.jsp + + + + privacy_policy.do + /privacy_policy.jsp + + retry.do /retry.do @@ -266,6 +307,21 @@ /claims.do + + consent.do + /consent.do + + + + cookie_policy.do + /cookie_policy.do + + + + privacy_policy.do + /privacy_policy.do + + java.lang.Throwable /generic-exception-response.jsp @@ -277,4 +333,4 @@ - + \ No newline at end of file From 309757603d2aaadb9c384581fc92fca3566db076 Mon Sep 17 00:00:00 2001 From: lasantha Date: Wed, 14 Mar 2018 19:48:40 +0530 Subject: [PATCH 03/12] Bump the APIM and carbon Kernel vrsions --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index cc07cc85..2916eb1d 100644 --- a/pom.xml +++ b/pom.xml @@ -1503,14 +1503,14 @@ 4.7.15 - 5.11.139 + 5.11.144 [5.2.0, 6.0.0) 5.3.7 5.2.5 5.4.4 5.2.5 - 5.6.53 + 5.6.60 5.1.3 5.1.8 5.1.5 @@ -1539,7 +1539,7 @@ 4.7.23 - 3.1.5 + 3.1.9 [3.1.0, 4.0.0) @@ -1549,7 +1549,7 @@ 4.1.1 - 6.2.170 + 6.2.190 (6.0.0,7.0.0] From 706f118bd37a12ee19108116ad201cab19f1c8f3 Mon Sep 17 00:00:00 2001 From: geethkokila Date: Wed, 14 Mar 2018 20:02:09 +0530 Subject: [PATCH 04/12] Update the scope validator --- modules/distribution/src/core/conf/identity/identity.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/distribution/src/core/conf/identity/identity.xml b/modules/distribution/src/core/conf/identity/identity.xml index b0417def..8622318a 100644 --- a/modules/distribution/src/core/conf/identity/identity.xml +++ b/modules/distribution/src/core/conf/identity/identity.xml @@ -252,8 +252,7 @@ - - + - 5.11.144 + 5.11.145 [5.2.0, 6.0.0) 5.3.7 5.2.5 5.4.4 5.2.5 - 5.6.60 + 5.6.61 5.1.3 5.1.8 5.1.5 @@ -1539,21 +1539,21 @@ 4.7.23 - 3.1.9 + 3.1.12 [3.1.0, 4.0.0) ${project.version} - 4.1.1 + 4.1.3-SNAPSHOT - 6.2.190 + 6.2.192 (6.0.0,7.0.0] - 4.6.61 + 4.6.62 5.1.33 From 8276ce7dce5184caa26512e3359645376ae0c371 Mon Sep 17 00:00:00 2001 From: lasantha Date: Thu, 15 Mar 2018 00:08:13 +0530 Subject: [PATCH 07/12] Fix Analytics startup issue --- .../src/analytics/bin/load-spark-env-vars.sh | 6 ++++++ modules/distribution/src/analytics/bin/wso2server.sh | 1 + pom.xml | 10 +++++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/distribution/src/analytics/bin/load-spark-env-vars.sh b/modules/distribution/src/analytics/bin/load-spark-env-vars.sh index 15a40f4c..d842449d 100755 --- a/modules/distribution/src/analytics/bin/load-spark-env-vars.sh +++ b/modules/distribution/src/analytics/bin/load-spark-env-vars.sh @@ -8,4 +8,10 @@ export SPARK_SCALA_VERSION=2.10 # *** jars will be added to the spark classpath in the code itself. check DAS-105 # export SPARK_CLASSPATH=`java -cp $CARBON_SPARK_HOME/repository/components/plugins/org.wso2.carbon.analytics.spark.utils*.jar org.wso2.carbon.analytics.spark.utils.ComputeClasspath $CARBON_HOME` # export SPARK_CLASSPATH=$SPARK_CLASSPATH:$(echo $CARBON_SPARK_HOME/repository/components/lib/*.jar | tr ' ' ':') +export carbon.config.dir.path=$CARBON_HOME/conf +export carbon.data.dir.path=$CARBON_HOME/repository/data +export carbon.internal.lib.dir.path=$CARBON_HOME/../lib +export carbon.external.lib.dir.path=$CARBON_HOME/../../lib +export carbon.dropins.dir.path=$CARBON_HOME/../../dropins +export components.repo=$CARBON_HOME/../components/plugins mkdir -p $CARBON_SPARK_HOME/lib_managed/jars \ No newline at end of file diff --git a/modules/distribution/src/analytics/bin/wso2server.sh b/modules/distribution/src/analytics/bin/wso2server.sh index 5681a3ba..6b46583e 100755 --- a/modules/distribution/src/analytics/bin/wso2server.sh +++ b/modules/distribution/src/analytics/bin/wso2server.sh @@ -340,6 +340,7 @@ do -Dcarbon.extensions.dir.path="$CARBON_HOME/../../extensions" \ -Dcarbon.dropins.dir.path="$CARBON_HOME/../../dropins" \ -Dcarbon.external.lib.dir.path="$CARBON_HOME/../../lib" \ + -Dcarbon.data.dir.path="$CARBON_HOME/data" \ -Dcarbon.patches.dir.path="$CARBON_HOME/../../patches" \ -Dcarbon.servicepacks.dir.path="$CARBON_HOME/../../servicepacks" \ -Dcarbon.internal.lib.dir.path="$CARBON_HOME/../lib" \ diff --git a/pom.xml b/pom.xml index 18fb5589..95d41798 100644 --- a/pom.xml +++ b/pom.xml @@ -1556,9 +1556,9 @@ 4.6.62 - 5.1.33 - 1.3.16 - 1.3.16 + 5.1.36 + 1.3.23 + 1.3.23 ${project.version} 3.1.0 3.1.0 @@ -1591,7 +1591,7 @@ 2.0.2 - 4.4.41 + 4.4.43 3.8.1.v20120830-144521 1.0.3 @@ -1643,7 +1643,7 @@ 2.8.2.wso2v1 2.0.0.wso2v1 2.0.7 - 2.1.19 + 2.1.22 [2.6.0,3.0.0) 2.3.4-spark From a224a9d16ad5d6aa23af7588da2b95fe63ca1a59 Mon Sep 17 00:00:00 2001 From: lasantha Date: Thu, 15 Mar 2018 00:14:04 +0530 Subject: [PATCH 08/12] Fix data folder path issue --- modules/distribution/src/analytics/bin/wso2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/distribution/src/analytics/bin/wso2server.sh b/modules/distribution/src/analytics/bin/wso2server.sh index 6b46583e..a7109e23 100755 --- a/modules/distribution/src/analytics/bin/wso2server.sh +++ b/modules/distribution/src/analytics/bin/wso2server.sh @@ -340,7 +340,7 @@ do -Dcarbon.extensions.dir.path="$CARBON_HOME/../../extensions" \ -Dcarbon.dropins.dir.path="$CARBON_HOME/../../dropins" \ -Dcarbon.external.lib.dir.path="$CARBON_HOME/../../lib" \ - -Dcarbon.data.dir.path="$CARBON_HOME/data" \ + -Dcarbon.data.dir.path="$CARBON_HOME/repository/data" \ -Dcarbon.patches.dir.path="$CARBON_HOME/../../patches" \ -Dcarbon.servicepacks.dir.path="$CARBON_HOME/../../servicepacks" \ -Dcarbon.internal.lib.dir.path="$CARBON_HOME/../lib" \ From 397cae3ed9907bcab14cf2a8c95ffe067f8c0337 Mon Sep 17 00:00:00 2001 From: lasantha Date: Thu, 15 Mar 2018 02:09:07 +0530 Subject: [PATCH 09/12] Modify load-spark-env-vars.sh and wso2server.sh In order to fix analytics spark isssue added environmental variables to the load-spark-env-vars.sh and wso2server.sh --- .../src/analytics/bin/load-spark-env-vars.sh | 12 ++++++------ modules/distribution/src/analytics/bin/wso2server.sh | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/distribution/src/analytics/bin/load-spark-env-vars.sh b/modules/distribution/src/analytics/bin/load-spark-env-vars.sh index d842449d..e9c6274c 100755 --- a/modules/distribution/src/analytics/bin/load-spark-env-vars.sh +++ b/modules/distribution/src/analytics/bin/load-spark-env-vars.sh @@ -5,13 +5,13 @@ echo 'Loading spark environment variables ' export CARBON_SPARK_HOME=$CARBON_HOME export _SPARK_ASSEMBLY=$CARBON_SPARK_HOME/../components/plugins/spark-core_2.10_*.wso2*.jar export SPARK_SCALA_VERSION=2.10 +export CARBON_CONFIG_DIR_PATH=$CARBON_HOME/conf +export CARBON_INTERNAL_LIB_DIR_PATH=$CARBON_HOME/../lib +export CARBON_EXTERNAL_LIB_DIR_PATH=$CARBON_HOME/../../lib +export CARBON_DROPINS_DIR_PATH=$CARBON_HOME/../../dropins +export COMPONENTS_REPO=$CARBON_HOME/../components/plugins +export CARBON_DATA_DIR_PATH=$CARBON_HOME/repository/data # *** jars will be added to the spark classpath in the code itself. check DAS-105 # export SPARK_CLASSPATH=`java -cp $CARBON_SPARK_HOME/repository/components/plugins/org.wso2.carbon.analytics.spark.utils*.jar org.wso2.carbon.analytics.spark.utils.ComputeClasspath $CARBON_HOME` # export SPARK_CLASSPATH=$SPARK_CLASSPATH:$(echo $CARBON_SPARK_HOME/repository/components/lib/*.jar | tr ' ' ':') -export carbon.config.dir.path=$CARBON_HOME/conf -export carbon.data.dir.path=$CARBON_HOME/repository/data -export carbon.internal.lib.dir.path=$CARBON_HOME/../lib -export carbon.external.lib.dir.path=$CARBON_HOME/../../lib -export carbon.dropins.dir.path=$CARBON_HOME/../../dropins -export components.repo=$CARBON_HOME/../components/plugins mkdir -p $CARBON_SPARK_HOME/lib_managed/jars \ No newline at end of file diff --git a/modules/distribution/src/analytics/bin/wso2server.sh b/modules/distribution/src/analytics/bin/wso2server.sh index a7109e23..22376557 100755 --- a/modules/distribution/src/analytics/bin/wso2server.sh +++ b/modules/distribution/src/analytics/bin/wso2server.sh @@ -315,6 +315,13 @@ CARBON_CLASSPATH="$CARBON_CLASSPATH":"$CARBON_HOME/../components/plugins/" #To monitor a Carbon server in remote JMX mode on linux host machines, set the below system property. # -Djava.rmi.server.hostname="your.IP.goes.here" +export CARBON_CONFIG_DIR_PATH="$CARBON_HOME/conf" +export CARBON_INTERNAL_LIB_DIR_PATH="$CARBON_HOME/../lib" +export CARBON_EXTERNAL_LIB_DIR_PATH="$CARBON_HOME/../../lib" +export CARBON_DROPINS_DIR_PATH="$CARBON_HOME/../../dropins" +export COMPONENTS_REPO="$CARBON_HOME/../components/plugins" +export CARBON_DATA_DIR_PATH="$CARBON_HOME/repository/data" + while [ "$status" = "$START_EXIT_STATUS" ] do $JAVACMD \ From b6be585c4adbefec502747c4a0239e180cb0e9fc Mon Sep 17 00:00:00 2001 From: lasantha Date: Thu, 15 Mar 2018 02:33:00 +0530 Subject: [PATCH 10/12] Bump Analytics version --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 95d41798..ef0584b5 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ modules/cxf-filters modules/p2-profile modules/distribution - modules/integration + @@ -1539,14 +1539,14 @@ 4.7.23 - 3.1.12 + 3.1.13 [3.1.0, 4.0.0) ${project.version} - 4.1.3-SNAPSHOT + 4.1.2 6.2.192 @@ -1557,8 +1557,8 @@ 5.1.36 - 1.3.23 - 1.3.23 + 1.3.25 + 1.3.25 ${project.version} 3.1.0 3.1.0 From 8e31f3c387476afedee6a2d5350091a695deddd4 Mon Sep 17 00:00:00 2001 From: lasantha Date: Thu, 15 Mar 2018 02:59:45 +0530 Subject: [PATCH 11/12] Bump carbon-analytics-common version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef0584b5..a8abf7da 100644 --- a/pom.xml +++ b/pom.xml @@ -1556,7 +1556,7 @@ 4.6.62 - 5.1.36 + 5.1.37 1.3.25 1.3.25 ${project.version} From 45af0265249aa961d1b9d189b4637d9d43320a6d Mon Sep 17 00:00:00 2001 From: lasantha Date: Thu, 15 Mar 2018 03:07:31 +0530 Subject: [PATCH 12/12] Bump siddhi version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a8abf7da..7c38ed3b 100644 --- a/pom.xml +++ b/pom.xml @@ -1643,7 +1643,7 @@ 2.8.2.wso2v1 2.0.0.wso2v1 2.0.7 - 2.1.22 + 2.1.23 [2.6.0,3.0.0) 2.3.4-spark