keycloak-uncached

Exclude not productized marshalling-osgi

1/15/2016 7:42:55 PM

Lukas Kubik

Commit: a4196e8

Tree: 968fd66

Parents: c4fd530

Changes

connections/infinispan/pom.xml 10(+10 -0)

model/invalidation-cache/infinispan/pom.xml 10(+10 -0)

model/sessions-infinispan/pom.xml 8(+8 -0)

pom.xml 6(+6 -0)

testsuite/pom.xml 5(+5 -0)

Details

connections/infinispan/pom.xml 10(+10 -0)

diff --git a/connections/infinispan/pom.xml b/connections/infinispan/pom.xml
index ce0b993..fafb0f2 100755
--- a/connections/infinispan/pom.xml
+++ b/connections/infinispan/pom.xml
@@ -27,6 +27,16 @@
             <artifactId>infinispan-core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling-river</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 </project>

model/invalidation-cache/infinispan/pom.xml 10(+10 -0)

diff --git a/model/invalidation-cache/infinispan/pom.xml b/model/invalidation-cache/infinispan/pom.xml
index 441f431..90911b1 100755
--- a/model/invalidation-cache/infinispan/pom.xml
+++ b/model/invalidation-cache/infinispan/pom.xml
@@ -31,5 +31,15 @@
             <artifactId>infinispan-core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling-river</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

model/sessions-infinispan/pom.xml 8(+8 -0)

diff --git a/model/sessions-infinispan/pom.xml b/model/sessions-infinispan/pom.xml
index d319578..74a7d94 100755
--- a/model/sessions-infinispan/pom.xml
+++ b/model/sessions-infinispan/pom.xml
@@ -31,6 +31,14 @@
             <artifactId>infinispan-core</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling-river</artifactId>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

pom.xml 6(+6 -0)

diff --git a/pom.xml b/pom.xml
index 46c2007..b985f8c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -636,6 +636,12 @@
                 <groupId>org.infinispan</groupId>
                 <artifactId>infinispan-core</artifactId>
                 <version>${infinispan.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.jboss.marshalling</groupId>
+                        <artifactId>jboss-marshalling-osgi</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.liquibase</groupId>

testsuite/pom.xml 5(+5 -0)

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 6db04b4..0f600a8 100755
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -42,6 +42,11 @@
                 <version>${resteasy.latest.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.infinispan</groupId>
+                <artifactId>infinispan-core</artifactId>
+                <version>${infinispan.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>