keycloak-uncached
Changes
adapters/oidc/pom.xml 1(+1 -0)
adapters/oidc/spring-boot/pom.xml 63(+24 -39)
adapters/oidc/spring-boot/src/main/java/org/keycloak/adapters/springboot/KeycloakAutoConfiguration.java 3(+2 -1)
boms/adapter/pom.xml 65(+35 -30)
Details
adapters/oidc/pom.xml 1(+1 -0)
diff --git a/adapters/oidc/pom.xml b/adapters/oidc/pom.xml
index ef9e79e..bc734c3 100755
--- a/adapters/oidc/pom.xml
+++ b/adapters/oidc/pom.xml
@@ -41,6 +41,7 @@
<module>servlet-filter</module>
<module>servlet-oauth-client</module>
<module>spring-boot</module>
+ <module>spring-boot-container-bundle</module>
<module>spring-security</module>
<module>tomcat</module>
<module>undertow</module>
adapters/oidc/spring-boot/pom.xml 63(+24 -39)
diff --git a/adapters/oidc/spring-boot/pom.xml b/adapters/oidc/spring-boot/pom.xml
index 48a2809..5654e1a 100755
--- a/adapters/oidc/spring-boot/pom.xml
+++ b/adapters/oidc/spring-boot/pom.xml
@@ -43,75 +43,61 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-tomcat8-adapter</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.keycloak</groupId>
- <artifactId>keycloak-undertow-adapter</artifactId>
- <scope>provided</scope>
+ <artifactId>spring-boot-container-bundle</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
- <artifactId>keycloak-jetty93-adapter</artifactId>
- <scope>provided</scope>
- </dependency>
+ <artifactId>keycloak-spring-security-adapter</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
- <scope>provided</scope>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-servlet</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty9.version}</version>
- <scope>provided</scope>
+ <scope>compile</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<version>${jetty9.version}</version>
- <scope>provided</scope>
+ <scope>compile</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${jetty9.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-servlet</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
+ <optional>true</optional>
</dependency>
-
- <dependency>
- <groupId>io.undertow</groupId>
- <artifactId>undertow-core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-undertow-adapter-spi</artifactId>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
@@ -125,11 +111,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
-
</project>
diff --git a/adapters/oidc/spring-boot/src/main/resources/META-INF/spring.factories b/adapters/oidc/spring-boot/src/main/resources/META-INF/spring.factories
index 3193ee6..0c80e3b 100644
--- a/adapters/oidc/spring-boot/src/main/resources/META-INF/spring.factories
+++ b/adapters/oidc/spring-boot/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.keycloak.adapters.springboot.KeycloakSpringBootConfiguration
\ No newline at end of file
+org.keycloak.adapters.springboot.KeycloakAutoConfiguration
\ No newline at end of file
diff --git a/adapters/oidc/spring-boot-container-bundle/pom.xml b/adapters/oidc/spring-boot-container-bundle/pom.xml
new file mode 100644
index 0000000..2da582d
--- /dev/null
+++ b/adapters/oidc/spring-boot-container-bundle/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.1.0.CR1-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+ <artifactId>spring-boot-container-bundle</artifactId>
+ <packaging>jar</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-tomcat8-adapter</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-undertow-adapter</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-jetty93-adapter</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.4.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.keycloak:keycloak-tomcat8-adapter</include>
+ <include>org.keycloak:keycloak-undertow-adapter</include>
+ <include>org.keycloak:keycloak-jetty93-adapter</include>
+ <include>org.keycloak:keycloak-tomcat-core-adapter</include>
+ <include>org.keycloak:keycloak-tomcat-adapter-spi</include>
+ <include>org.keycloak:keycloak-undertow-adapter</include>
+ <include>org.keycloak:keycloak-undertow-adapter-spi</include>
+ <include>org.keycloak:keycloak-jetty-core</include>
+ <include>org.keycloak:keycloak-jetty-adapter-spi</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/adapters/oidc/spring-security/pom.xml b/adapters/oidc/spring-security/pom.xml
index da15426..df23e02 100755
--- a/adapters/oidc/spring-security/pom.xml
+++ b/adapters/oidc/spring-security/pom.xml
@@ -59,12 +59,14 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>${spring-security.version}</version>
+ <optional>true</optional>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>${spring-security.version}</version>
+ <optional>true</optional>
<scope>compile</scope>
</dependency>
<dependency>
boms/adapter/pom.xml 65(+35 -30)
diff --git a/boms/adapter/pom.xml b/boms/adapter/pom.xml
index 24a844e..7bcefc6 100644
--- a/boms/adapter/pom.xml
+++ b/boms/adapter/pom.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016 Red Hat, Inc. and/or its affiliates
- ~ and other contributors as indicated by the @author tags.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
+~ Copyright 2016 Red Hat, Inc. and/or its affiliates
+~ and other contributors as indicated by the @author tags.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
<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>
@@ -64,15 +64,15 @@
<artifactId>keycloak-saml-adapter-api-public</artifactId>
<version>3.1.0.CR1-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-tomcat8-adapter</artifactId>
- <version>3.1.0.CR1-SNAPSHOT</version>
+ <version>3.1.0.CR1-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-tomcat7-adapter</artifactId>
- <version>3.1.0.CR1-SNAPSHOT</version>
+ <version>3.1.0.CR1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
@@ -94,31 +94,36 @@
<artifactId>keycloak-jetty92-adapter</artifactId>
<version>3.1.0.CR1-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-jetty93-adapter</artifactId>
- <version>3.1.0.CR1-SNAPSHOT</version>
+ <version>3.1.0.CR1-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-undertow-adapter</artifactId>
- <version>3.1.0.CR1-SNAPSHOT</version>
+ <version>3.1.0.CR1-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-spring-boot-adapter</artifactId>
- <version>3.1.0.CR1-SNAPSHOT</version>
+ <version>3.1.0.CR1-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>spring-boot-container-bundle</artifactId>
+ <version>3.1.0.CR1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-spring-security-adapter</artifactId>
- <version>3.1.0.CR1-SNAPSHOT</version>
+ <version>3.1.0.CR1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-default-spring-boot-starter</artifactId>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-default-spring-boot-starter</artifactId>
<version>3.1.0.CR1-SNAPSHOT</version>
- </dependency>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/misc/spring-boot-starter/keycloak-default-spring-boot-starter/pom.xml b/misc/spring-boot-starter/keycloak-default-spring-boot-starter/pom.xml
index 0fdb55d..dba21e6 100644
--- a/misc/spring-boot-starter/keycloak-default-spring-boot-starter/pom.xml
+++ b/misc/spring-boot-starter/keycloak-default-spring-boot-starter/pom.xml
@@ -1,3 +1,4 @@
+
<?xml version="1.0" encoding="UTF-8"?>
<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">
@@ -19,7 +20,11 @@
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
- <artifactId>keycloak-tomcat8-adapter</artifactId>
+ <artifactId>spring-boot-container-bundle</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-spring-security-adapter</artifactId>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file