[jbosscache-core/f17] Updated jbosscache-core for jgroups212 pom changes

Matt Spaulding madsa at fedoraproject.org
Fri Aug 24 20:31:05 UTC 2012


commit 36fa42bbc522ec29a4c509f04c9678e6feb88f62
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Fri Aug 24 13:29:31 2012 -0700

    Updated jbosscache-core for jgroups212 pom changes

 jbosscache-core-depmap.xml       |    2 +-
 jbosscache-core-jgroups212.patch |   17 +++++++++++++++++
 jbosscache-core.spec             |    8 +++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/jbosscache-core-depmap.xml b/jbosscache-core-depmap.xml
index cc125fb..10702cc 100644
--- a/jbosscache-core-depmap.xml
+++ b/jbosscache-core-depmap.xml
@@ -1,7 +1,7 @@
 <dependencies>
     <dependency>
         <maven>
-            <groupId>jgroups</groupId>
+            <groupId>org.jgroups212</groupId>
             <artifactId>jgroups</artifactId>
             <version>2.12.13.Final</version>
         </maven>
diff --git a/jbosscache-core-jgroups212.patch b/jbosscache-core-jgroups212.patch
new file mode 100644
index 0000000..adca31b
--- /dev/null
+++ b/jbosscache-core-jgroups212.patch
@@ -0,0 +1,17 @@
+Index: jbosscache-core-3.2.8/pom.xml
+===================================================================
+--- jbosscache-core-3.2.8.orig/pom.xml
++++ jbosscache-core-3.2.8/pom.xml
+@@ -25,10 +25,10 @@
+     <packaging>jar</packaging>
+     <dependencies>
+         <dependency>
+-            <groupId>jgroups</groupId>
++            <groupId>org.jgroups212</groupId>
+             <artifactId>jgroups</artifactId>
+             <!--<version>2.8.0.Beta2</version>-->
+-           <version>2.6.13.GA</version>
++           <version>2.12.3.Final</version>
+         </dependency>
+ 
+         <!--
diff --git a/jbosscache-core.spec b/jbosscache-core.spec
index a6f0b55..6a495f8 100644
--- a/jbosscache-core.spec
+++ b/jbosscache-core.spec
@@ -1,6 +1,6 @@
 Name:       jbosscache-core
 Version:    3.2.8
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    JBoss objects cache
 
 Group:      Development/Libraries
@@ -10,6 +10,7 @@ URL:        http://jboss.org/jbosscache
 # tar cJf jbosscache-core-3.2.8.tar.xz jbosscache-core-3.2.8
 Source0:    %{name}-%{version}.tar.xz
 Source1:    %{name}-depmap.xml
+Patch0:     %{name}-jgroups212.patch
 
 BuildRequires:  maven
 BuildRequires:  maven-surefire-plugin
@@ -62,6 +63,8 @@ find . -name \*.jar -exec rm -f {} \;
 # Remove code for amazon-s3 and berkleydb-je dependencies
 rm -rf src/main/java/org/jboss/cache/loader/{s3,bdbje}
 
+%patch0 -p1
+
 %build
 # Not running tests due to missing dependencies
 mvn-rpmbuild install -Dmaven.test.skip=true \
@@ -95,6 +98,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 23 2012 Matt Spaulding <mspaulding06 at gmail.com> - 3.2.8-4
+- Updated pom reference to jgroups to use jgroups212 instead
+
 * Wed Aug 08 2012 Matt Spaulding <mspaulding06 at gmail.com> - 3.2.8-3
 - Using custom depmap
 - Corrected license type


More information about the scm-commits mailing list