keycloak-uncached

diff --git a/adapters/oidc/spring-boot2/pom.xml b/adapters/oidc/spring-boot2/pom.xml
index 9144c8d..7311524 100755
--- a/adapters/oidc/spring-boot2/pom.xml
+++ b/adapters/oidc/spring-boot2/pom.xml
@@ -31,7 +31,7 @@
   <description/>
 
   <properties>
-    <spring-boot.version>2.0.0.RELEASE</spring-boot.version>
+    <spring-boot.version>2.0.3.RELEASE</spring-boot.version>
     <spring.version>5.0.2.RELEASE</spring.version>
     <mockito.version>1.9.5</mockito.version>
   </properties>

diff --git a/misc/pom.xml b/misc/pom.xml
index 1e33154..c3e3499 100644
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -13,7 +13,7 @@
     <packaging>pom</packaging>
     <modules>
         <module>spring-boot-starter</module>
-        <module>spring-boot-2-starter</module>
+        <module>spring-legacy-boot-starter</module>
         <module>keycloak-test-helper</module>
     </modules>
 </project>

diff --git a/misc/spring-boot-starter/keycloak-spring-boot-starter/pom.xml b/misc/spring-boot-starter/keycloak-spring-boot-starter/pom.xml
index a05534f..e242ebd 100644
--- a/misc/spring-boot-starter/keycloak-spring-boot-starter/pom.xml
+++ b/misc/spring-boot-starter/keycloak-spring-boot-starter/pom.xml
@@ -10,10 +10,14 @@
     <name>Keycloak :: Spring :: Boot :: Default ::  Starter</name>
     <description>Spring Boot Default Starter for Keycloak</description>
 
+    <properties>
+      <spring-boot.version>2.0.3.RELEASE</spring-boot.version>
+    </properties>
+
     <dependencies>
       <dependency>
           <groupId>org.keycloak</groupId>
-          <artifactId>keycloak-spring-boot-adapter</artifactId>
+          <artifactId>keycloak-spring-boot-2-adapter</artifactId>
       </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
@@ -22,8 +26,8 @@
       <dependency>
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-starter</artifactId>
-          <version>1.5.2.RELEASE</version>
-      </dependency>
+          <version>${spring-boot.version}</version>
+      </dependency>    
       <dependency>
           <groupId>org.keycloak</groupId>
           <artifactId>spring-boot-container-bundle</artifactId>

diff --git a/misc/spring-boot-starter/pom.xml b/misc/spring-boot-starter/pom.xml
index c67a907..1570025 100644
--- a/misc/spring-boot-starter/pom.xml
+++ b/misc/spring-boot-starter/pom.xml
@@ -15,6 +15,7 @@
     <modules>
         <module>keycloak-spring-boot-starter</module>
     </modules>
+
     <dependencyManagement>
       <dependencies>
         <dependency>