From 1d94baf400253d636b99dcbd209910ecb93c5c83 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Oct 13 2019 19:48:35 +0000 Subject: Orphaned for 6+ weeks --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 0aa6f57..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/gpars-1.2.1.tar.bz2 -/LICENSE-2.0.txt diff --git a/0001-JSR-166.patch b/0001-JSR-166.patch deleted file mode 100644 index 728e232..0000000 --- a/0001-JSR-166.patch +++ /dev/null @@ -1,396 +0,0 @@ -From f8f1810ce3828b5507dbfe68f348f35644f52314 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Tue, 4 Nov 2014 12:05:10 +0100 -Subject: [PATCH 1/3] JSR-166 - ---- - src/main/groovy/groovyx/gpars/GParsPool.groovy | 14 +++++++------- - src/main/groovy/groovyx/gpars/GParsPoolUtil.java | 8 ++++---- - .../groovyx/gpars/forkjoin/AbstractForkJoinWorker.java | 2 +- - src/main/groovy/groovyx/gpars/forkjoin/ForkJoinUtils.java | 4 ++-- - src/main/groovy/groovyx/gpars/group/PGroupBuilder.java | 2 +- - src/main/groovy/groovyx/gpars/pa/CallAsyncTask.java | 2 +- - src/main/groovy/groovyx/gpars/pa/ClosureMapper.java | 2 +- - .../groovy/groovyx/gpars/pa/ClosureNegationPredicate.java | 2 +- - src/main/groovy/groovyx/gpars/pa/ClosurePredicate.java | 2 +- - src/main/groovy/groovyx/gpars/pa/ClosureReducer.java | 2 +- - .../groovy/groovyx/gpars/pa/GParsPoolUtilHelper.groovy | 8 ++++---- - src/main/groovy/groovyx/gpars/pa/MappedPAWrapper.groovy | 2 +- - src/main/groovy/groovyx/gpars/scheduler/FJPool.java | 2 +- - src/test/groovy/groovyx/gpars/ForkJoinPoolDSLTest.groovy | 2 +- - src/test/groovy/groovyx/gpars/GParsPoolAsyncFunTest.groovy | 2 +- - src/test/groovy/groovyx/gpars/GParsPoolUtilTest.groovy | 2 +- - .../groovyx/gpars/benchmark/BenchmarkGParsPool.groovy | 2 +- - src/test/groovy/groovyx/gpars/groups/FJGroupTest.groovy | 2 +- - .../groovy/groovyx/gpars/groups/PGroupBuilderTest.groovy | 2 +- - .../groovyx/gpars/samples/forkjoin/DemoFJDirect.groovy | 6 +++--- - .../samples/forkjoin/DemoRawForkJoinFileCounter.groovy | 2 +- - .../groovyx/gpars/samples/group/DemoPoolToGroup.groovy | 2 +- - 22 files changed, 37 insertions(+), 37 deletions(-) - -diff --git a/src/main/groovy/groovyx/gpars/GParsPool.groovy b/src/main/groovy/groovyx/gpars/GParsPool.groovy -index 4b6bfdd..f34e97c 100644 ---- a/src/main/groovy/groovyx/gpars/GParsPool.groovy -+++ b/src/main/groovy/groovyx/gpars/GParsPool.groovy -@@ -20,8 +20,8 @@ import groovyx.gpars.dataflow.DataflowVariable - import groovyx.gpars.forkjoin.AbstractForkJoinWorker - import groovyx.gpars.forkjoin.ForkJoinUtils - import groovyx.gpars.util.PoolUtils --import jsr166y.ForkJoinPool --import jsr166y.RecursiveTask -+import java.util.concurrent.ForkJoinPool -+import java.util.concurrent.RecursiveTask - - import java.lang.Thread.UncaughtExceptionHandler - import java.util.concurrent.Future -@@ -76,7 +76,7 @@ public class GParsPool { - - private static createPool(int poolSize, UncaughtExceptionHandler handler) { - if (!(poolSize in 1..Integer.MAX_VALUE)) throw new IllegalArgumentException("Invalid value $poolSize for the pool size has been specified. Please supply a positive int number.") -- final jsr166y.ForkJoinPool pool = new jsr166y.ForkJoinPool(poolSize, ForkJoinPool.defaultForkJoinWorkerThreadFactory, handler, false) -+ final java.util.concurrent.ForkJoinPool pool = new java.util.concurrent.ForkJoinPool(poolSize, ForkJoinPool.defaultForkJoinWorkerThreadFactory, handler, false) - return pool - } - -@@ -140,7 +140,7 @@ public class GParsPool { - * @param cl The block of code to invoke with the DSL enabled - */ - public static withPool(int numberOfThreads, UncaughtExceptionHandler handler, Closure cl) { -- final jsr166y.ForkJoinPool pool = createPool(numberOfThreads, handler) -+ final java.util.concurrent.ForkJoinPool pool = createPool(numberOfThreads, handler) - try { - return withExistingPool(pool, cl) - } finally { -@@ -165,7 +165,7 @@ public class GParsPool { - *}* - * @param pool The thread pool to use, the pool will not be shutdown after this method returns - */ -- public static withExistingPool(jsr166y.ForkJoinPool pool, Closure cl) { -+ public static withExistingPool(java.util.concurrent.ForkJoinPool pool, Closure cl) { - - currentPoolStack << pool - def result = null -@@ -184,7 +184,7 @@ public class GParsPool { - * Just like withExistingPool() registers a thread pool, but doesn't install the GParsPoolUtil category. - * Used by ParallelEnhancer's Parallel mixins. - */ -- static ensurePool(final jsr166y.ForkJoinPool pool, final Closure cl) { -+ static ensurePool(final java.util.concurrent.ForkJoinPool pool, final Closure cl) { - currentPoolStack << pool - try { - return cl(pool) -@@ -226,7 +226,7 @@ public class GParsPool { - * @return Futures for the result values or exceptions of all closures - */ - public static List> executeAsync(Closure... closures) { -- jsr166y.ForkJoinPool pool = retrieveCurrentPool() -+ java.util.concurrent.ForkJoinPool pool = retrieveCurrentPool() - if (pool == null) throw new IllegalStateException("No active Fork/Join thread pool available to execute closures asynchronously. Consider wrapping the function call with GParsPool.withPool().") - List> result = closures.collect { cl -> - pool.submit(new MyCancellableRecursiveTask(cl)) -diff --git a/src/main/groovy/groovyx/gpars/GParsPoolUtil.java b/src/main/groovy/groovyx/gpars/GParsPoolUtil.java -index ff6aed1..8e85943 100644 ---- a/src/main/groovy/groovyx/gpars/GParsPoolUtil.java -+++ b/src/main/groovy/groovyx/gpars/GParsPoolUtil.java -@@ -18,8 +18,8 @@ package groovyx.gpars; - - import groovy.lang.Closure; - import groovy.time.Duration; --import groovyx.gpars.extra166y.Ops; --import groovyx.gpars.extra166y.ParallelArray; -+import extra166y.Ops; -+import extra166y.ParallelArray; - import groovyx.gpars.memoize.LRUProtectionStorage; - import groovyx.gpars.pa.CallAsyncTask; - import groovyx.gpars.pa.CallClosure; -@@ -33,8 +33,8 @@ import groovyx.gpars.pa.SumClosure; - import groovyx.gpars.scheduler.FJPool; - import groovyx.gpars.util.GeneralTimer; - import groovyx.gpars.util.PAUtils; --import jsr166y.ForkJoinPool; --import jsr166y.RecursiveTask; -+import java.util.concurrent.ForkJoinPool; -+import java.util.concurrent.RecursiveTask; - - import java.util.ArrayList; - import java.util.Collection; -diff --git a/src/main/groovy/groovyx/gpars/forkjoin/AbstractForkJoinWorker.java b/src/main/groovy/groovyx/gpars/forkjoin/AbstractForkJoinWorker.java -index e8dbc51..033ecec 100644 ---- a/src/main/groovy/groovyx/gpars/forkjoin/AbstractForkJoinWorker.java -+++ b/src/main/groovy/groovyx/gpars/forkjoin/AbstractForkJoinWorker.java -@@ -16,7 +16,7 @@ - - package groovyx.gpars.forkjoin; - --import jsr166y.RecursiveTask; -+import java.util.concurrent.RecursiveTask; - - import java.util.ArrayList; - import java.util.Arrays; -diff --git a/src/main/groovy/groovyx/gpars/forkjoin/ForkJoinUtils.java b/src/main/groovy/groovyx/gpars/forkjoin/ForkJoinUtils.java -index 97b5149..8f4c758 100644 ---- a/src/main/groovy/groovyx/gpars/forkjoin/ForkJoinUtils.java -+++ b/src/main/groovy/groovyx/gpars/forkjoin/ForkJoinUtils.java -@@ -16,8 +16,8 @@ - - package groovyx.gpars.forkjoin; - --import jsr166y.ForkJoinPool; --import jsr166y.ForkJoinTask; -+import java.util.concurrent.ForkJoinPool; -+import java.util.concurrent.ForkJoinTask; - - import java.util.concurrent.ExecutionException; - -diff --git a/src/main/groovy/groovyx/gpars/group/PGroupBuilder.java b/src/main/groovy/groovyx/gpars/group/PGroupBuilder.java -index 0a2d893..b0c787a 100644 ---- a/src/main/groovy/groovyx/gpars/group/PGroupBuilder.java -+++ b/src/main/groovy/groovyx/gpars/group/PGroupBuilder.java -@@ -19,7 +19,7 @@ package groovyx.gpars.group; - import groovyx.gpars.scheduler.DefaultPool; - import groovyx.gpars.scheduler.FJPool; - import groovyx.gpars.scheduler.Pool; --import jsr166y.ForkJoinPool; -+import java.util.concurrent.ForkJoinPool; - - import java.util.concurrent.ThreadPoolExecutor; - -diff --git a/src/main/groovy/groovyx/gpars/pa/CallAsyncTask.java b/src/main/groovy/groovyx/gpars/pa/CallAsyncTask.java -index e7d1d5c..6610217 100644 ---- a/src/main/groovy/groovyx/gpars/pa/CallAsyncTask.java -+++ b/src/main/groovy/groovyx/gpars/pa/CallAsyncTask.java -@@ -17,7 +17,7 @@ - package groovyx.gpars.pa; - - import groovy.lang.Closure; --import jsr166y.RecursiveTask; -+import java.util.concurrent.RecursiveTask; - - /** - * A helper class to wrap closures for callAsync on GParsPool -diff --git a/src/main/groovy/groovyx/gpars/pa/ClosureMapper.java b/src/main/groovy/groovyx/gpars/pa/ClosureMapper.java -index df090da..2e20bc8 100644 ---- a/src/main/groovy/groovyx/gpars/pa/ClosureMapper.java -+++ b/src/main/groovy/groovyx/gpars/pa/ClosureMapper.java -@@ -16,7 +16,7 @@ - - package groovyx.gpars.pa; - --import groovyx.gpars.extra166y.Ops; -+import extra166y.Ops; - import groovy.lang.Closure; - - /** -diff --git a/src/main/groovy/groovyx/gpars/pa/ClosureNegationPredicate.java b/src/main/groovy/groovyx/gpars/pa/ClosureNegationPredicate.java -index dc2e782..22987ec 100644 ---- a/src/main/groovy/groovyx/gpars/pa/ClosureNegationPredicate.java -+++ b/src/main/groovy/groovyx/gpars/pa/ClosureNegationPredicate.java -@@ -16,7 +16,7 @@ - - package groovyx.gpars.pa; - --import groovyx.gpars.extra166y.Ops; -+import extra166y.Ops; - import groovy.lang.Closure; - - /** -diff --git a/src/main/groovy/groovyx/gpars/pa/ClosurePredicate.java b/src/main/groovy/groovyx/gpars/pa/ClosurePredicate.java -index d2fae30..620bd01 100644 ---- a/src/main/groovy/groovyx/gpars/pa/ClosurePredicate.java -+++ b/src/main/groovy/groovyx/gpars/pa/ClosurePredicate.java -@@ -16,7 +16,7 @@ - - package groovyx.gpars.pa; - --import groovyx.gpars.extra166y.Ops; -+import extra166y.Ops; - import groovy.lang.Closure; - - /** -diff --git a/src/main/groovy/groovyx/gpars/pa/ClosureReducer.java b/src/main/groovy/groovyx/gpars/pa/ClosureReducer.java -index c0a35f2..4ff7adc 100644 ---- a/src/main/groovy/groovyx/gpars/pa/ClosureReducer.java -+++ b/src/main/groovy/groovyx/gpars/pa/ClosureReducer.java -@@ -16,7 +16,7 @@ - - package groovyx.gpars.pa; - --import groovyx.gpars.extra166y.Ops; -+import extra166y.Ops; - import groovy.lang.Closure; - - /** -diff --git a/src/main/groovy/groovyx/gpars/pa/GParsPoolUtilHelper.groovy b/src/main/groovy/groovyx/gpars/pa/GParsPoolUtilHelper.groovy -index a23dfe6..b6f6fdc 100644 ---- a/src/main/groovy/groovyx/gpars/pa/GParsPoolUtilHelper.groovy -+++ b/src/main/groovy/groovyx/gpars/pa/GParsPoolUtilHelper.groovy -@@ -20,15 +20,15 @@ import groovyx.gpars.GParsPool - import groovyx.gpars.GParsPoolUtil - import groovyx.gpars.TransparentParallel - import groovyx.gpars.dataflow.DataflowVariable --import groovyx.gpars.extra166y.Ops --import groovyx.gpars.extra166y.ParallelArray --import groovyx.gpars.extra166y.ParallelArrayWithMapping -+import extra166y.Ops -+import extra166y.ParallelArray -+import extra166y.ParallelArrayWithMapping - import groovyx.gpars.memoize.LRUProtectionStorage - import groovyx.gpars.memoize.NullProtectionStorage - import groovyx.gpars.memoize.NullValue - import groovyx.gpars.scheduler.FJPool - import groovyx.gpars.util.PAUtils --import jsr166y.ForkJoinPool -+import java.util.concurrent.ForkJoinPool - - import java.lang.ref.ReferenceQueue - import java.lang.ref.SoftReference -diff --git a/src/main/groovy/groovyx/gpars/pa/MappedPAWrapper.groovy b/src/main/groovy/groovyx/gpars/pa/MappedPAWrapper.groovy -index 07c235e..b48938f 100644 ---- a/src/main/groovy/groovyx/gpars/pa/MappedPAWrapper.groovy -+++ b/src/main/groovy/groovyx/gpars/pa/MappedPAWrapper.groovy -@@ -16,7 +16,7 @@ - - package groovyx.gpars.pa - --import groovyx.gpars.extra166y.ParallelArrayWithMapping -+import extra166y.ParallelArrayWithMapping - - /** - * The ParallelArray wrapper used after the map() operation -diff --git a/src/main/groovy/groovyx/gpars/scheduler/FJPool.java b/src/main/groovy/groovyx/gpars/scheduler/FJPool.java -index 359e344..148be60 100644 ---- a/src/main/groovy/groovyx/gpars/scheduler/FJPool.java -+++ b/src/main/groovy/groovyx/gpars/scheduler/FJPool.java -@@ -17,7 +17,7 @@ - package groovyx.gpars.scheduler; - - import groovyx.gpars.util.PoolUtils; --import jsr166y.ForkJoinPool; -+import java.util.concurrent.ForkJoinPool; - - import java.util.concurrent.TimeUnit; - -diff --git a/src/test/groovy/groovyx/gpars/ForkJoinPoolDSLTest.groovy b/src/test/groovy/groovyx/gpars/ForkJoinPoolDSLTest.groovy -index 5c2b6a8..9195b9d 100644 ---- a/src/test/groovy/groovyx/gpars/ForkJoinPoolDSLTest.groovy -+++ b/src/test/groovy/groovyx/gpars/ForkJoinPoolDSLTest.groovy -@@ -17,7 +17,7 @@ - package groovyx.gpars - - import java.lang.Thread.UncaughtExceptionHandler --import jsr166y.ForkJoinPool -+import java.util.concurrent.ForkJoinPool - import static groovyx.gpars.GParsPool.withExistingPool - import static groovyx.gpars.GParsPool.withPool - -diff --git a/src/test/groovy/groovyx/gpars/GParsPoolAsyncFunTest.groovy b/src/test/groovy/groovyx/gpars/GParsPoolAsyncFunTest.groovy -index a27b200..203f2bb 100644 ---- a/src/test/groovy/groovyx/gpars/GParsPoolAsyncFunTest.groovy -+++ b/src/test/groovy/groovyx/gpars/GParsPoolAsyncFunTest.groovy -@@ -19,7 +19,7 @@ package groovyx.gpars - import groovyx.gpars.dataflow.DataflowQueue - import groovyx.gpars.dataflow.Promise - import groovyx.gpars.scheduler.FJPool --import jsr166y.RecursiveAction -+import java.util.concurrent.RecursiveAction - - /** - * @author Vaclav Pech -diff --git a/src/test/groovy/groovyx/gpars/GParsPoolUtilTest.groovy b/src/test/groovy/groovyx/gpars/GParsPoolUtilTest.groovy -index a7c60fd..5c0d642 100644 ---- a/src/test/groovy/groovyx/gpars/GParsPoolUtilTest.groovy -+++ b/src/test/groovy/groovyx/gpars/GParsPoolUtilTest.groovy -@@ -16,7 +16,7 @@ - - package groovyx.gpars - --import jsr166y.ForkJoinPool -+import java.util.concurrent.ForkJoinPool - - import java.lang.Thread.UncaughtExceptionHandler - import java.util.concurrent.ConcurrentHashMap -diff --git a/src/test/groovy/groovyx/gpars/benchmark/BenchmarkGParsPool.groovy b/src/test/groovy/groovyx/gpars/benchmark/BenchmarkGParsPool.groovy -index 7932ab0..6a7e476 100644 ---- a/src/test/groovy/groovyx/gpars/benchmark/BenchmarkGParsPool.groovy -+++ b/src/test/groovy/groovyx/gpars/benchmark/BenchmarkGParsPool.groovy -@@ -21,7 +21,7 @@ import groovyx.gpars.GParsPoolUtil - import groovyx.gpars.ParallelEnhancer - import groovyx.gpars.extra166y.Ops.Reducer - import groovyx.gpars.extra166y.ParallelArray --import jsr166y.ForkJoinPool -+import java.util.concurrent.ForkJoinPool - - import static groovyx.gpars.GParsPool.withExistingPool - import static groovyx.gpars.GParsPool.withPool -diff --git a/src/test/groovy/groovyx/gpars/groups/FJGroupTest.groovy b/src/test/groovy/groovyx/gpars/groups/FJGroupTest.groovy -index d879203..554c59f 100644 ---- a/src/test/groovy/groovyx/gpars/groups/FJGroupTest.groovy -+++ b/src/test/groovy/groovyx/gpars/groups/FJGroupTest.groovy -@@ -21,7 +21,7 @@ import groovyx.gpars.group.DefaultPGroup - import groovyx.gpars.scheduler.DefaultPool - import groovyx.gpars.scheduler.FJPool - import java.util.concurrent.CountDownLatch --import jsr166y.ForkJoinWorkerThread -+import java.util.concurrent.ForkJoinWorkerThread - - public class FJGroupTest extends GroovyTestCase { - public void testFJGroup() { -diff --git a/src/test/groovy/groovyx/gpars/groups/PGroupBuilderTest.groovy b/src/test/groovy/groovyx/gpars/groups/PGroupBuilderTest.groovy -index b849e44..120088e 100644 ---- a/src/test/groovy/groovyx/gpars/groups/PGroupBuilderTest.groovy -+++ b/src/test/groovy/groovyx/gpars/groups/PGroupBuilderTest.groovy -@@ -22,7 +22,7 @@ import groovyx.gpars.scheduler.DefaultPool - import groovyx.gpars.scheduler.Pool - import java.util.concurrent.ExecutorService - import java.util.concurrent.Executors --import jsr166y.ForkJoinPool -+import java.util.concurrent.ForkJoinPool - - class PGroupBuilderTest extends GroovyTestCase { - public void testCreationFromPool() { -diff --git a/src/test/groovy/groovyx/gpars/samples/forkjoin/DemoFJDirect.groovy b/src/test/groovy/groovyx/gpars/samples/forkjoin/DemoFJDirect.groovy -index ee8d2ac..e7f249a 100644 ---- a/src/test/groovy/groovyx/gpars/samples/forkjoin/DemoFJDirect.groovy -+++ b/src/test/groovy/groovyx/gpars/samples/forkjoin/DemoFJDirect.groovy -@@ -16,9 +16,9 @@ - - package groovyx.gpars.samples.forkjoin - --import jsr166y.ForkJoinPool --import jsr166y.ForkJoinTask --import jsr166y.RecursiveTask -+import java.util.concurrent.ForkJoinPool -+import java.util.concurrent.ForkJoinTask -+import java.util.concurrent.RecursiveTask - - class Fibonacci extends RecursiveTask { - final int n; -diff --git a/src/test/groovy/groovyx/gpars/samples/forkjoin/DemoRawForkJoinFileCounter.groovy b/src/test/groovy/groovyx/gpars/samples/forkjoin/DemoRawForkJoinFileCounter.groovy -index 5356cbc..af509dd 100644 ---- a/src/test/groovy/groovyx/gpars/samples/forkjoin/DemoRawForkJoinFileCounter.groovy -+++ b/src/test/groovy/groovyx/gpars/samples/forkjoin/DemoRawForkJoinFileCounter.groovy -@@ -17,7 +17,7 @@ - package groovyx.gpars.samples.forkjoin - - import groovyx.gpars.GParsPool --import jsr166y.RecursiveTask -+import java.util.concurrent.RecursiveTask - - /** - * Shows use of the ForkJoin mechanics to count files recursively in a directory. -diff --git a/src/test/groovy/groovyx/gpars/samples/group/DemoPoolToGroup.groovy b/src/test/groovy/groovyx/gpars/samples/group/DemoPoolToGroup.groovy -index 9f88b9c..7fe29ed 100644 ---- a/src/test/groovy/groovyx/gpars/samples/group/DemoPoolToGroup.groovy -+++ b/src/test/groovy/groovyx/gpars/samples/group/DemoPoolToGroup.groovy -@@ -21,7 +21,7 @@ import groovyx.gpars.GParsPool - import groovyx.gpars.group.PGroup - import groovyx.gpars.group.PGroupBuilder - import java.util.concurrent.ExecutorService --import jsr166y.ForkJoinPool -+import java.util.concurrent.ForkJoinPool - - /** - * Demonstrates how to use existing thread pool to build an instance of PGroup and then retrieve the pool back from the group. --- -2.13.6 - diff --git a/0002-Enable-XMvn-local-mode.patch b/0002-Enable-XMvn-local-mode.patch deleted file mode 100644 index 8dcd64f..0000000 --- a/0002-Enable-XMvn-local-mode.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 1301e1357283018fa2271b16cc2bb2b7bead2de0 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Tue, 4 Nov 2014 09:36:04 +0100 -Subject: [PATCH 2/3] Enable XMvn local mode - ---- - build.gradle | 27 ++------------------------- - buildSrc/build.gradle | 6 ------ - buildSrc/src/main/groovy/PdfGuide.groovy | 12 ------------ - 3 files changed, 2 insertions(+), 43 deletions(-) - -diff --git a/build.gradle b/build.gradle -index 71fa27c..b199036 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -115,28 +115,10 @@ configurations { - - dependencies { - compile group: 'org.codehaus.groovy', name: 'groovy-all', version: project.hasProperty('gpars_groovyVersion') ? gpars_groovyVersion : '2.1.9' -- compile 'org.codehaus.jsr166-mirror:jsr166y:1.7.0' -+ 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' - 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' -- testCompile 'com.google.code.gson:gson:2.2.2' -- testCompile 'com.google.guava:guava:14.0.1' -- testCompile fileTree(dir: 'lib', include: '*.jar') -- // Manually load up the required dependencies for grailsDoc to avoid pulling in everything needed for -- // Grails, including all the SpringRoo stuff. -- docs group: 'org.codehaus.groovy', name: 'groovy-all', version: project.hasProperty('gpars_groovyVersion') ? gpars_groovyVersion : '2.0.8' -- docs 'org.yaml:snakeyaml:1.12' -- docs 'commons-lang:commons-lang:2.6' -- docs project.ext.grailsDocs -- docs project.ext.radeox -- docs project.ext.lowagieItext -- docs project.ext.xhtmlRenderer -- docs 'commons-logging:commons-logging:1.1.1' -- deployerJars "org.apache.maven.wagon:wagon-http-lightweight:2.4" -- cover 'net.sourceforge.cobertura:cobertura:1.9.4.1' -- testRuntime 'net.sourceforge.cobertura:cobertura:1.9.4.1' - } - - task runBenchmarks(type: JavaExec) { -@@ -300,11 +282,6 @@ task zipSrc(type: Jar, dependsOn: classes) { - from sourceSets.main.allSource - } - --artifacts { -- archives(zipSrc) -- archives(zipDoc) --} -- - task zipSamples(type: Zip) { - appendix = 'samples' - from sourceSets.test.allSource.matching { -diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle -index 2516924..829175c 100644 ---- a/buildSrc/build.gradle -+++ b/buildSrc/build.gradle -@@ -22,8 +22,6 @@ - - apply plugin: 'groovy' - --apply from: '../gradle/docsDependencies.gradle' -- - repositories { - mavenCentral() - //mavenRepo name: 'SpringSource', url: 'http://repository.springsource.com/maven/bundles/release' -@@ -33,8 +31,4 @@ repositories { - dependencies { - compile localGroovy() - compile gradleApi() -- compile(project.ext.grailsDocs) { transitive = false } -- compile(project.ext.xhtmlRenderer) { transitive = false } -- compile(project.ext.lowagieItext) { transitive = false } -- compile(project.ext.radeox) { transitive = false } - } -diff --git a/buildSrc/src/main/groovy/PdfGuide.groovy b/buildSrc/src/main/groovy/PdfGuide.groovy -index 4ada443..b2d1ae9 100644 ---- a/buildSrc/src/main/groovy/PdfGuide.groovy -+++ b/buildSrc/src/main/groovy/PdfGuide.groovy -@@ -24,7 +24,6 @@ import org.gradle.api.DefaultTask - import org.gradle.api.tasks.Input - import org.gradle.api.tasks.OutputDirectory - import org.gradle.api.tasks.TaskAction --import grails.doc.PdfBuilder - - class PdfGuide extends DefaultTask { - -@@ -38,17 +37,6 @@ class PdfGuide extends DefaultTask { - - @TaskAction - def publish() { -- try { -- PdfBuilder.build( -- basedir: outputDirectory.absolutePath, -- home: project.file('grails-doc').absolutePath, -- tool: 'pdf/gpars' -- ) -- } catch (ignore) { -- // it's very likely that the stream is closed before -- // the renderer 'finishes' but it actually does -- // ignore for now -- } - project.file(outputDirectory.absolutePath + '/guide/single.pdf') - .renameTo(new File(outputDirectory, pdfName).absolutePath) - } --- -2.13.6 - diff --git a/0003-Port-build-script-to-current-gradle.patch b/0003-Port-build-script-to-current-gradle.patch deleted file mode 100644 index 56ff212..0000000 --- a/0003-Port-build-script-to-current-gradle.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ec9a2856a49c648d2acfec5455aa7efc52346d20 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Mon, 30 Mar 2015 16:26:57 +0200 -Subject: [PATCH 3/3] Port build script to current gradle - ---- - build.gradle | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/build.gradle b/build.gradle -index b199036..0341009 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -267,7 +267,6 @@ groovydoc { - header = packageTitle - footer = copyrightString - include 'groovyx/gpars/**' -- overview = new File('overview.html') - } - - task documentation(dependsOn: ['javadoc', 'groovydoc', 'buildGuide', 'pdfGuide'], description: 'Create the API documentation.') -@@ -299,7 +298,7 @@ task zipJavaDemo(type: Zip) { - - task zipDist(type: Zip) { - from jar.outputs.files -- from(runtimeClasspath) { -+ from(sourceSets.main.runtimeClasspath) { - include('jsr166*', 'netty*', 'multiverse*') - } - from('licenses') { --- -2.13.6 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100755 index 12a11bc..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# Usage: generate-tarball.sh -set -e -rm -rf GPars-release-$1 gpars-$1 release-$1.tar.gz gpars-$1.tar.bz2 -wget http://github.com/GPars/GPars/archive/release-$1.tar.gz -tar xf release-$1.tar.gz -mv GPars-release-$1 gpars-$1 -rm -rf gpars-$1/{artwork/,docs/,java-demo/,grails-doc/,gradle/wrapper/,lib/,src/main/groovy/groovyx/gpars/extra166y/} -tar c gpars-$1 | lbzip2 -u >gpars-$1.tar.bz2 diff --git a/gpars-1.2.1-port-to-netty-3.10.6.patch b/gpars-1.2.1-port-to-netty-3.10.6.patch deleted file mode 100644 index 4eb311b..0000000 --- a/gpars-1.2.1-port-to-netty-3.10.6.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nru gpars-1.2.1/src/main/groovy/groovyx/gpars/remote/netty/RemoteObjectDecoder.java gpars-1.2.1.netty3/src/main/groovy/groovyx/gpars/remote/netty/RemoteObjectDecoder.java ---- gpars-1.2.1/src/main/groovy/groovyx/gpars/remote/netty/RemoteObjectDecoder.java 2014-05-09 07:20:08.000000000 +0200 -+++ gpars-1.2.1.netty3/src/main/groovy/groovyx/gpars/remote/netty/RemoteObjectDecoder.java 2016-12-27 11:55:46.293323739 +0100 -@@ -22,6 +22,7 @@ - import org.jboss.netty.channel.Channel; - import org.jboss.netty.channel.ChannelHandler; - import org.jboss.netty.channel.ChannelHandlerContext; -+import org.jboss.netty.handler.codec.serialization.ClassResolvers; - import org.jboss.netty.handler.codec.serialization.ObjectDecoder; - - @ChannelHandler.Sharable -@@ -34,7 +35,7 @@ - * @param connection connection handling serialization details - */ - public RemoteObjectDecoder(final RemoteConnection connection) { -- super(); -+ super(ClassResolvers.weakCachingResolver(null)); - this.connection = connection; - } - diff --git a/gpars.spec b/gpars.spec deleted file mode 100644 index 7a0b8a9..0000000 --- a/gpars.spec +++ /dev/null @@ -1,129 +0,0 @@ -Name: gpars -Version: 1.2.1 -Release: 14%{?dist} -Summary: Groovy Parallel Systems -License: ASL 2.0 and Public Domain -URL: http://gpars.codehaus.org -BuildArch: noarch - -# ./generate-tarball.sh %{version} -Source0: %{name}-%{version}.tar.bz2 -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -Source2: generate-tarball.sh - -Patch0: 0001-JSR-166.patch -Patch1: 0002-Enable-XMvn-local-mode.patch -Patch2: 0003-Port-build-script-to-current-gradle.patch -Patch3: gpars-1.2.1-port-to-netty-3.10.6.patch - -BuildRequires: gradle-local >= 2.1-0.10 -BuildRequires: apache-parent -BuildRequires: extra166y -BuildRequires: jcsp -BuildRequires: netty3 -BuildRequires: groovy-lib -BuildRequires: multiverse - -%description -The GPars framework offers Java developers intuitive and safe ways to -handle Java or Groovy tasks concurrently. Leveraging the enormous -flexibility of the Groovy programming language and building on proven -Java technologies, we aim to make concurrent programming for -multi-core hardware intuitive, robust and enjoyable. - -GPars is a multi-paradigm concurrency framework, offering several -mutually cooperating high-level concurrency abstractions, such as -Dataflow operators, Promises, CSP, Actors, Asynchronous Functions, -Agents and Parallel Collections. - -%prep -%setup -q -cp %{SOURCE1} . -rm -rf lib/ gradle/wrapper/ -rm -rf src/main/groovy/groovyx/gpars/extra166y/ -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - -%build -%gradle_build -f - -%install -%mvn_install - -%files -f .mfiles -%doc README.md -%license LICENSE-2.0.txt - -%changelog -* Thu Jul 25 2019 Fedora Release Engineering - 1.2.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1.2.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.2.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1.2.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Oct 09 2017 Michael Simacek - 1.2.1-10 -- Fix build with current gradle - -* Wed Jul 26 2017 Fedora Release Engineering - 1.2.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.2.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Dec 27 2016 gil cattaneo 1.2.1-7 -- build fix for netty 3.10.6.Final - -* Wed Feb 03 2016 Fedora Release Engineering - 1.2.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Oct 28 2015 Mikolaj Izdebski - 1.2.1-5 -- Build with %%gradle_build - -* Tue Jun 16 2015 Mikolaj Izdebski - 1.2.1-4 -- Use gradle-local script for building - -* Mon Mar 30 2015 Michael Simacek - 1.2.1-3 -- Port build script to current gradle - -* Mon Feb 2 2015 Mikolaj Izdebski - 1.2.1-2 -- Use generic netty3 compat version -- Resolves: rhbz#1187710 - -* Wed Nov 19 2014 Mikolaj Izdebski - 1.2.1-1 -- Non-bootstrap build - -* Wed Nov 19 2014 Mikolaj Izdebski - 1.2.1-0.8 -- Bootstrap build using prebuilt binaries - -* Mon Nov 17 2014 Mikolaj Izdebski - 1.2.1-0.7 -- Include generate-tarball.sh as a source - -* Mon Nov 17 2014 Mikolaj Izdebski - 1.2.1-0.6 -- Remove gradle-wrapper bundled JAR -- Fix spelling error -- Fix ownership of created directories -- Unbuldle extra166y -- Remove non-free content from source tarball - -* Sun Nov 9 2014 Mikolaj Izdebski - 1.2.1-0.5 -- Add BR on apache-parent - -* Sun Nov 9 2014 Mikolaj Izdebski - 1.2.1-0.4 -- Use XMvn resolver factory method - -* Sun Nov 9 2014 Mikolaj Izdebski - 1.2.1-0.3 -- Install Apache License text - -* Sun Nov 9 2014 Mikolaj Izdebski - 1.2.1-0.2 -- Install generated POM instead of prebuilt one - -* Tue Nov 4 2014 Mikolaj Izdebski - 1.2.1-0.1 -- Initial packaging diff --git a/sources b/sources deleted file mode 100644 index 1d9333d..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -330122f2fb422c1a892158cd01f8057c gpars-1.2.1.tar.bz2 -3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt