keycloak-uncached

Merge pull request #3942 from stianst/KEYCLOAK-4570 KEYCLOAK-4570

3/13/2017 8:32:08 AM

Stian Thorgersen

Commit: adf3eaf

Tree: 0f2a714

Parents: 4dcb8d2
a56dd16

Changes

boms/adapter/pom.xml 38(+17 -21)

boms/pom.xml 7(+1 -6)

boms/spi/pom.xml 8(+2 -6)

Details

boms/adapter/pom.xml 38(+17 -21)

diff --git a/boms/adapter/pom.xml b/boms/adapter/pom.xml
index b23aaa4..3e014ee 100644
--- a/boms/adapter/pom.xml
+++ b/boms/adapter/pom.xml
@@ -32,96 +32,92 @@
     <name>Keycloak BOM for adapters</name>
     <description>Keycloak BOM for adapters</description>
 
-    <properties>
-        <version.keycloak>${project.version}</version.keycloak>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-core</artifactId>
-                <version>${version.keycloak}</version>
+                <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-adapter-core</artifactId>
-                <version>${version.keycloak}</version>
+                <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-adapter-spi</artifactId>
-                <version>${version.keycloak}</version>
+                <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-wildfly-adapter-dist</artifactId>
-                <version>${version.keycloak}</version>
+                <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>    
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-saml-adapter-core</artifactId>
-                <version>${version.keycloak}</version>
+                <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-saml-adapter-api-public</artifactId>
-                <version>${version.keycloak}</version>
+                <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
              <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-tomcat8-adapter</artifactId>
-                <version>${version.keycloak}</version>
+                 <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
              <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-tomcat7-adapter</artifactId>
-                <version>${version.keycloak}</version>
+                 <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-tomcat6-adapter</artifactId>
-                <version>${version.keycloak}</version>
+                <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-jetty81-adapter</artifactId>
-                <version>${version.keycloak}</version>
+                <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-jetty91-adapter</artifactId>
-                <version>${version.keycloak}</version>
+                <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-jetty92-adapter</artifactId>
-                <version>${version.keycloak}</version>
+                <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
              <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-jetty93-adapter</artifactId>
-                <version>${version.keycloak}</version>
+                 <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
              <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-undertow-adapter</artifactId>
-                <version>${version.keycloak}</version>
+                 <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
              <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-spring-boot-adapter</artifactId>
-                <version>${version.keycloak}</version>
+                 <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
              <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-spring-security-adapter</artifactId>
-                <version>${version.keycloak}</version>
+                 <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
             <dependency>
                <groupId>org.keycloak</groupId>
                <artifactId>keycloak-default-spring-boot-starter</artifactId>
-               <version>${version.keycloak}</version>
+                <version>3.0.0.CR1-SNAPSHOT</version>
            </dependency>
         </dependencies>
     </dependencyManagement>

boms/pom.xml 7(+1 -6)

diff --git a/boms/pom.xml b/boms/pom.xml
index 23a6d35..f31ec03 100644
--- a/boms/pom.xml
+++ b/boms/pom.xml
@@ -18,14 +18,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <artifactId>keycloak-parent</artifactId>
-        <groupId>org.keycloak</groupId>
-        <version>3.0.0.CR1-SNAPSHOT</version>
-    </parent>
-
     <groupId>org.keycloak.bom</groupId>
     <artifactId>keycloak-bom-parent</artifactId>
+    <version>3.0.0.CR1-SNAPSHOT</version>
 
     <packaging>pom</packaging>

boms/spi/pom.xml 8(+2 -6)

diff --git a/boms/spi/pom.xml b/boms/spi/pom.xml
index 9ed4d5c..a2a5725 100644
--- a/boms/spi/pom.xml
+++ b/boms/spi/pom.xml
@@ -33,21 +33,17 @@
     <name>Keycloak BOM for server extensions</name>
     <description>Keycloak BOM for server extensions</description>
 
-    <properties>
-        <version.keycloak>${project.version}</version.keycloak>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-core</artifactId>
-                <version>${build.version}</version>
+                <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-server-spi</artifactId>
-                <version>${build.version}</version>
+                <version>3.0.0.CR1-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>