From 4f6bdf2a0dad1b4468cd664f18f042e28ca33051 Mon Sep 17 00:00:00 2001 From: geethkokila Date: Thu, 15 Mar 2018 21:59:17 +0530 Subject: [PATCH] Resolve conflicts and update the GDPR tool --- modules/distribution/src/assembly/bin.xml | 19 +++++++++++-------- modules/scripts/forget-me.bat | 2 +- modules/scripts/forget-me.sh | 2 +- pom.xml | 14 +++++++------- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index e1acdd5a..6ed28331 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -1524,13 +1524,13 @@ - target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/bin/forget-me + target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/bin/forgetme.sh ${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/bin/ 744 - target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/bin/forget-me.bat + target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/bin/forgetme.bat ${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/bin/ 744 @@ -1543,21 +1543,24 @@ - target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/conf/datasources/apim-datasources.xml - ${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/conf/datasources + target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/conf/datasources/sample-apim-datasources.xml + ${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/conf/datasources/ 744 + apim-datasources.xml - target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/conf/datasources/um-datasources.xml - ${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/conf/datasources + target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/conf/datasources/sample-um-datasources.xml + ${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/conf/datasources/ 744 + um-datasources.xml - target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/conf/datasources/cdm-datasources.xml - ${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/conf/datasources + target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/conf/datasources/sample-cdm-datasources.xml + ${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/conf/datasources/ 744 + iot-datasources.xml diff --git a/modules/scripts/forget-me.bat b/modules/scripts/forget-me.bat index 3d3c721f..80b7f746 100644 --- a/modules/scripts/forget-me.bat +++ b/modules/scripts/forget-me.bat @@ -37,4 +37,4 @@ +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 \ No newline at end of file + +call %CARBON_HOME%\wso2\tools\identity-anonymization-tool\bin\forgetme.bat \ No newline at end of file diff --git a/modules/scripts/forget-me.sh b/modules/scripts/forget-me.sh index 9740beae..28216a76 100644 --- a/modules/scripts/forget-me.sh +++ b/modules/scripts/forget-me.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 $@ \ No newline at end of file +sh $CARBON_HOME/wso2/tools/identity-anonymization-tool/bin/forgetme.sh -d $CARBON_HOME/wso2/tools/identity-anonymization-tool/conf $@ \ No newline at end of file diff --git a/pom.xml b/pom.xml index 49a9dd19..fc1f063f 100644 --- a/pom.xml +++ b/pom.xml @@ -1493,14 +1493,14 @@ 4.7.15 - 5.11.145 + 5.11.148 [5.2.0, 6.0.0) 5.3.7 5.2.5 - 5.4.4 - 5.2.5 - 5.6.61 + 5.4.6 + 5.2.6 + 5.6.63 5.1.3 5.1.8 5.1.5 @@ -1521,7 +1521,7 @@ 2.0.6 - 4.6.8 + 4.6.11 4.6.28 @@ -1529,7 +1529,7 @@ 4.7.23 - 3.1.14 + 3.1.15 [3.1.0, 4.0.0) @@ -1677,7 +1677,7 @@ 4.5.2 - 1.1.4 + 1.1.18 true 1.0.38