rajitha
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts and update the GDPR tool

Browse Source
application-manager-new
geethkokila 7 years ago
parent c1ec8e541f
commit 4f6bdf2a0d
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File

19
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -1524,13 +1524,13 @@
<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>${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/bin/</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/bin/</outputDirectory>
<fileMode>744</fileMode> <fileMode>744</fileMode>
</file> </file>
<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>${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/bin/</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/bin/</outputDirectory>
<fileMode>744</fileMode> <fileMode>744</fileMode>
</file> </file>
@ -1543,21 +1543,24 @@
</file> </file>
<file> <file>
<source>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/conf/datasources/apim-datasources.xml</source> <source>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/conf/datasources/sample-apim-datasources.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/conf/datasources</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/conf/datasources/</outputDirectory>
<fileMode>744</fileMode> <fileMode>744</fileMode>
<destName>apim-datasources.xml</destName>
</file> </file>
<file> <file>
<source>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/conf/datasources/um-datasources.xml</source> <source>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/conf/datasources/sample-um-datasources.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/conf/datasources</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/conf/datasources/</outputDirectory>
<fileMode>744</fileMode> <fileMode>744</fileMode>
<destName>um-datasources.xml</destName>
</file> </file>
<file> <file>
<source>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/conf/datasources/cdm-datasources.xml</source> <source>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/conf/datasources/sample-cdm-datasources.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/conf/datasources</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/wso2/tools/identity-anonymization-tool/conf/datasources/</outputDirectory>
<fileMode>744</fileMode> <fileMode>744</fileMode>
<destName>iot-datasources.xml</destName>
</file> </file>
<file> <file>

2
modules/scripts/forget-me.bat
Unescape View File

@ -37,4 +37,4 @@
+SET wsasDrive=%CARBON_HOME:~0,1% +SET wsasDrive=%CARBON_HOME:~0,1%
+if not "%curDrive%" == "%wsasDrive%" %wsasDrive%: +if not "%curDrive%" == "%wsasDrive%" %wsasDrive%:
+cd %CARBON_HOME% +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

2
modules/scripts/forget-me.sh
Unescape View File

@ -34,4 +34,4 @@ PRGDIR=`dirname "$PRG"`
[ -z "$CARBON_HOME" ] && CARBON_HOME=`cd "$PRGDIR/.." ; pwd` [ -z "$CARBON_HOME" ] && CARBON_HOME=`cd "$PRGDIR/.." ; pwd`
cd $CARBON_HOME 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 $@

14
pom.xml
Unescape View File

@ -1493,14 +1493,14 @@
<carbon.deployment.version>4.7.15</carbon.deployment.version> <carbon.deployment.version>4.7.15</carbon.deployment.version>
<!-- Carbon Identity --> <!-- Carbon Identity -->
<carbon.identity.framework.version>5.11.145</carbon.identity.framework.version> <carbon.identity.framework.version>5.11.148</carbon.identity.framework.version>
<carbon.identity.framework.version.range>[5.2.0, 6.0.0) <carbon.identity.framework.version.range>[5.2.0, 6.0.0)
</carbon.identity.framework.version.range> </carbon.identity.framework.version.range>
<identity.local.auth.basicauth.version>5.3.7</identity.local.auth.basicauth.version> <identity.local.auth.basicauth.version>5.3.7</identity.local.auth.basicauth.version>
<identity.inbound.auth.openid.version>5.2.5</identity.inbound.auth.openid.version> <identity.inbound.auth.openid.version>5.2.5</identity.inbound.auth.openid.version>
<identity.inbound.auth.saml.version>5.4.4</identity.inbound.auth.saml.version> <identity.inbound.auth.saml.version>5.4.6</identity.inbound.auth.saml.version>
<identity.carbon.auth.saml2.version>5.2.5</identity.carbon.auth.saml2.version> <identity.carbon.auth.saml2.version>5.2.6</identity.carbon.auth.saml2.version>
<identity.inbound.auth.oauth.version>5.6.61</identity.inbound.auth.oauth.version> <identity.inbound.auth.oauth.version>5.6.63</identity.inbound.auth.oauth.version>
<identity.carbon.auth.mutual.ssl.version>5.1.3</identity.carbon.auth.mutual.ssl.version> <identity.carbon.auth.mutual.ssl.version>5.1.3</identity.carbon.auth.mutual.ssl.version>
<identity.user.ws.version>5.1.8</identity.user.ws.version> <identity.user.ws.version>5.1.8</identity.user.ws.version>
<identity.outbound.auth.requestpath.basicauth.version>5.1.5</identity.outbound.auth.requestpath.basicauth.version> <identity.outbound.auth.requestpath.basicauth.version>5.1.5</identity.outbound.auth.requestpath.basicauth.version>
@ -1521,7 +1521,7 @@
<org.wso2.carbon.database.utils.version>2.0.6</org.wso2.carbon.database.utils.version> <org.wso2.carbon.database.utils.version>2.0.6</org.wso2.carbon.database.utils.version>
<!-- Carbon Multi-tenancy --> <!-- Carbon Multi-tenancy -->
<carbon.multitenancy.version>4.6.8</carbon.multitenancy.version> <carbon.multitenancy.version>4.6.11</carbon.multitenancy.version>
<!-- Carbon Registry --> <!-- Carbon Registry -->
<carbon.registry.version>4.6.28</carbon.registry.version> <carbon.registry.version>4.6.28</carbon.registry.version>
@ -1529,7 +1529,7 @@
<carbon.governance.version>4.7.23</carbon.governance.version> <carbon.governance.version>4.7.23</carbon.governance.version>
<!-- Carbon Device Management--> <!-- Carbon Device Management-->
<carbon.device.mgt.version>3.1.14</carbon.device.mgt.version> <carbon.device.mgt.version>3.1.15</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
@ -1677,7 +1677,7 @@
<apache.httpclient.version>4.5.2</apache.httpclient.version> <apache.httpclient.version>4.5.2</apache.httpclient.version>
<!--Forget me tool version--> <!--Forget me tool version-->
<forgetme.tool.version>1.1.4</forgetme.tool.version> <forgetme.tool.version>1.1.18</forgetme.tool.version>
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>
<identity.governance.version>1.0.38</identity.governance.version> <identity.governance.version>1.0.38</identity.governance.version>

Write Preview
Loading…
Cancel
Save