keycloak-uncached
Changes
broker/core/pom.xml 4(+4 -0)
events/jboss-logging/pom.xml 5(+5 -0)
examples/basic-auth/pom.xml 5(+5 -0)
federation/ldap/pom.xml 5(+5 -0)
forms/account-api/pom.xml 5(+5 -0)
forms/account-freemarker/pom.xml 5(+5 -0)
forms/common-freemarker/pom.xml 5(+5 -0)
forms/common-themes/pom.xml 5(+5 -0)
forms/login-api/pom.xml 5(+5 -0)
forms/login-freemarker/pom.xml 5(+5 -0)
integration/admin-client/pom.xml 7(+6 -1)
model/api/pom.xml 5(+5 -0)
model/jpa/pom.xml 4(+4 -0)
pom.xml 13(+10 -3)
saml/saml-protocol/pom.xml 5(+5 -0)
services/pom.xml 4(+4 -0)
Details
broker/core/pom.xml 4(+4 -0)
diff --git a/broker/core/pom.xml b/broker/core/pom.xml
index 4b4ba5a..1eae759 100755
--- a/broker/core/pom.xml
+++ b/broker/core/pom.xml
@@ -45,6 +45,10 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ </dependency>
</dependencies>
</project>
events/jboss-logging/pom.xml 5(+5 -0)
diff --git a/events/jboss-logging/pom.xml b/events/jboss-logging/pom.xml
index 7379810..cc17197 100755
--- a/events/jboss-logging/pom.xml
+++ b/events/jboss-logging/pom.xml
@@ -39,6 +39,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
examples/basic-auth/pom.xml 5(+5 -0)
diff --git a/examples/basic-auth/pom.xml b/examples/basic-auth/pom.xml
index e008fd5..c5de25c 100755
--- a/examples/basic-auth/pom.xml
+++ b/examples/basic-auth/pom.xml
@@ -32,6 +32,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
diff --git a/examples/cors/database-service/pom.xml b/examples/cors/database-service/pom.xml
index 297f060..ca83329 100755
--- a/examples/cors/database-service/pom.xml
+++ b/examples/cors/database-service/pom.xml
@@ -30,6 +30,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
diff --git a/examples/demo-template/database-service/pom.xml b/examples/demo-template/database-service/pom.xml
index 5140a7e..35b1df7 100755
--- a/examples/demo-template/database-service/pom.xml
+++ b/examples/demo-template/database-service/pom.xml
@@ -30,6 +30,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
federation/ldap/pom.xml 5(+5 -0)
diff --git a/federation/ldap/pom.xml b/federation/ldap/pom.xml
index bf2f88d..14b334d 100755
--- a/federation/ldap/pom.xml
+++ b/federation/ldap/pom.xml
@@ -48,6 +48,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<scope>provided</scope>
forms/account-api/pom.xml 5(+5 -0)
diff --git a/forms/account-api/pom.xml b/forms/account-api/pom.xml
index cf8fb82..3d56742 100755
--- a/forms/account-api/pom.xml
+++ b/forms/account-api/pom.xml
@@ -39,6 +39,11 @@
<artifactId>resteasy-jaxrs</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
forms/account-freemarker/pom.xml 5(+5 -0)
diff --git a/forms/account-freemarker/pom.xml b/forms/account-freemarker/pom.xml
index 25a1be2..c94ec33 100755
--- a/forms/account-freemarker/pom.xml
+++ b/forms/account-freemarker/pom.xml
@@ -60,6 +60,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<scope>provided</scope>
forms/common-freemarker/pom.xml 5(+5 -0)
diff --git a/forms/common-freemarker/pom.xml b/forms/common-freemarker/pom.xml
index c28f829..0336368 100755
--- a/forms/common-freemarker/pom.xml
+++ b/forms/common-freemarker/pom.xml
@@ -30,6 +30,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<scope>provided</scope>
forms/common-themes/pom.xml 5(+5 -0)
diff --git a/forms/common-themes/pom.xml b/forms/common-themes/pom.xml
index db106b9..7c0ed6e 100755
--- a/forms/common-themes/pom.xml
+++ b/forms/common-themes/pom.xml
@@ -40,6 +40,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<scope>provided</scope>
forms/login-api/pom.xml 5(+5 -0)
diff --git a/forms/login-api/pom.xml b/forms/login-api/pom.xml
index 735edb5..27eca4e 100755
--- a/forms/login-api/pom.xml
+++ b/forms/login-api/pom.xml
@@ -34,6 +34,11 @@
<artifactId>resteasy-jaxrs</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
forms/login-freemarker/pom.xml 5(+5 -0)
diff --git a/forms/login-freemarker/pom.xml b/forms/login-freemarker/pom.xml
index c6b8e0a..4ab076e 100755
--- a/forms/login-freemarker/pom.xml
+++ b/forms/login-freemarker/pom.xml
@@ -55,6 +55,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<scope>provided</scope>
integration/admin-client/pom.xml 7(+6 -1)
diff --git a/integration/admin-client/pom.xml b/integration/admin-client/pom.xml
index e76c3f8..9956ad6 100755
--- a/integration/admin-client/pom.xml
+++ b/integration/admin-client/pom.xml
@@ -42,6 +42,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
<version>${resteasy.latest.version}</version>
@@ -61,4 +66,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/integration/jaxrs-oauth-client/pom.xml b/integration/jaxrs-oauth-client/pom.xml
index f397545..1c905d0 100755
--- a/integration/jaxrs-oauth-client/pom.xml
+++ b/integration/jaxrs-oauth-client/pom.xml
@@ -27,6 +27,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<scope>provided</scope>
model/api/pom.xml 5(+5 -0)
diff --git a/model/api/pom.xml b/model/api/pom.xml
index 0eb34af..ea6bcd7 100755
--- a/model/api/pom.xml
+++ b/model/api/pom.xml
@@ -20,6 +20,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<scope>provided</scope>
diff --git a/model/invalidation-cache/model-adapters/pom.xml b/model/invalidation-cache/model-adapters/pom.xml
index 35bc9fb..1524e2d 100755
--- a/model/invalidation-cache/model-adapters/pom.xml
+++ b/model/invalidation-cache/model-adapters/pom.xml
@@ -47,6 +47,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.h2database</groupId>
model/jpa/pom.xml 4(+4 -0)
diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml
index 001e423..1ada650 100755
--- a/model/jpa/pom.xml
+++ b/model/jpa/pom.xml
@@ -61,6 +61,10 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
pom.xml 13(+10 -3)
diff --git a/pom.xml b/pom.xml
index 9642d38..e879c2c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,8 @@
<jackson.version>1.9.9.redhat-4</jackson.version>
<apache.httpcomponents.version>4.3.6.redhat-1</apache.httpcomponents.version>
<!--<apache.httpcomponents.httpcore.version>4.3.3</apache.httpcomponents.httpcore.version>-->
- <!--<resteasy.version>2.3.7.Final</resteasy.version>-->
+ <!--resteasy version aligned with eap6-supported-artifacts bom version -->
+ <resteasy.version>2.3.12.Final-redhat-1</resteasy.version>
<resteasy.latest.version>3.0.9.Final</resteasy.latest.version>
<keycloak.apache.httpcomponents.version>4.2.1</keycloak.apache.httpcomponents.version>
<undertow.version>1.1.1.Final</undertow.version>
@@ -220,13 +221,19 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
<version>${resteasy.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>${resteasy.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
<version>${resteasy.version}</version>
saml/saml-protocol/pom.xml 5(+5 -0)
diff --git a/saml/saml-protocol/pom.xml b/saml/saml-protocol/pom.xml
index ffb7eab..2745681 100755
--- a/saml/saml-protocol/pom.xml
+++ b/saml/saml-protocol/pom.xml
@@ -98,6 +98,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_1.1_spec</artifactId>
<scope>provided</scope>
services/pom.xml 4(+4 -0)
diff --git a/services/pom.xml b/services/pom.xml
index 89f3717..16de5b3 100755
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -114,6 +114,10 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_1.1_spec</artifactId>
<scope>provided</scope>