Skip to content

Commit

Permalink
Merge pull request #212 from wso2/master_temp
Browse files Browse the repository at this point in the history 
Bump siddhi and carbon analytics versions
  • Loading branch information
@AnuGayan
AnuGayan authored Mar 28, 2022
2 parents 6720516 + a60ebd0 commit 05e1bb3
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 18 deletions.
32 changes: 16 additions & 16 deletions modules/distribution/carbon-home/LICENSE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ gson-2.8.5.jar
pax-logging-log4j2-1.11.13.jar bundle apache2
org.eclipse.equinox.preferences_3.6.0.v20160120-1756.jar bundle epl1
jaxrs-delegates_2.8.5.jar bundle apache2
org.wso2.carbon.siddhi.editor.core_3.0.60.jar bundle apache2
org.wso2.carbon.siddhi.editor.core_3.0.61.jar bundle apache2
com.fasterxml.jackson.core.jackson-databind_2.9.10.8.jar bundle apache2
org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar bundle epl1
org.apache.felix.gogo.runtime_0.10.0.v201209301036.jar bundle apache2
Expand All @@ -75,27 +75,27 @@ org.eclipse.equinox.frameworkadmin.equinox_1.0.700.v20160102-2223.jar
org.apache.james.apache-mime4j-core_0.7.2.jar bundle apache2
org.apache.commons.lang3_3.3.2.jar bundle apache2
org.wso2.carbon.uiserver_1.0.6.jar bundle apache2
org.wso2.carbon.business.rules.core_3.0.60.jar bundle apache2
org.wso2.carbon.business.rules.core_3.0.61.jar bundle apache2
org.wso2.carbon.datasource.core_1.1.11.jar bundle apache2
slf4j.api_1.7.12.jar bundle mit
org.wso2.carbon.config_2.1.16.jar bundle apache2
org.apache.felix.gogo.shell_0.10.0.v201212101605.jar bundle apache2
siddhi-query-api_5.1.23.jar bundle apache2
siddhi-query-api_5.1.24.jar bundle apache2
com.zaxxer.HikariCP_3.3.1.jar bundle apache2
siddhi-query-compiler_5.1.23.jar bundle apache2
siddhi-query-compiler_5.1.24.jar bundle apache2
org.wso2.carbon.metrics.jdbc.reporter_2.3.15.jar bundle apache2
org.eclipse.equinox.common_3.8.0.v20160509-1230.jar bundle epl1
org.wso2.carbon.jndi_1.0.5.jar bundle apache2
com.fasterxml.jackson.core.jackson-annotations_2.9.10.jar bundle apache2
com.google.gson_2.2.4.jar bundle apache2
commons-io_2.7.0.wso2v1.jar bundle apache2
org.wso2.carbon.databridge.commons.thrift_6.1.59.jar bundle apache2
org.wso2.carbon.event.simulator.core_3.0.60.jar bundle apache2
org.wso2.carbon.event.simulator.core_3.0.61.jar bundle apache2
org.wso2.carbon.database.query.manager_6.1.59.jar bundle apache2
generex_1.0.0.wso2v1.jar bundle apache2
org.apache.ws.commons.axiom.axiom-impl_1.2.20.jar bundle apache2
okhttp_3.8.0.wso2v2.jar bundle apache2
org.wso2.carbon.si.metrics.core_3.0.60.jar bundle apache2
org.wso2.carbon.si.metrics.core_3.0.61.jar bundle apache2
org.wso2.carbon.secvault_5.0.16.jar bundle apache2
org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar bundle epl1
io.netty.resolver_4.1.74.Final.jar bundle apache2
Expand Down Expand Up @@ -123,39 +123,39 @@ io.netty.buffer_4.1.74.Final.jar
disruptor_3.4.2.wso2v1.jar bundle apache2
io.netty.codec-socks_4.1.74.Final.jar bundle apache2
encoder_1.2.0.wso2v2.jar bundle apache2
siddhi-core_5.1.23.jar bundle apache2
siddhi-core_5.1.24.jar bundle apache2
org.wso2.carbon.caching_1.1.3.jar bundle apache2
siddhi-annotations_5.1.23.jar bundle apache2
siddhi-annotations_5.1.24.jar bundle apache2
org.wso2.carbon.utils_2.1.1.jar bundle apache2
jaxen_1.1.6.jar bundle apache2
io.netty.codec_4.1.74.Final.jar bundle apache2
javassist_3.19.0.GA.jar bundle apache2 + lgpl2 + mpl11
org.apache.commons.lang3_3.4.0.jar bundle apache2
disruptor_3.3.2.wso2v2.jar bundle apache2
org.wso2.carbon.analytics.auth.rest.api_3.0.60.jar bundle apache2
org.wso2.carbon.analytics.auth.rest.api_3.0.61.jar bundle apache2
org.wso2.carbon.databridge.receiver.thrift_6.1.59.jar bundle apache2
io.swagger.jaxrs_1.5.16.jar bundle apache2
org.eclipse.osgi_3.11.0.v20160603-1336.jar bundle epl1
org.wso2.carbon.permissions.rest.api_3.0.60.jar bundle apache2
org.wso2.carbon.permissions.rest.api_3.0.61.jar bundle apache2
org.wso2.carbon.databridge.commons_6.1.59.jar bundle apache2
com.h2database_2.1.210.jar bundle epl1 + mpl20
org.yaml.snakeyaml_1.19.0.jar bundle apache2
io.swagger.core_1.5.16.jar bundle apache2
javax.servlet-api_3.1.0.jar bundle cddl1
com.google.guava_20.0.0.jar bundle apache2
org.wso2.carbon.siddhi.extensions.installer.core_3.0.60.jar bundle apache2
org.wso2.carbon.siddhi.extensions.installer.core_3.0.61.jar bundle apache2
commons-pool_1.5.6.wso2v1.jar bundle apache2
org.wso2.carbon.deployment.engine_5.2.2.jar bundle apache2
antlr4-runtime_4.7.2.wso2v1.jar bundle bsd
org.wso2.carbon.analytics.msf4j.interceptor.common_3.0.60.jar bundle apache2
org.wso2.carbon.analytics.msf4j.interceptor.common_3.0.61.jar bundle apache2
handlebars_4.0.7.wso2v1.jar bundle apache2
org.wso2.carbon.metrics.das.reporter_2.3.15.jar bundle apache2
org.wso2.carbon.databridge.commons.binary_6.1.59.jar bundle apache2
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml_2.9.10.jar bundle apache2
org.eclipse.equinox.frameworkadmin_2.0.300.v20160504-1450.jar bundle epl1
msf4j-analytics_2.8.5.jar bundle apache2
io.netty.tcnative-boringssl-static_2.0.45.Final.jar bundle apache2
org.wso2.carbon.business.rules.templates.editor.core_3.0.60.jar bundle apache2
org.wso2.carbon.business.rules.templates.editor.core_3.0.61.jar bundle apache2
com.fasterxml.jackson.core.jackson-core_2.9.10.jar bundle apache2
org.wso2.carbon.metrics.jdbc.core_2.3.15.jar bundle apache2
org.apache.servicemix.bundles.commons-beanutils_1.8.3.2.jar bundle apache2
Expand All @@ -172,10 +172,10 @@ org.wso2.carbon.extensions.touchpoint_1.1.1.jar
org.eclipse.equinox.console_1.1.200.v20150929-1405.jar bundle epl1
org.apache.felix.gogo.command_0.10.0.v201209301215.jar bundle apache2
org.wso2.carbon.metrics.das.core_2.3.15.jar bundle apache2
org.wso2.carbon.streaming.integrator.common_3.0.60.jar bundle apache2
org.wso2.carbon.streaming.integrator.common_3.0.61.jar bundle apache2
org.wso2.carbon.databridge.core_6.1.59.jar bundle apache2
io.netty.codec-http2_4.1.74.Final.jar bundle apache2
org.wso2.carbon.editor.log.appender_3.0.60.jar bundle apache2
org.wso2.carbon.editor.log.appender_3.0.61.jar bundle apache2
quartz_2.3.0.wso2v2.jar bundle apache2
com.google.gson_2.8.5.jar bundle apache2
io.swagger.annotations_1.5.16.jar bundle apache2
Expand All @@ -188,7 +188,7 @@ msf4j-swagger_2.8.5.jar
reflections_0.9.11.wso2v1.jar bundle bsd
io.netty.common_4.1.74.Final.jar bundle apache2
javax.annotation-api_1.3.2.jar bundle cddl1
org.wso2.carbon.siddhi.store.api.rest_3.0.60.jar bundle apache2
org.wso2.carbon.siddhi.store.api.rest_3.0.61.jar bundle apache2
json_3.0.0.wso2v1.jar bundle apache2
org.eclipse.equinox.simpleconfigurator.manipulator_2.0.200.v20160504-1450.jar bundle epl1
org.yaml.snakeyaml_1.23.0.jar bundle apache2
Expand Down
2 changes: 2 additions & 0 deletions modules/distribution/carbon-home/runtime/server/carbon.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ set JAVA_ENDORSED="%CARBON_HOME%\bin\bootstrap\endorsed";"%JAVA_HOME%\jre\lib\en
if %jver% LSS 11000 set JAVA_VER_BASED_OPTS="-Djava.endorsed.dirs=%JAVA_ENDORSED_DIRS%"

