[jgroups] Upstream release 3.3.2.Final

Tue Jul 16 08:22:27 UTC 2013

commit 3050b5aab8afac3a8ee4db8c275d3fda913074c7
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Jul 16 10:21:26 2013 +0200

    Upstream release 3.3.2.Final
    
    - New guidelines
    - New upstream source

 .gitignore                    |    1 +
 jgroups-3.0.6.Final-pom.patch |   22 -----------
 jgroups.spec                  |   83 +++++++++++++++++++----------------------
 sources                       |    2 +-
 4 files changed, 40 insertions(+), 68 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index fd3d504..f26de1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ JGroups-2.2.9.2.src-RHCLEAN.tar.gz
 /jgroups-2.12.1.3.Final.tar.xz
 /jgroups-3.0.4.Final.tar.xz
 /jgroups-3.0.6.Final-CLEAN.tar.xz
+/JGroups-3.3.2.Final.tar.gz
diff --git a/jgroups.spec b/jgroups.spec
index 04a478b..da66326 100644
--- a/jgroups.spec
+++ b/jgroups.spec
@@ -2,29 +2,16 @@
 %global namedversion %{version}%{?namedreltag}
 
 Name:     jgroups
-Version:  3.0.6
-Release:  4%{?dist}
+Version:  3.3.2
+Release:  1%{?dist}
 Summary:  Toolkit for reliable multicast communication
 License:  LGPLv2+
 URL:      http://www.jgroups.org
-Group:    Development/Libraries
-
-# git clone git://github.com/belaban/JGroups.git jgroups
-# cd jgroups && git checkout JGroups_3_0_6_Final && git checkout-index -f -a --prefix=jgroups-3.0.6.Final/
-# find jgroups-3.0.6.Final/ -name '*.class' -delete
-# find jgroups-3.0.6.Final/ -name '*.jar' -delete
-# tar cafJ jgroups-3.0.6.Final-CLEAN.tar.xz jgroups-3.0.6.Final
-Source0:  %{name}-%{namedversion}-CLEAN.tar.xz
-Patch0:   %{name}-%{namedversion}-pom.patch
-
-Requires: java
-Requires: jpackage-utils
-
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: ant
+Source0:  https://github.com/belaban/JGroups/archive/JGroups-%{namedversion}.tar.gz
+
 BuildRequires: bsh
 BuildRequires: log4j
+BuildRequires: byteman
 BuildRequires: maven-local
 BuildRequires: maven-antrun-plugin
 BuildRequires: maven-compiler-plugin
@@ -32,7 +19,9 @@ BuildRequires: maven-source-plugin
 BuildRequires: maven-jar-plugin
 BuildRequires: maven-plugin-bundle
 BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-plugin-build-helper
 BuildRequires: testng
+BuildRequires: bouncycastle
 
 BuildArch:     noarch
 
@@ -44,47 +33,51 @@ whose members can send messages to each other.
 
 %package  javadoc
 Summary:  API documentation for %{name}
-Group:    Documentation
-Requires: jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{namedversion} 
-%patch0 -p1
-
-%build
-mvn-rpmbuild install javadoc:aggregate
+%setup -q -n JGroups-JGroups-%{namedversion}
 
-%install
+find . -name '*.class' -delete
+find . -name '*.jar' -delete
 
-# JAR
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%pom_remove_dep "bouncycastle:bcprov-jdk15"
+%pom_add_dep "org.bouncycastle:bcprov-jdk16"
 
-# JAVADOC
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+# log4j 2 is not available
+rm src/org/jgroups/logging/Log4J2LogImpl.java
+sed -i 's|Log4J2LogImpl|Log4JLogImpl|g' src/org/jgroups/logging/LogFactory.java
 
-# POM
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%build
+# A few failed tests:
+# DEBUG: Failed tests: 
+# DEBUG:   PrioTest.init:40 null
+# DEBUG:   BecomeServerTest>BMNGRunner.bmngAfterTest:65->BMNGAbstractRunner.bmngAfterTest:193 ? FileNotFound
+# DEBUG:   ForwardToCoordFailoverTest>BMNGRunner.bmngAfterTest:65->BMNGAbstractRunner.bmngAfterTest:193 ? FileNotFound
+# DEBUG:   MessageBeforeConnectedTest>BMNGRunner.bmngAfterTest:65->BMNGAbstractRunner.bmngAfterTest:193 ? FileNotFound
+# DEBUG:   SequencerFailoverTest>BMNGRunner.bmngAfterTest:65->BMNGAbstractRunner.bmngAfterTest:193 ? FileNotFound
+# DEBUG:   TCPGOSSIP_Test.stopRouter:56 NullPointer
+# DEBUG:   TUNNELDeadLockTest.tearDown:73 NullPointer
+# DEBUG:   TUNNEL_Test.stopRouter:56 NullPointer
+# DEBUG: Tests run: 1795, Failures: 8, Errors: 0, Skipped: 1
+%mvn_build -f
 
-# DEPMAP
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%install
+%mvn_install
 
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc INSTALL.html LICENSE README
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE
 
 %changelog
+* Tue Jul 16 2013 Marek Goldmann <mgoldman at redhat.com> - 3.3.2-1
+- Upstream release 3.3.2.Final
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -95,7 +88,7 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Sat Apr 20 2012 Marek Goldmann <mgoldman at redhat.com> 3.0.6-1
+* Fri Apr 20 2012 Marek Goldmann <mgoldman at redhat.com> 3.0.6-1
 - Upstream release 3.0.6.Final
 
 * Tue Jan 31 2012 Marek Goldmann <mgoldman at redhat.com> - 3.0.4-1
@@ -136,7 +129,7 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 * Thu Sep 27 2007 Jesse Keating <jkeating at redhat.com> - 2.2.9.2-3jpp.3
 - Fix the group typo.
 
-* Fri Aug 14 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-3jpp.2
+* Mon Aug 14 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-3jpp.2
 - Keep ENCRYPTAsymmetricTest since BC now available.
 
 * Fri Aug 11 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-3jpp.1
diff --git a/sources b/sources
index c651b18..5ca449c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e176ea9b5ed0bdfc9739518af0240010  jgroups-3.0.6.Final-CLEAN.tar.xz
+b77543d008742356c4eae1cf1ff2bfa7  JGroups-3.3.2.Final.tar.gz
