Merge pull request #12669 from dakshina99/tm_thread_blocking_config

JNDI2 Config Upgrade for the Broker Connect Timeout and Upgrade Andes and Broker Versions
wso2 · Oct 16, 2024 · a865212 · a865212
2 parents 654ffa4 + c67513a
commit a865212
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...eature/src/main/resources/conf_templates/templates/repository/conf/jndi2-cp.properties.j2 b/...eature/src/main/resources/conf_templates/templates/repository/conf/jndi2-cp.properties.j2
@@ -19,12 +19,12 @@
  #connectionfactory.TopicConnectionFactory = amqp://{{apim.throttling.jms.username}}:{{apim.throttling.jms.password}}@clientid/carbon?brokerlist='{{apim.throttling.throttle_decision_endpoints | join("?retries='5'%26connectdelay='50';")}}?retries='5'%26connectdelay='50';'
  {% if apim.event_hub.event_duplicate_url is defined %}
  {% if (apim.event_hub.jms.username is defined) and (apim.event_hub.jms.password is defined) %}
- connectionfactory.TopicConnectionFactory = amqp://{{apim.event_hub.jms.username}}:{{apim.event_hub.jms.password}}@clientid/carbon?brokerlist='{% for url in apim.event_hub.event_duplicate_url %}{{url}}?retries='5'%26connectdelay='50'{% if apim.event_hub.ssl is defined %}%26ssl='{{apim.event_hub.ssl}}'{% endif %};{% endfor %}'
+ connectionfactory.TopicConnectionFactory = amqp://{{apim.event_hub.jms.username}}:{{apim.event_hub.jms.password}}@clientid/carbon?brokerlist='{% for url in apim.event_hub.event_duplicate_url %}{{url}}{% if '?' in url %}%26{% else %}?{% endif %}retries='5'%26connectdelay='50'{% if apim.event_hub.ssl is defined %}%26ssl='{{apim.event_hub.ssl}}'{% endif %};{% endfor %}'
  {% else %}
- connectionfactory.TopicConnectionFactory = amqp://{{apim.event_hub.username}}:{{apim.event_hub.password}}@clientid/carbon?brokerlist='{% for url in apim.event_hub.event_duplicate_url %}{{url}}?retries='5'%26connectdelay='50'{% if apim.event_hub.ssl is defined %}%26ssl='{{apim.event_hub.ssl}}'{% endif %};{% endfor %}'
+ connectionfactory.TopicConnectionFactory = amqp://{{apim.event_hub.username}}:{{apim.event_hub.password}}@clientid/carbon?brokerlist='{% for url in apim.event_hub.event_duplicate_url %}{{url}}{% if '?' in url %}%26{% else %}?{% endif %}retries='5'%26connectdelay='50'{% if apim.event_hub.ssl is defined %}%26ssl='{{apim.event_hub.ssl}}'{% endif %};{% endfor %}'
  {% endif %}
  {% elif apim.throttling.event_duplicate_url is defined %}
- connectionfactory.TopicConnectionFactory = amqp://{{apim.throttling.jms.username}}:{{apim.throttling.jms.password}}@clientid/carbon?brokerlist='{% for url in apim.throttling.event_duplicate_url %}{{url}}?retries='5'%26connectdelay='50'{% if apim.throttling.jms.ssl is defined %}%26ssl='{{apim.throttling.jms.ssl}}'{% endif %};{% endfor %}'
+ connectionfactory.TopicConnectionFactory = amqp://{{apim.throttling.jms.username}}:{{apim.throttling.jms.password}}@clientid/carbon?brokerlist='{% for url in apim.throttling.event_duplicate_url %}{{url}}{% if '?' in url %}%26{% else %}?{% endif %}retries='5'%26connectdelay='50'{% if apim.throttling.jms.ssl is defined %}%26ssl='{{apim.throttling.jms.ssl}}'{% endif %};{% endfor %}'
  {% else %}
  connectionfactory.TopicConnectionFactory = amqp://{{apim.throttling.jms.username}}:{{apim.throttling.jms.password}}@clientid/carbon?brokerlist='tcp://${carbon.local.ip}:${jms.port}{% if apim.throttling.jms.ssl is defined %}?ssl='{{apim.throttling.jms.ssl}}'{% endif %}'
  {% endif %}

diff --git a/pom.xml b/pom.xml
@@ -2021,7 +2021,9 @@
  <carbon.apimgt.version>9.30.52-SNAPSHOT</carbon.apimgt.version>
  <carbon.apimgt.imp.pkg.version>[9.0.0, 10.0.0)</carbon.apimgt.imp.pkg.version>
 
- <carbon.analytics.common.version>5.3.14</carbon.analytics.common.version>
+
+ <carbon.analytics.common.version>5.3.15</carbon.analytics.common.version>
+
  <!-- Carbon kernel version -->
  <carbon.kernel.version>4.9.27-beta</carbon.kernel.version>
  <carbon.kernel.feature.version>${carbon.kernel.version}</carbon.kernel.feature.version>
@@ -2195,8 +2197,8 @@
  <fasterxml.jackson.version>2.17.2</fasterxml.jackson.version>
  <javax.validation-api>2.0.1.Final</javax.validation-api>
  <javax.inject.version>1</javax.inject.version>
- <carbon.broker.version>3.3.33</carbon.broker.version>
- <andes.version>3.3.29</andes.version>
+ <carbon.broker.version>3.3.35</carbon.broker.version>
+ <andes.version>3.3.33</andes.version>
  <waffle-jna.version>1.6.wso2v7</waffle-jna.version>
  <version.snake.yaml>2.2</version.snake.yaml>
  <wsdl4j.version>1.6.3.wso2v3</wsdl4j.version>