keycloak-uncached
Changes
connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/DefaultMongoUpdaterProvider.java 4(+2 -2)
connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/updates/Update1_2_0_CR1.java 4(+2 -2)
examples/cors/README.md 2(+1 -1)
examples/saml/post-basic/pom.xml 89(+68 -21)
examples/saml/post-with-encryption/pom.xml 78(+62 -16)
examples/saml/post-with-signature/pom.xml 78(+62 -16)
examples/saml/redirect-basic/pom.xml 78(+62 -16)
examples/saml/redirect-with-signature/pom.xml 78(+62 -16)
Details
diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml b/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml
index 42a702a..33eb5a1 100755
--- a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml
+++ b/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml
@@ -4,5 +4,5 @@
<include file="META-INF/jpa-changelog-1.1.0.Beta1.xml"/>
<include file="META-INF/jpa-changelog-1.1.0.Final.xml"/>
<include file="META-INF/jpa-changelog-1.2.0.Beta1.xml"/>
- <include file="META-INF/jpa-changelog-1.2.0.RC1.xml"/>
+ <include file="META-INF/jpa-changelog-1.2.0.CR1.xml"/>
</databaseChangeLog>
diff --git a/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/DefaultMongoUpdaterProvider.java b/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/DefaultMongoUpdaterProvider.java
index 10a1368..551d0e6 100644
--- a/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/DefaultMongoUpdaterProvider.java
+++ b/connections/mongo-update/src/main/java/org/keycloak/connections/mongo/updater/impl/DefaultMongoUpdaterProvider.java
@@ -10,7 +10,7 @@ import org.keycloak.connections.mongo.updater.impl.updates.Update;
import org.keycloak.connections.mongo.updater.impl.updates.Update1_0_0_Final;
import org.keycloak.connections.mongo.updater.impl.updates.Update1_1_0_Beta1;
import org.keycloak.connections.mongo.updater.impl.updates.Update1_2_0_Beta1;
-import org.keycloak.connections.mongo.updater.impl.updates.Update1_2_0_RC1;
+import org.keycloak.connections.mongo.updater.impl.updates.Update1_2_0_CR1;
import org.keycloak.models.KeycloakSession;
import java.util.Date;
@@ -30,7 +30,7 @@ public class DefaultMongoUpdaterProvider implements MongoUpdaterProvider {
Update1_0_0_Final.class,
Update1_1_0_Beta1.class,
Update1_2_0_Beta1.class,
- Update1_2_0_RC1.class
+ Update1_2_0_CR1.class
};
@Override
diff --git a/distribution/subsystem-war/src/main/resources/META-INF/keycloak-server.json b/distribution/subsystem-war/src/main/resources/META-INF/keycloak-server.json
index 3e1896c..9b8f051 100755
--- a/distribution/subsystem-war/src/main/resources/META-INF/keycloak-server.json
+++ b/distribution/subsystem-war/src/main/resources/META-INF/keycloak-server.json
@@ -1,4 +1,8 @@
{
+ "providers": [
+ "classpath:${jboss.server.config.dir}/providers/*"
+ ],
+
"admin": {
"realm": "master"
},
diff --git a/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml b/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml
index c35f746..ada2a89 100755
--- a/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml
+++ b/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml
@@ -82,6 +82,16 @@
<section>
<title>Migrating from 1.2.0.Beta1 to 1.2.0.RC1</title>
<simplesect>
+ <title>Distribution changes</title>
+ <para>
+ Keycloak is now available in 3 downloads: standalone, overlay and demo bundle. The standalone is intended
+ for production and non-JEE developers. Overlay is aimed at adding Keycloak to an existing WildFly 8.2 or EAP 6.4
+ installation and is mainly for development. Finally we have a demo (or dev) bundle that is aimed at
+ developers getting started with Keycloak. This bundle contains a WildFly server, with Keycloak server and
+ adapter included. It also contains all documentation and examples.
+ </para>
+ </simplesect>
+ <simplesect>
<title>Database changed</title>
<para>
This release contains again a number of changes to the database. The biggest one is Application and OAuth client merge.
examples/cors/README.md 2(+1 -1)
diff --git a/examples/cors/README.md b/examples/cors/README.md
index 89ac4a8..f2de71f 100755
--- a/examples/cors/README.md
+++ b/examples/cors/README.md
@@ -52,7 +52,7 @@ next you must build and deploy
```
cd cors
-mvn clean install jboss-as:deploy
+mvn clean install wildfly:deploy
```
Step 5: Login and Observe Apps
examples/saml/post-basic/pom.xml 89(+68 -21)
diff --git a/examples/saml/post-basic/pom.xml b/examples/saml/post-basic/pom.xml
index 7cb485b..07762a8 100644
--- a/examples/saml/post-basic/pom.xml
+++ b/examples/saml/post-basic/pom.xml
@@ -2,17 +2,46 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>keycloak-examples-saml-parent</artifactId>
- <groupId>org.keycloak</groupId>
- <version>1.2.0.RC1-SNAPSHOT</version>
- </parent>
-
- <artifactId>keycloak-example-saml-federation-saml-sp-post-basic</artifactId>
+ <groupId>org.picketlink.quickstarts</groupId>
+ <artifactId>picketlink-federation-saml-sp-post-basic</artifactId>
+ <version>2.7.0.Beta2</version>
<packaging>war</packaging>
- <name>keycloak-example-saml-federation-saml-sp-post-basic</name>
+ <name>PicketLink Quickstart: picketlink-federation-saml-sp-post-basic</name>
+ <description>PicketLink Quickstart: PicketLink Service Provider With a Basic Configuration using SAML HTTP POST Binding</description>
+
+ <url>http://www.picketlink.org</url>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+
+ <properties>
+ <!-- JBoss AS dependency versions -->
+ <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
+
+ <!-- WildFly dependency versions -->
+ <version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
+
+ <!-- PicketLink dependency versions -->
+ <version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
+
+ <!-- Default target container. -->
+ <target.container>jboss-eap</target.container>
+
+ <!-- maven-war-plugin -->
+ <version.war.plugin>2.1.1</version.war.plugin>
+
+ <!-- maven-compiler-plugin -->
+ <version.compiler.plugin>3.1</version.compiler.plugin>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ </properties>
<build>
<!-- Set the name of the war, used as the context root when the app is deployed -->
@@ -20,33 +49,51 @@
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
+ <version>${version.war.plugin}</version>
<configuration>
+ <!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
<failOnMissingWebXml>false</failOnMissingWebXml>
<!-- We need to get the configuration resources for the provided target container. -->
<classifier>${target.container}</classifier>
- <webResources>
- <resource>
- <directory>${basedir}/conf/${target.container}</directory>
- </resource>
- </webResources>
+ <webResources>
+ <resource>
+ <directory>${basedir}/conf/${target.container}</directory>
+ </resource>
+ </webResources>
</configuration>
</plugin>
+ <!-- JBoss AS plugin to deploy war -->
<plugin>
<groupId>org.jboss.as.plugins</groupId>
<artifactId>jboss-as-maven-plugin</artifactId>
+ <version>${version.jboss.maven.plugin}</version>
<configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.wildfly.plugins</groupId>
- <artifactId>wildfly-maven-plugin</artifactId>
- <configuration>
- <skip>false</skip>
+ <filename>${project.build.finalName}-${target.container}.${project.packaging}</filename>
</configuration>
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>wildfly</id>
+ <properties>
+ <target.container>wildfly</target.container>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.wildfly.plugins</groupId>
+ <artifactId>wildfly-maven-plugin</artifactId>
+ <version>${version.wildfly.maven.plugin}</version>
+ <configuration>
+ <filename>${project.build.finalName}-${target.container}.${project.packaging}</filename>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
examples/saml/post-with-encryption/pom.xml 78(+62 -16)
diff --git a/examples/saml/post-with-encryption/pom.xml b/examples/saml/post-with-encryption/pom.xml
index 50f3108..497bea4 100755
--- a/examples/saml/post-with-encryption/pom.xml
+++ b/examples/saml/post-with-encryption/pom.xml
@@ -2,17 +2,46 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>keycloak-examples-saml-parent</artifactId>
- <groupId>org.keycloak</groupId>
- <version>1.2.0.RC1-SNAPSHOT</version>
- </parent>
-
- <artifactId>keycloak-example-saml-post-with-encryption</artifactId>
+ <groupId>org.picketlink.quickstarts</groupId>
+ <artifactId>picketlink-federation-saml-sp-with-encryption</artifactId>
+ <version>2.7.0.Beta2</version>
<packaging>war</packaging>
- <name>keycloak-example-saml-post-with-encryption</name>
+ <name>PicketLink Quickstart: picketlink-federation-saml-sp-with-encryption</name>
+ <description>PicketLink Quickstart: PicketLink Service Provider With a Basic Configuration using SAML HTTP POST Binding With Encryption Support</description>
+
+ <url>http://www.picketlink.org</url>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+
+ <properties>
+ <!-- JBoss AS dependency versions -->
+ <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
+
+ <!-- WildFly dependency versions -->
+ <version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
+
+ <!-- PicketLink dependency versions -->
+ <version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
+
+ <!-- Default target container. -->
+ <target.container>jboss-eap</target.container>
+
+ <!-- maven-war-plugin -->
+ <version.war.plugin>2.1.1</version.war.plugin>
+
+ <!-- maven-compiler-plugin -->
+ <version.compiler.plugin>3.1</version.compiler.plugin>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ </properties>
<build>
<!-- Set the name of the war, used as the context root when the app is deployed -->
@@ -28,6 +57,7 @@
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
+ <version>${version.war.plugin}</version>
<configuration>
<!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
<failOnMissingWebXml>false</failOnMissingWebXml>
@@ -50,21 +80,37 @@
</webResources>
</configuration>
</plugin>
+ <!-- JBoss AS plugin to deploy war -->
<plugin>
<groupId>org.jboss.as.plugins</groupId>
<artifactId>jboss-as-maven-plugin</artifactId>
+ <version>${version.jboss.maven.plugin}</version>
<configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.wildfly.plugins</groupId>
- <artifactId>wildfly-maven-plugin</artifactId>
- <configuration>
- <skip>false</skip>
+ <filename>${project.build.finalName}-${target.container}.${project.packaging}</filename>
</configuration>
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>wildfly</id>
+ <properties>
+ <target.container>wildfly</target.container>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.wildfly.plugins</groupId>
+ <artifactId>wildfly-maven-plugin</artifactId>
+ <version>${version.wildfly.maven.plugin}</version>
+ <configuration>
+ <filename>${project.build.finalName}-${target.container}.${project.packaging}</filename>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
examples/saml/post-with-signature/pom.xml 78(+62 -16)
diff --git a/examples/saml/post-with-signature/pom.xml b/examples/saml/post-with-signature/pom.xml
index 9ea515d..2c644a7 100755
--- a/examples/saml/post-with-signature/pom.xml
+++ b/examples/saml/post-with-signature/pom.xml
@@ -2,17 +2,46 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>keycloak-examples-saml-parent</artifactId>
- <groupId>org.keycloak</groupId>
- <version>1.2.0.RC1-SNAPSHOT</version>
- </parent>
-
- <artifactId>keycloak-example-saml-post-with-signature</artifactId>
+ <groupId>org.picketlink.quickstarts</groupId>
+ <artifactId>picketlink-federation-saml-sp-post-with-signature</artifactId>
+ <version>2.7.0.Beta2</version>
<packaging>war</packaging>
- <name>keycloak-example-saml-post-with-signature</name>
+ <name>PicketLink Quickstart: picketlink-federation-saml-sp-post-with-signature</name>
+ <description>PicketLink Quickstart: PicketLink Service Provider With a Basic Configuration using SAML HTTP POST Binding With Signature Support</description>
+
+ <url>http://www.picketlink.org</url>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+
+ <properties>
+ <!-- JBoss AS dependency versions -->
+ <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
+
+ <!-- WildFly dependency versions -->
+ <version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
+
+ <!-- PicketLink dependency versions -->
+ <version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
+
+ <!-- Default target container. -->
+ <target.container>jboss-eap</target.container>
+
+ <!-- maven-war-plugin -->
+ <version.war.plugin>2.1.1</version.war.plugin>
+
+ <!-- maven-compiler-plugin -->
+ <version.compiler.plugin>3.1</version.compiler.plugin>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ </properties>
<build>
<!-- Set the name of the war, used as the context root when the app is deployed -->
@@ -28,6 +57,7 @@
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
+ <version>${version.war.plugin}</version>
<configuration>
<!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
<failOnMissingWebXml>false</failOnMissingWebXml>
@@ -50,21 +80,37 @@
</webResources>
</configuration>
</plugin>
+ <!-- JBoss AS plugin to deploy war -->
<plugin>
<groupId>org.jboss.as.plugins</groupId>
<artifactId>jboss-as-maven-plugin</artifactId>
+ <version>${version.jboss.maven.plugin}</version>
<configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.wildfly.plugins</groupId>
- <artifactId>wildfly-maven-plugin</artifactId>
- <configuration>
- <skip>false</skip>
+ <filename>${project.build.finalName}-${target.container}.${project.packaging}</filename>
</configuration>
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>wildfly</id>
+ <properties>
+ <target.container>wildfly</target.container>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.wildfly.plugins</groupId>
+ <artifactId>wildfly-maven-plugin</artifactId>
+ <version>${version.wildfly.maven.plugin}</version>
+ <configuration>
+ <filename>${project.build.finalName}-${target.container}.${project.packaging}</filename>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
examples/saml/redirect-basic/pom.xml 78(+62 -16)
diff --git a/examples/saml/redirect-basic/pom.xml b/examples/saml/redirect-basic/pom.xml
index 3ca0bc5..98c3a40 100644
--- a/examples/saml/redirect-basic/pom.xml
+++ b/examples/saml/redirect-basic/pom.xml
@@ -2,17 +2,46 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>keycloak-examples-saml-parent</artifactId>
- <groupId>org.keycloak</groupId>
- <version>1.2.0.RC1-SNAPSHOT</version>
- </parent>
-
- <artifactId>keycloak-example-saml-redirect-basic</artifactId>
+ <groupId>org.picketlink.quickstarts</groupId>
+ <artifactId>picketlink-federation-saml-sp-redirect-basic</artifactId>
+ <version>2.7.0.Beta2</version>
<packaging>war</packaging>
- <name>keycloak-example-saml-redirect-basic</name>
+ <name>PicketLink Quickstart: picketlink-federation-saml-sp-redirect-basic</name>
+ <description>PicketLink Quickstart: PicketLink Service Provider With a Basic Configuration using SAML HTTP Redirect Binding</description>
+
+ <url>http://www.picketlink.org</url>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+
+ <properties>
+ <!-- JBoss AS dependency versions -->
+ <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
+
+ <!-- WildFly dependency versions -->
+ <version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
+
+ <!-- PicketLink dependency versions -->
+ <version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
+
+ <!-- Default target container. -->
+ <target.container>jboss-eap</target.container>
+
+ <!-- maven-war-plugin -->
+ <version.war.plugin>2.1.1</version.war.plugin>
+
+ <!-- maven-compiler-plugin -->
+ <version.compiler.plugin>3.1</version.compiler.plugin>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ </properties>
<build>
<!-- Set the name of the war, used as the context root when the app is deployed -->
@@ -20,6 +49,7 @@
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
+ <version>${version.war.plugin}</version>
<configuration>
<!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
<failOnMissingWebXml>false</failOnMissingWebXml>
@@ -36,21 +66,37 @@
</webResources>
</configuration>
</plugin>
+ <!-- JBoss AS plugin to deploy war -->
<plugin>
<groupId>org.jboss.as.plugins</groupId>
<artifactId>jboss-as-maven-plugin</artifactId>
+ <version>${version.jboss.maven.plugin}</version>
<configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.wildfly.plugins</groupId>
- <artifactId>wildfly-maven-plugin</artifactId>
- <configuration>
- <skip>false</skip>
+ <filename>${project.build.finalName}-${target.container}.${project.packaging}</filename>
</configuration>
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>wildfly</id>
+ <properties>
+ <target.container>wildfly</target.container>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.wildfly.plugins</groupId>
+ <artifactId>wildfly-maven-plugin</artifactId>
+ <version>${version.wildfly.maven.plugin}</version>
+ <configuration>
+ <filename>${project.build.finalName}-${target.container}.${project.packaging}</filename>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
examples/saml/redirect-with-signature/pom.xml 78(+62 -16)
diff --git a/examples/saml/redirect-with-signature/pom.xml b/examples/saml/redirect-with-signature/pom.xml
index a94f159..d491d8e 100755
--- a/examples/saml/redirect-with-signature/pom.xml
+++ b/examples/saml/redirect-with-signature/pom.xml
@@ -2,17 +2,46 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>keycloak-examples-saml-parent</artifactId>
- <groupId>org.keycloak</groupId>
- <version>1.2.0.RC1-SNAPSHOT</version>
- </parent>
-
- <artifactId>keycloak-example-saml-redirect-with-signature</artifactId>
+ <groupId>org.picketlink.quickstarts</groupId>
+ <artifactId>picketlink-federation-saml-sp-redirect-with-signature</artifactId>
+ <version>2.7.0.Beta2</version>
<packaging>war</packaging>
- <name>keycloak-example-saml-redirect-with-signature</name>
+ <name>PicketLink Quickstart: picketlink-federation-saml-sp-redirect-with-signature</name>
+ <description>PicketLink Quickstart: PicketLink Service Provider With a Basic Configuration using SAML HTTP Redirect Binding With Signature Support</description>
+
+ <url>http://www.picketlink.org</url>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+
+ <properties>
+ <!-- JBoss AS dependency versions -->
+ <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
+
+ <!-- WildFly dependency versions -->
+ <version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
+
+ <!-- PicketLink dependency versions -->
+ <version.picketlink.javaee.bom>2.7.0.Beta2</version.picketlink.javaee.bom>
+
+ <!-- Default target container. -->
+ <target.container>jboss-eap</target.container>
+
+ <!-- maven-war-plugin -->
+ <version.war.plugin>2.1.1</version.war.plugin>
+
+ <!-- maven-compiler-plugin -->
+ <version.compiler.plugin>3.1</version.compiler.plugin>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ </properties>
<build>
<!-- Set the name of the war, used as the context root when the app is deployed -->
@@ -28,6 +57,7 @@
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
+ <version>${version.war.plugin}</version>
<configuration>
<!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
<failOnMissingWebXml>false</failOnMissingWebXml>
@@ -50,21 +80,37 @@
</webResources>
</configuration>
</plugin>
+ <!-- JBoss AS plugin to deploy war -->
<plugin>
<groupId>org.jboss.as.plugins</groupId>
<artifactId>jboss-as-maven-plugin</artifactId>
+ <version>${version.jboss.maven.plugin}</version>
<configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.wildfly.plugins</groupId>
- <artifactId>wildfly-maven-plugin</artifactId>
- <configuration>
- <skip>false</skip>
+ <filename>${project.build.finalName}-${target.container}.${project.packaging}</filename>
</configuration>
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>wildfly</id>
+ <properties>
+ <target.container>wildfly</target.container>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.wildfly.plugins</groupId>
+ <artifactId>wildfly-maven-plugin</artifactId>
+ <version>${version.wildfly.maven.plugin}</version>
+ <configuration>
+ <filename>${project.build.finalName}-${target.container}.${project.packaging}</filename>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
diff --git a/model/api/src/main/java/org/keycloak/migration/MigrationModelManager.java b/model/api/src/main/java/org/keycloak/migration/MigrationModelManager.java
index c749676..a0e5959 100755
--- a/model/api/src/main/java/org/keycloak/migration/MigrationModelManager.java
+++ b/model/api/src/main/java/org/keycloak/migration/MigrationModelManager.java
@@ -1,7 +1,7 @@
package org.keycloak.migration;
import org.jboss.logging.Logger;
-import org.keycloak.migration.migrators.MigrationTo1_2_0_RC1;
+import org.keycloak.migration.migrators.MigrationTo1_2_0_CR1;
import org.keycloak.models.KeycloakSession;
/**
@@ -19,9 +19,9 @@ public class MigrationModelManager {
if (storedVersion == null) stored = new ModelVersion(0, 0, 0);
else stored = new ModelVersion(storedVersion);
- if (stored.lessThan(MigrationTo1_2_0_RC1.VERSION)) {
+ if (stored.lessThan(MigrationTo1_2_0_CR1.VERSION)) {
logger.info("Migrating older model to 1.2.0.RC1 updates");
- new MigrationTo1_2_0_RC1().migrate(session);
+ new MigrationTo1_2_0_CR1().migrate(session);
}
model.setStoredVersion(MigrationModel.LATEST_VERSION);