commit d69566ccceaaabfbbb852f0fa6a5fe8e329039fb
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Feb 2 12:58:03 2015 +0100
Use generic netty3 compat version
- Resolves: rhbz#1187710
0001-JSR-166.patch | 2 +-
0002-Enable-XMvn-local-mode.patch | 8 ++++----
gpars.spec | 6 +++++-
3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/0001-JSR-166.patch b/0001-JSR-166.patch
index baed930..5662844 100644
--- a/0001-JSR-166.patch
+++ b/0001-JSR-166.patch
@@ -392,5 +392,5 @@ index 9f88b9c..7fe29ed 100644
/**
* Demonstrates how to use existing thread pool to build an instance of PGroup and then
retrieve the pool back from the group.
--
-1.9.3
+2.1.0
diff --git a/0002-Enable-XMvn-local-mode.patch b/0002-Enable-XMvn-local-mode.patch
index 4b7bd9f..a7e43e1 100644
--- a/0002-Enable-XMvn-local-mode.patch
+++ b/0002-Enable-XMvn-local-mode.patch
@@ -1,4 +1,4 @@
-From 3ae548dd8fa91537c96c05335442e9c203c8e2c0 Mon Sep 17 00:00:00 2001
+From 9592d828bc898828cb198c7a51e773a6642e8ca6 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue, 4 Nov 2014 09:36:04 +0100
Subject: [PATCH 2/2] Enable XMvn local mode
@@ -10,7 +10,7 @@ Subject: [PATCH 2/2] Enable XMvn local mode
3 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/build.gradle b/build.gradle
-index 71fa27c..339244a 100644
+index 71fa27c..638cfdb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -89,6 +89,7 @@ jar {
@@ -29,7 +29,7 @@ index 71fa27c..339244a 100644
+ compile 'org.codehaus.jsr166-mirror:extra166y:1.7.0'
compile('org.multiverse:multiverse-core:0.7.0') { transitive = false }
- compile group: 'org.jboss.netty', name: 'netty', version:
project.hasProperty('gpars_nettyVersion') ? gpars_nettyVersion :
'3.2.9.Final'
-+ compile group: 'org.jboss.netty', name: 'netty', version:
project.hasProperty('gpars_nettyVersion') ? gpars_nettyVersion :
'3.6.6.Final'
++ compile group: 'org.jboss.netty', name: 'netty', version:
project.hasProperty('gpars_nettyVersion') ? gpars_nettyVersion : '3'
compile 'org.codehaus.jcsp:jcsp:1.1-rc5'
- testCompile group: 'junit', name: 'junit', version:
project.hasProperty('gpars_junitVersion') ? gpars_junitVersion : '4.11'
- testCompile group: 'org.spockframework', name: 'spock-core',
version: project.hasProperty('gpars_spockVersion') ? gpars_spockVersion :
'0.7-groovy-2.0'
@@ -117,5 +117,5 @@ index 4ada443..b2d1ae9 100644
.renameTo(new File(outputDirectory, pdfName).absolutePath)
}
--
-1.9.3
+2.1.0
diff --git a/gpars.spec b/gpars.spec
index 22fd450..8272f28 100644
--- a/gpars.spec
+++ b/gpars.spec
@@ -1,6 +1,6 @@
Name: gpars
Version: 1.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Groovy Parallel Systems
License: ASL 2.0 and Public Domain
URL:
http://gpars.codehaus.org
@@ -60,6 +60,10 @@ jar=$repo/org/codehaus/gpars/gpars/%{version}/gpars-%{version}.jar
%doc README.md
%changelog
+* Mon Feb 2 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2.1-2
+- Use generic netty3 compat version
+- Resolves: rhbz#1187710
+
* Wed Nov 19 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2.1-1
- Non-bootstrap build