Merge pull request #1778 from lasanthaDLPDS/330-release

Modify load-spark-env-vars.sh and wso2server.sh

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

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 \

pom.xml

@@ -42,7 +42,7 @@
         <module>modules/cxf-filters</module>
         <module>modules/p2-profile</module>
         <module>modules/distribution</module>
-        <module>modules/integration</module>
+        <!--<module>modules/integration</module>-->
     </modules>
 
     <dependencyManagement>
@@ -1539,14 +1539,14 @@
         <carbon.governance.version>4.7.23</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.1.12</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.1.13</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>${project.version}</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-        <carbon.device.mgt.plugin.version>4.1.3-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>4.1.2</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.2.192</carbon.api.mgt.version>
@@ -1557,8 +1557,8 @@
 
         <!-- Carbon Analytics Common (DAS) -->
         <carbon.analytics.common.version>5.1.36</carbon.analytics.common.version>
-        <carbon.analytics.version>1.3.23</carbon.analytics.version>
-        <carbon.analytics.das.version>1.3.23</carbon.analytics.das.version>
+        <carbon.analytics.version>1.3.25</carbon.analytics.version>
+        <carbon.analytics.das.version>1.3.25</carbon.analytics.das.version>
         <product.iot.analytics.version>${project.version}</product.iot.analytics.version>
         <product.das.version>3.1.0</product.das.version>
         <product.mb.version>3.1.0</product.mb.version>