keycloak-uncached

diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml
index 3776340..f54c396 100755
--- a/dependencies/server-all/pom.xml
+++ b/dependencies/server-all/pom.xml
@@ -141,22 +141,6 @@
             <artifactId>mongo-java-driver</artifactId>
         </dependency>
 
-        <!-- export/import -->
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-export-import-zip</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>de.idyl</groupId>
-            <artifactId>winzipaes</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk16</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
index 32cd209..11f8141 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
@@ -21,7 +21,6 @@
             <module name="org.keycloak.keycloak-export-import-api" services="import"/>
             <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
             <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
-            <module name="org.keycloak.keycloak-export-import-zip" services="import"/>
             <module name="org.keycloak.keycloak-forms-common-freemarker" services="import"/>
             <module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
             <module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
index 122af6d..77ce3ad 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
@@ -31,7 +31,6 @@
         <module name="org.keycloak.keycloak-export-import-api" services="import"/>
         <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
         <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
-        <module name="org.keycloak.keycloak-export-import-zip" services="import"/>
         <module name="org.keycloak.keycloak-forms-common-freemarker" services="import"/>
         <module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
         <module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>

diff --git a/distribution/server-overlay/eap6/eap6-server-modules/build.xml b/distribution/server-overlay/eap6/eap6-server-modules/build.xml
index 3941fb9..2276471 100755
--- a/distribution/server-overlay/eap6/eap6-server-modules/build.xml
+++ b/distribution/server-overlay/eap6/eap6-server-modules/build.xml
@@ -278,15 +278,6 @@
             <maven-resource group="org.mongodb" artifact="mongo-java-driver"/>
         </module-def>
 
-        <!-- export/import -->
-
-        <module-def name="org.keycloak.keycloak-export-import-zip">
-            <maven-resource group="org.keycloak" artifact="keycloak-export-import-zip"/>
-        </module-def>
-        <module-def name="de.idyl.winzipaes">
-            <maven-resource group="de.idyl" artifact="winzipaes"/>
-        </module-def>
-
         <module-def name="org.liquibase">
             <maven-resource group="org.liquibase" artifact="liquibase-core"/>
         </module-def>

diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-as7-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-as7-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
index 32cd209..11f8141 100755
--- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-as7-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
+++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-as7-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
@@ -21,7 +21,6 @@
             <module name="org.keycloak.keycloak-export-import-api" services="import"/>
             <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
             <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
-            <module name="org.keycloak.keycloak-export-import-zip" services="import"/>
             <module name="org.keycloak.keycloak-forms-common-freemarker" services="import"/>
             <module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
             <module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>

diff --git a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml
index 75e1181..44703f8 100755
--- a/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml
+++ b/distribution/server-overlay/eap6/eap6-server-modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml
@@ -31,7 +31,6 @@
         <module name="org.keycloak.keycloak-export-import-api" services="import"/>
         <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
         <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
-        <module name="org.keycloak.keycloak-export-import-zip" services="import"/>
         <module name="org.keycloak.keycloak-forms-common-freemarker" services="import"/>
         <module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
         <module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>

