[eucalyptus] Remove backport-util-concurrent
Andy Grimm
arg at fedoraproject.org
Tue Dec 11 22:23:24 UTC 2012
commit 1cc896d7d163208d3ae5f95f43e98a724f11b5bd
Author: Andy Grimm <agrimm at gmail.com>
Date: Tue Dec 11 17:23:15 2012 -0500
Remove backport-util-concurrent
eucalyptus-drop-backport-util-concurrent.patch | 122 ++++++++++++++++++++++++
eucalyptus-jarlinks.txt | 1 -
eucalyptus.spec | 11 ++-
3 files changed, 131 insertions(+), 3 deletions(-)
---
diff --git a/eucalyptus-drop-backport-util-concurrent.patch b/eucalyptus-drop-backport-util-concurrent.patch
new file mode 100644
index 0000000..971dc42
--- /dev/null
+++ b/eucalyptus-drop-backport-util-concurrent.patch
@@ -0,0 +1,122 @@
+From 0237ff5b85b111f2ffed863fabfc51a590814822 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <goldmann at fedoraproject.org>
+Date: Wed, 28 Nov 2012 13:13:35 +0100
+Subject: [PATCH] Use java.util.concurrent from JDK, drop the use of
+ backport-util-concurrent
+
+---
+ .../src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java | 2 +-
+ .../src/main/java/com/eucalyptus/upgrade/StandalonePersistence.java | 2 +-
+ .../msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java | 2 +-
+ .../msgs/src/main/java/com/eucalyptus/component/ComponentId.java | 2 +-
+ .../src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java | 2 +-
+ .../msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java | 2 +-
+ clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java | 2 +-
+ .../msgs/src/main/java/com/eucalyptus/ws/protocol/BaseQueryBinding.java | 2 +-
+ .../wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java
+index b5b3430..9999287 100644
+--- a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java
++++ b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java
+@@ -111,7 +111,7 @@ import com.google.common.base.Function;
+ import com.google.common.base.Predicate;
+ import com.google.common.collect.Iterables;
+ import com.google.common.collect.Lists;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+ import edu.ucsb.eucalyptus.cloud.VirtualBootRecord;
+ import edu.ucsb.eucalyptus.cloud.VmKeyInfo;
+ import edu.ucsb.eucalyptus.cloud.VmRunResponseType;
+diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java
+index db01a04..48cd450 100644
+--- a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java
++++ b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/BillOfMaterials.java
+@@ -72,7 +72,7 @@ import java.util.Properties;
+ import org.apache.log4j.Logger;
+ import com.google.common.collect.Maps;
+ import com.google.common.io.Resources;
+-import edu.emory.mathcs.backport.java.util.Collections;
++import java.util.Collections;
+
+ /**
+ * Purpose: Show version information about the tree used to build the running software.
+diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java
+index 631f74b..fdc492a 100644
+--- a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java
++++ b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ComponentId.java
+@@ -31,7 +31,7 @@ import com.eucalyptus.ws.server.Pipelines;
+ import com.google.common.base.Predicate;
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
+-import edu.emory.mathcs.backport.java.util.Arrays;
++import java.util.Arrays;
+ import edu.ucsb.eucalyptus.msgs.BaseMessage;
+
+ public abstract class ComponentId implements HasName<ComponentId>, HasFullName<ComponentId>, Serializable {
+diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java
+index a8b064f..7474a79 100644
+--- a/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java
++++ b/clc/modules/msgs/src/main/java/com/eucalyptus/configurable/PropertiesDiscovery.java
+@@ -4,7 +4,7 @@ import java.lang.reflect.Field;
+ import org.apache.log4j.Logger;
+ import com.eucalyptus.bootstrap.ServiceJarDiscovery;
+ import com.google.common.collect.ObjectArrays;
+-import edu.emory.mathcs.backport.java.util.Arrays;
++import java.util.Arrays;
+
+ public class PropertiesDiscovery extends ServiceJarDiscovery {
+ private static Logger LOG = Logger.getLogger( PropertiesDiscovery.class );
+diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java
+index aa2c7ce..30860f6 100644
+--- a/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java
++++ b/clc/modules/msgs/src/main/java/com/eucalyptus/entities/PersistenceContexts.java
+@@ -30,7 +30,7 @@ import com.google.common.collect.ArrayListMultimap;
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Multimap;
+ import com.google.common.collect.Ordering;
+-import edu.emory.mathcs.backport.java.util.Collections;
++import java.util.Collections;
+
+ @SuppressWarnings( "unchecked" )
+ public class PersistenceContexts {
+diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java b/clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java
+index f408717..3a94a97 100644
+--- a/clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java
++++ b/clc/modules/msgs/src/main/java/com/eucalyptus/system/Threads.java
+@@ -123,7 +123,7 @@ import com.google.common.collect.Collections2;
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
+ import com.google.common.primitives.Ints;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ /**
+ * TODO:GRZE: wrong package should be .util
+diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/BaseQueryBinding.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/BaseQueryBinding.java
+index f1f5ec5..5df3ce7 100644
+--- a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/BaseQueryBinding.java
++++ b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/BaseQueryBinding.java
+@@ -81,7 +81,7 @@ import com.eucalyptus.ws.handlers.RestfulMarshallingHandler;
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
+ import com.google.common.collect.Sets;
+-import edu.emory.mathcs.backport.java.util.Arrays;
++import java.util.Arrays;
+ import edu.ucsb.eucalyptus.msgs.BaseData;
+ import edu.ucsb.eucalyptus.msgs.BaseMessage;
+ import edu.ucsb.eucalyptus.msgs.EucalyptusData;
+diff --git a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java
+index 8772cd7..784d214 100644
+--- a/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java
++++ b/clc/modules/wsstack/src/main/java/com/eucalyptus/ws/ServiceBootstrapper.java
+@@ -92,7 +92,7 @@ import com.eucalyptus.util.Exceptions;
+ import com.google.common.base.Predicate;
+ import com.google.common.collect.Iterables;
+ import com.google.common.collect.Maps;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ @Provides( Empyrean.class )
+ @RunDuring( Bootstrap.Stage.RemoteServicesInit )
diff --git a/eucalyptus-jarlinks.txt b/eucalyptus-jarlinks.txt
index 56d4358..eebf495 100644
--- a/eucalyptus-jarlinks.txt
+++ b/eucalyptus-jarlinks.txt
@@ -19,7 +19,6 @@
/usr/share/java/axiom/axiom-api.jar
/usr/share/java/axiom/axiom-dom.jar
/usr/share/java/axiom/axiom-impl.jar
-/usr/share/java/backport-util-concurrent-3.1.jar
/usr/share/java/bcel.jar
/usr/share/java/bcprov.jar
/usr/share/java/bsf.jar
diff --git a/eucalyptus.spec b/eucalyptus.spec
index 470f363..b0d1df2 100644
--- a/eucalyptus.spec
+++ b/eucalyptus.spec
@@ -46,7 +46,7 @@ BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang
BuildRequires: axiom
# BuildRequires: axis2
-BuildRequires: backport-util-concurrent
+# BuildRequires: backport-util-concurrent
BuildRequires: bcel
BuildRequires: bouncycastle
BuildRequires: btm
@@ -195,6 +195,9 @@ Patch23: eucalyptus-wss4j-support.patch
Patch24: eucalyptus-disable-reporting.patch
Patch25: eucalyptus-3.2-guava.patch
+# Drop backport-util-concurrent usage
+Patch26: eucalyptus-drop-backport-util-concurrent.patch
+
%description
Eucalyptus is a service overlay that implements elastic computing
using existing resources. The goal of Eucalyptus is to allow sites
@@ -220,7 +223,7 @@ Requires: apache-commons-compress
Requires: apache-commons-fileupload
Requires: apache-commons-io
Requires: axiom
-Requires: backport-util-concurrent
+# Requires: backport-util-concurrent
Requires: bcel
Requires: bouncycastle
Requires: btm
@@ -503,6 +506,7 @@ touch gatherlog/generated/stubs cluster/generated/stubs node/generated/stubs
%patch23 -p1
%patch24 -p1
%patch25 -p1
+%patch26 -p1
# remove classes which depend on junit
# This is because junit on Fedora bundles hamcrest 1.1, which has conflicts
@@ -524,6 +528,9 @@ rm walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/ObjectTest.java
rm walrus/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/WalrusBucketTests.java
popd
+# This has a compilation error, and we aren't supporting upgrades from anything older
+rm clc/modules/core/src/main/java/com/eucalyptus/upgrade/StandalonePersistence.java
+
# Do not redistribute a binary floppy image
# We should have a script to reconstruct this
echo -n > tools/floppy
More information about the scm-commits
mailing list