keycloak-uncached

diff --git a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
index 20dcf46..f100148 100644
--- a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
+++ b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
@@ -120,7 +120,6 @@ public class KeycloakApplication extends Application {
             ResteasyProviderFactory.pushContext(KeycloakApplication.class, this); // for injection
             context.setAttribute(KeycloakSessionFactory.class.getName(), this.sessionFactory);
 
-            singletons.add(new ServerVersionResource());
             singletons.add(new RobotsResource());
             singletons.add(new RealmsResource());
             singletons.add(new AdminRoot());

diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java
index a2ec8bb..c729a8a 100755
--- a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java
+++ b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java
@@ -184,11 +184,6 @@ public class AdapterTest {
     }
 
     @Test
-    public void testVersion() throws Exception {
-        testStrategy.testVersion();
-    }
-
-    @Test
     public void testAuthenticated() throws Exception {
         testStrategy.testAuthenticated();
     }

diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java
index b99ed06..9f84599 100755
--- a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java
+++ b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java
@@ -587,28 +587,7 @@ public class AdapterTestStrategy extends ExternalResource {
         client.close();
 
     }
-
-    public void testVersion() throws Exception {
-        Client client = ClientBuilder.newClient();
-        WebTarget target = client.target(AUTH_SERVER_URL).path("version");
-        VersionRepresentation version = target.request().get(VersionRepresentation.class);
-        Assert.assertNotNull(version);
-        Assert.assertNotNull(version.getVersion());
-        Assert.assertNotNull(version.getBuildTime());
-        Assert.assertNotEquals(version.getVersion(), Version.UNKNOWN);
-        Assert.assertNotEquals(version.getBuildTime(), Version.UNKNOWN);
-
-        VersionRepresentation version2 = client.target(APP_SERVER_BASE_URL + "/secure-portal").path(AdapterConstants.K_VERSION).request().get(VersionRepresentation.class);
-        Assert.assertNotNull(version2);
-        Assert.assertNotNull(version2.getVersion());
-        Assert.assertNotNull(version2.getBuildTime());
-        Assert.assertEquals(version.getVersion(), version2.getVersion());
-        Assert.assertEquals(version.getBuildTime(), version2.getBuildTime());
-        client.close();
-
-    }
-
-
+    
     public void testAuthenticated() throws Exception {
         // test login to customer-portal which does a bearer request to customer-db
         driver.navigate().to(APP_SERVER_BASE_URL + "/secure-portal");

diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/FilterAdapterTest.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/FilterAdapterTest.java
index 17531a0..8b7e6ff 100755
--- a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/FilterAdapterTest.java
+++ b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/adapter/FilterAdapterTest.java
@@ -153,11 +153,6 @@ public class FilterAdapterTest {
         testStrategy.testBadUser();
     }
 
-    @Test
-    public void testVersion() throws Exception {
-        testStrategy.testVersion();
-    }
-
     /*
       Don't need to test this because HttpServletRequest.authenticate doesn't make sense with filter implementation
 

diff --git a/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/Jetty8Test.java b/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/Jetty8Test.java
index 08c55ea..23f95ec 100755
--- a/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/Jetty8Test.java
+++ b/testsuite/jetty/jetty81/src/test/java/org/keycloak/testsuite/Jetty8Test.java
@@ -148,12 +148,6 @@ public class Jetty8Test {
         testStrategy.testBadUser();
     }
 
-    @Test
-    public void testVersion() throws Exception {
-        testStrategy.testVersion();
-    }
-
-
     /**
      * KEYCLOAK-732
      *

diff --git a/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/Jetty9Test.java b/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/Jetty9Test.java
index 4876b3b..6e3a2ac 100755
--- a/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/Jetty9Test.java
+++ b/testsuite/jetty/jetty91/src/test/java/org/keycloak/testsuite/Jetty9Test.java
@@ -154,12 +154,6 @@ public class Jetty9Test {
         testStrategy.testBadUser();
     }
 
-    @Test
-    public void testVersion() throws Exception {
-        testStrategy.testVersion();
-    }
-
-
     /**
      * KEYCLOAK-732
      *

diff --git a/testsuite/jetty/jetty92/src/test/java/org/keycloak/testsuite/Jetty9Test.java b/testsuite/jetty/jetty92/src/test/java/org/keycloak/testsuite/Jetty9Test.java
index bd53150..0311063 100755
--- a/testsuite/jetty/jetty92/src/test/java/org/keycloak/testsuite/Jetty9Test.java
+++ b/testsuite/jetty/jetty92/src/test/java/org/keycloak/testsuite/Jetty9Test.java
@@ -154,12 +154,6 @@ public class Jetty9Test {
         testStrategy.testBadUser();
     }
 
-    @Test
-    public void testVersion() throws Exception {
-        testStrategy.testVersion();
-    }
-
-
     /**
      * KEYCLOAK-732
      *

diff --git a/testsuite/jetty/jetty93/src/test/java/org/keycloak/testsuite/Jetty9Test.java b/testsuite/jetty/jetty93/src/test/java/org/keycloak/testsuite/Jetty9Test.java
index bd53150..0311063 100644
--- a/testsuite/jetty/jetty93/src/test/java/org/keycloak/testsuite/Jetty9Test.java
+++ b/testsuite/jetty/jetty93/src/test/java/org/keycloak/testsuite/Jetty9Test.java
@@ -154,12 +154,6 @@ public class Jetty9Test {
         testStrategy.testBadUser();
     }
 
-    @Test
-    public void testVersion() throws Exception {
-        testStrategy.testVersion();
-    }
-
-
     /**
      * KEYCLOAK-732
      *

diff --git a/testsuite/jetty/jetty94/src/test/java/org/keycloak/testsuite/Jetty9Test.java b/testsuite/jetty/jetty94/src/test/java/org/keycloak/testsuite/Jetty9Test.java
index bd53150..0311063 100644
--- a/testsuite/jetty/jetty94/src/test/java/org/keycloak/testsuite/Jetty9Test.java
+++ b/testsuite/jetty/jetty94/src/test/java/org/keycloak/testsuite/Jetty9Test.java
@@ -154,12 +154,6 @@ public class Jetty9Test {
         testStrategy.testBadUser();
     }
 
-    @Test
-    public void testVersion() throws Exception {
-        testStrategy.testVersion();
-    }
-
-
     /**
      * KEYCLOAK-732
      *

diff --git a/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatTest.java b/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatTest.java
index b72aa68..d3e22d0 100755
--- a/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatTest.java
+++ b/testsuite/tomcat6/src/test/java/org/keycloak/testsuite/TomcatTest.java
@@ -138,12 +138,6 @@ public class TomcatTest {
         testStrategy.testBadUser();
     }
 
-    @Test
-    public void testVersion() throws Exception {
-        testStrategy.testVersion();
-    }
-
-
     /**
      * KEYCLOAK-732
      *

diff --git a/testsuite/tomcat7/src/test/java/org/keycloak/testsuite/Tomcat7Test.java b/testsuite/tomcat7/src/test/java/org/keycloak/testsuite/Tomcat7Test.java
index 608ab1e..a2094a3 100755
--- a/testsuite/tomcat7/src/test/java/org/keycloak/testsuite/Tomcat7Test.java
+++ b/testsuite/tomcat7/src/test/java/org/keycloak/testsuite/Tomcat7Test.java
@@ -144,12 +144,6 @@ public class Tomcat7Test {
         testStrategy.testBadUser();
     }
 
-    @Test
-    public void testVersion() throws Exception {
-        testStrategy.testVersion();
-    }
-
-
     /**
      * KEYCLOAK-732
      *

diff --git a/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatTest.java b/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatTest.java
index bd801d1..7d4074e 100755
--- a/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatTest.java
+++ b/testsuite/tomcat8/src/test/java/org/keycloak/testsuite/TomcatTest.java
@@ -144,12 +144,6 @@ public class TomcatTest {
         testStrategy.testBadUser();
     }
 
-    @Test
-    public void testVersion() throws Exception {
-        testStrategy.testVersion();
-    }
-
-
     /**
      * KEYCLOAK-732
      *