Merge pull request #6 from AnuGayan/master

Bump carbon-analytics version to 3.0.1
wso2 · Jul 18, 2019 · ef40d72 · ef40d72
2 parents a4f91fc + 9ac7151
commit ef40d72
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/.../carbon-home/bin/streaming-integrator.bat → ...s/distribution/carbon-home/bin/server.bat b/.../carbon-home/bin/streaming-integrator.bat → ...s/distribution/carbon-home/bin/server.bat
diff --git a/...n/carbon-home/bin/streaming-integrator.sh → ...es/distribution/carbon-home/bin/server.sh b/...n/carbon-home/bin/streaming-integrator.sh → ...es/distribution/carbon-home/bin/server.sh
diff --git a/modules/distribution/carbon-home/conf/server/deployment.yaml b/modules/distribution/carbon-home/conf/server/deployment.yaml
@@ -364,7 +364,7 @@ wso2.datasources:
       definition:
         type: RDBMS
         configuration:
-          jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/streaming-integrator/database/metrics;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;'
+          jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/metrics;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;'
           username: wso2carbon
           password: wso2carbon
           driverClassName: org.h2.Driver

diff --git a/modules/distribution/src/docker-distribution/filtered/Dockerfile b/modules/distribution/src/docker-distribution/filtered/Dockerfile
@@ -46,4 +46,4 @@ WORKDIR ${USER_HOME}
 EXPOSE 7443 7070 9717 9612 7711 7611
 
 # initiate container and execute the micro integrator product startup script
-ENTRYPOINT ["/home/wso2carbon/wso2-streaming-integrator/bin/streaming-integrator.sh"]
+ENTRYPOINT ["/home/wso2carbon/wso2-streaming-integrator/bin/server.sh"]
diff --git a/pom.xml b/pom.xml
@@ -801,8 +801,7 @@
         </pluginManagement>
     </build>
     <properties>
-        <!--Still Carbon analytics 3.0.0 has not released due to an issue in jenkins-->
-        <carbon.analytics.version>3.0.0</carbon.analytics.version>
+        <carbon.analytics.version>3.0.1</carbon.analytics.version>
         <siddhi.version>5.1.1</siddhi.version>
 
         <carbon.analytics-common.version>6.1.26</carbon.analytics-common.version>
@@ -832,7 +831,7 @@
         <carbon.kernel.package.import.version.range>[5.2.0, 6.0.0)</carbon.kernel.package.import.version.range>
         <carbon.kernel.pax.version>5.2.8</carbon.kernel.pax.version>
 
-        <carbon.deployment.version>5.2.0</carbon.deployment.version>
+        <carbon.deployment.version>5.2.1</carbon.deployment.version>
 
         <carbon.datasources.version>1.1.4</carbon.datasources.version>
         <carbon.metrics.version>2.3.8</carbon.metrics.version>