Merge pull request #494 from pcnfernando/master

Bumped forget-me tool and carbon analytics version
wso2 · Mar 8, 2018 · b524bbb · b524bbb
2 parents fe7e5b9 + af462c2
commit b524bbb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
@@ -351,25 +351,25 @@
 
         <!--Forget me tool-->
         <file>
-            <source>src/scripts/forget-me.sh</source>
+            <source>src/scripts/forgetme.sh</source>
             <outputDirectory>bin/</outputDirectory>
             <fileMode>744</fileMode>
         </file>
 
         <file>
-            <source>src/scripts/forget-me.bat</source>
+            <source>src/scripts/forgetme.bat</source>
             <outputDirectory>bin/</outputDirectory>
             <fileMode>744</fileMode>
         </file>
 
         <file>
-            <source>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/bin/forget-me</source>
+            <source>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/bin/forgetme.sh</source>
             <outputDirectory>wso2/tools/identity-anonymization-tool/bin/</outputDirectory>
             <fileMode>744</fileMode>
         </file>
 
         <file>
-            <source>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/bin/forget-me.bat</source>
+            <source>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/bin/forgetme.bat</source>
             <outputDirectory>wso2/tools/identity-anonymization-tool/bin/</outputDirectory>
             <fileMode>744</fileMode>
         </file>

diff --git a/...es/distribution/src/scripts/forget-me.bat → ...les/distribution/src/scripts/forgetme.bat b/...es/distribution/src/scripts/forget-me.bat → ...les/distribution/src/scripts/forgetme.bat
@@ -37,4 +37,4 @@ SET curDrive=%cd:~0,1%
 SET wsasDrive=%CARBON_HOME:~0,1%
 if not "%curDrive%" == "%wsasDrive%" %wsasDrive%:
 cd %CARBON_HOME%
-call %CARBON_HOME%\wso2\tools\identity-anonymization-tool\bin\forget-me.bat
+call %CARBON_HOME%\wso2\tools\identity-anonymization-tool\bin\forgetme.bat
diff --git a/...les/distribution/src/scripts/forget-me.sh → modules/distribution/src/scripts/forgetme.sh b/...les/distribution/src/scripts/forget-me.sh → modules/distribution/src/scripts/forgetme.sh
@@ -34,4 +34,4 @@ PRGDIR=`dirname "$PRG"`
 [ -z "$CARBON_HOME" ] && CARBON_HOME=`cd "$PRGDIR/.." ; pwd`
 
 cd $CARBON_HOME
-sh $CARBON_HOME/wso2/tools/identity-anonymization-tool/bin/forget-me -d $CARBON_HOME/wso2/tools/identity-anonymization-tool/conf $@
+sh $CARBON_HOME/wso2/tools/identity-anonymization-tool/bin/forgetme.sh -d $CARBON_HOME/wso2/tools/identity-anonymization-tool/conf $@
diff --git a/pom.xml b/pom.xml
@@ -870,8 +870,8 @@
 
     <properties>
 
-        <carbon.analytics.version>2.0.294</carbon.analytics.version>
-        <siddhi.version>4.1.7</siddhi.version>
+        <carbon.analytics.version>2.0.295</carbon.analytics.version>
+        <siddhi.version>4.1.12</siddhi.version>
 
         <carbon.analytics-common.version>6.0.55</carbon.analytics-common.version>
 
@@ -1016,7 +1016,7 @@
         <siddhi.io.wso2event.version>4.0.12</siddhi.io.wso2event.version>
         <siddhi.io.http.version>1.0.18</siddhi.io.http.version>
 
-        <siddhi.map.json.version>4.0.15</siddhi.map.json.version>
+        <siddhi.map.json.version>4.0.18</siddhi.map.json.version>
         <siddhi.map.wso2event.version>4.0.10</siddhi.map.wso2event.version>
         <siddhi.map.binary.version>1.0.10</siddhi.map.binary.version>
         <siddhi.map.text.version>1.0.13</siddhi.map.text.version>
@@ -1053,7 +1053,7 @@
         <wso2.log4j.version>1.2.17.wso2v1</wso2.log4j.version>
 
         <!-- Forget me tool -->
-        <forgetme.tool.version>1.1.3</forgetme.tool.version>
+        <forgetme.tool.version>1.1.8</forgetme.tool.version>
     </properties>
 
     <modules>