diff --git a/distribution/server-overlay/wf9-server-overlay/assembly.xml b/distribution/server-overlay/wf9-server-overlay/assembly.xml
index fc44079..080671d 100755
--- a/distribution/server-overlay/wf9-server-overlay/assembly.xml
+++ b/distribution/server-overlay/wf9-server-overlay/assembly.xml
@@ -14,7 +14,6 @@
             <outputDirectory>modules/system/layers/base</outputDirectory>
             <includes>
                 <include>com/google/zxing/**</include>
-                <include>de/idyl/winzipaes/**</include>
                 <include>org/freemarker/**</include>
                 <include>org/keycloak/**</include>
                 <include>org/liquibase/**</include>

diff --git a/docbook/auth-server-docs/reference/en/en-US/modules/export-import.xml b/docbook/auth-server-docs/reference/en/en-US/modules/export-import.xml
index 492a847..fbd6016 100755
--- a/docbook/auth-server-docs/reference/en/en-US/modules/export-import.xml
+++ b/docbook/auth-server-docs/reference/en/en-US/modules/export-import.xml
@@ -8,12 +8,11 @@
     <para>
         You can export/import your database either to:
         <itemizedlist>
-            <listitem>Encrypted ZIP file on local filesystem</listitem>
             <listitem>Directory on local filesystem</listitem>
             <listitem>Single JSON file on your filesystem</listitem>
         </itemizedlist>
 
-        When importing using the "dir" or "zip" strategies, note that the files need to follow the naming convention specified below.
+        When importing using the "dir" strategy, note that the files need to follow the naming convention specified below.
         If you are importing files which were previously exported, the files already follow this convention.
         <itemizedlist>
             <listitem>{REALM_NAME}-realm.json, such as "acme-roadrunner-affairs-realm.json" for the realm named "acme-roadrunner-affairs"</listitem>
@@ -21,27 +20,11 @@
         </itemizedlist>
     </para>
     <para>
-        Encrypted ZIP is recommended as export contains many sensitive informations like passwords of your users (even if they are hashed),
-        but also their email addresses, and especially private keys of the realms. Directory and Single JSON file are useful especially
-        for testing as data in the files are not protected. On the other hand, it's useful if you want to look at all your data in JSON
-        files directly.
-    </para>
-    <para>
-        If you import to ZIP or Directory, you can specify also the number of users to be stored in each JSON file. So if you have
+        If you import to Directory, you can specify also the number of users to be stored in each JSON file. So if you have
         very large amount of users in your database, you likely don't want to import them into single file as the file might be very big.
         Processing of each file is done in separate transaction as exporting/importing all users at once could also lead to memory issues.
     </para>
     <para>
-        So to export the content of your Keycloak database into encrypted ZIP, you can execute Keycloak server with the System properties like:
-        <programlisting><![CDATA[
-bin/standalone.sh -Dkeycloak.migration.action=export
--Dkeycloak.migration.provider=zip -Dkeycloak.migration.zipFile=<FILE TO EXPORT TO>
--Dkeycloak.migration.zipPassword=<PASSWORD TO DECRYPT EXPORT>
-]]></programlisting>
-        Then you can move or copy the encrypted ZIP file into second environment and you can trigger import from it into Keycloak server with the same command but use
-        <literal>-Dkeycloak.migration.action=import</literal> instead of <literal>export</literal> .
-    </para>
-    <para>
         To export into unencrypted directory you can use:
         <programlisting><![CDATA[
 bin/standalone.sh -Dkeycloak.migration.action=export
@@ -80,7 +63,7 @@ bin/standalone.sh -Dkeycloak.migration.action=import
                 <term>-Dkeycloak.migration.usersExportStrategy</term>
                 <listitem>
                     <para>
-                        can be used to specify for ZIP or Directory providers to specify where to import users.
+                        can be used to specify for Directory providers to specify where to import users.
                         Possible values are:
                         <itemizedlist>
                             <listitem>DIFFERENT_FILES - Users will be exported into more different files according to maximum number of users per file. This is default value</listitem>

diff --git a/export-import/pom.xml b/export-import/pom.xml
index 35a6f0b..2c7026c 100755
--- a/export-import/pom.xml
+++ b/export-import/pom.xml
@@ -18,7 +18,6 @@
         <module>export-import-api</module>
         <module>export-import-dir</module>
         <module>export-import-single-file</module>
-        <module>export-import-zip</module>
     </modules>
 
 </project>

diff --git a/pom.xml b/pom.xml
index 65968cb..e5f7d4a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,6 @@
         <servlet.api.30.version>1.0.2.Final</servlet.api.30.version>
         <google.zxing.version>3.2.1</google.zxing.version>
         <github.relaxng.version>2011.1</github.relaxng.version>
-        <winzipaes.version>1.0.1</winzipaes.version>
         <freemarker.version>2.3.23</freemarker.version>
         <twitter4j.version>4.0.4</twitter4j.version>
         <selenium.version>2.35.0</selenium.version>
@@ -373,13 +372,6 @@
                 <scope>test</scope>
             </dependency>
 
-            <!-- Encrypted ZIP -->
-            <dependency>
-                <groupId>de.idyl</groupId>
-                <artifactId>winzipaes</artifactId>
-                <version>${winzipaes.version}</version>
-            </dependency>
-
             <!-- Apache DS -->
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
@@ -702,11 +694,6 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-export-import-zip</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-kerberos-federation</artifactId>
                 <version>${project.version}</version>
             </dependency>

diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
index 84557d9..1fc4fc2 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
@@ -10,7 +10,6 @@ import org.keycloak.exportimport.ExportImportConfig;
 import org.keycloak.exportimport.dir.DirExportProvider;
 import org.keycloak.exportimport.dir.DirExportProviderFactory;
 import org.keycloak.exportimport.singlefile.SingleFileExportProviderFactory;
-import org.keycloak.exportimport.zip.ZipExportProviderFactory;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.RealmProvider;
@@ -217,30 +216,6 @@ public class ExportImportTest {
         }
     }
 
-    @Test
-    public void testZipFullExportImport() throws Throwable {
-        ExportImportConfig.setProvider(ZipExportProviderFactory.PROVIDER_ID);
-        String zipFilePath = getExportImportTestDirectory() + File.separator + "export-full.zip";
-        new File(zipFilePath).delete();
-        ExportImportConfig.setZipFile(zipFilePath);
-        ExportImportConfig.setZipPassword("encPassword");
-        ExportImportConfig.setUsersPerFile(ExportImportConfig.DEFAULT_USERS_PER_FILE);
-
-        testFullExportImport();
-    }
-
-    @Test
-    public void testZipRealmExportImport() throws Throwable {
-        ExportImportConfig.setProvider(ZipExportProviderFactory.PROVIDER_ID);
-        String zipFilePath = getExportImportTestDirectory() + File.separator + "export-realm.zip";
-        new File(zipFilePath).delete();
-        ExportImportConfig.setZipFile(zipFilePath);
-        ExportImportConfig.setZipPassword("encPassword");
-        ExportImportConfig.setUsersPerFile(3);
-
-        testRealmExportImport();
-    }
-
     private void testFullExportImport() {
         ExportImportConfig.setAction(ExportImportConfig.ACTION_EXPORT);
         ExportImportConfig.setRealmName(null);