set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%RUNTIME_HOME%\logs\heap-dump.hprof" -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% %JAVA_VER_BASED_OPTS% -Dcarbon.home="%CARBON_HOME%" -Dwso2.runtime.path="%RUNTIME_HOME%" -Dwso2.runtime="%RUNTIME%" -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -Djavax.net.ssl.keyStore="%CARBON_HOME%\resources\security\wso2carbon.jks" -Djavax.net.ssl.keyStorePassword="wso2carbon" -Djavax.net.ssl.trustStore="%CARBON_HOME%\resources\security\client-truststore.jks" -Djavax.net.ssl.trustStorePassword="wso2carbon"
set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.ops4j.pax.logging.logReaderEnabled="false"
set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.ops4j.pax.logging.eventAdminEnabled="false"

:runJava
echo JAVA_HOME environment variable is set to %JAVA_HOME%
Expand Down
2 changes: 2 additions & 0 deletions modules/distribution/carbon-home/runtime/server/carbon.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,8 @@ do
-Djavax.net.ssl.keyStorePassword="wso2carbon" \
-Djavax.net.ssl.trustStore="$CARBON_HOME/resources/security/client-truststore.jks" \
-Djavax.net.ssl.trustStorePassword="wso2carbon" \
-Dorg.ops4j.pax.logging.logReaderEnabled=false \
-Dorg.ops4j.pax.logging.eventAdminEnabled=false \
org.wso2.carbon.launcher.Main $*
status=$?
done
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -903,8 +903,8 @@
</pluginManagement>
</build>
<properties>
<carbon.analytics.version>3.0.60</carbon.analytics.version>
<siddhi.version>5.1.23</siddhi.version>
<carbon.analytics.version>3.0.61</carbon.analytics.version>
<siddhi.version>5.1.24</siddhi.version>

<carbon.analytics-common.version>6.1.59</carbon.analytics-common.version>
<!-- Maven plugins -->
Expand Down

0 comments on commit 05e1bb3

Please sign in to comment.