Merge pull request #364 from aledsage/0.4-version-upgrades
Upgrades to clouds 1.5.2 and whirr 0.8.1
diff --git a/core/src/main/java/brooklyn/event/adapter/JmxHelper.java b/core/src/main/java/brooklyn/event/adapter/JmxHelper.java
index 9664c4f..2b80f09 100644
--- a/core/src/main/java/brooklyn/event/adapter/JmxHelper.java
+++ b/core/src/main/java/brooklyn/event/adapter/JmxHelper.java
@@ -33,7 +33,7 @@
import brooklyn.entity.basic.Attributes;
import brooklyn.entity.basic.EntityLocal;
import brooklyn.util.MutableMap;
-import brooklyn.util.RuntimeInterruptedException;
+import brooklyn.util.exceptions.RuntimeInterruptedException;
import brooklyn.util.internal.LanguageUtils;
import brooklyn.util.internal.TimeExtras;
diff --git a/core/src/main/java/brooklyn/location/geo/UtraceHostGeoLookup.java b/core/src/main/java/brooklyn/location/geo/UtraceHostGeoLookup.java
index 7fb7cf8..c4829cb 100644
--- a/core/src/main/java/brooklyn/location/geo/UtraceHostGeoLookup.java
+++ b/core/src/main/java/brooklyn/location/geo/UtraceHostGeoLookup.java
@@ -14,10 +14,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import brooklyn.util.Exceptions;
import brooklyn.util.NetworkUtils;
import brooklyn.util.ResourceUtils;
-import brooklyn.util.RuntimeInterruptedException;
+import brooklyn.util.exceptions.Exceptions;
+import brooklyn.util.exceptions.RuntimeInterruptedException;
import com.google.common.base.Throwables;
diff --git a/core/src/main/java/brooklyn/util/Time.java b/core/src/main/java/brooklyn/util/Time.java
index f49eccd..79c96d4 100644
--- a/core/src/main/java/brooklyn/util/Time.java
+++ b/core/src/main/java/brooklyn/util/Time.java
@@ -12,6 +12,7 @@
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
+import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.text.Strings;
public class Time {
diff --git a/core/src/main/java/brooklyn/util/Exceptions.java b/core/src/main/java/brooklyn/util/exceptions/Exceptions.java
similarity index 93%
rename from core/src/main/java/brooklyn/util/Exceptions.java
rename to core/src/main/java/brooklyn/util/exceptions/Exceptions.java
index efda008..dad464e 100644
--- a/core/src/main/java/brooklyn/util/Exceptions.java
+++ b/core/src/main/java/brooklyn/util/exceptions/Exceptions.java
@@ -1,4 +1,4 @@
-package brooklyn.util;
+package brooklyn.util.exceptions;
import com.google.common.base.Throwables;
diff --git a/core/src/main/java/brooklyn/util/RuntimeInterruptedException.java b/core/src/main/java/brooklyn/util/exceptions/RuntimeInterruptedException.java
similarity index 95%
rename from core/src/main/java/brooklyn/util/RuntimeInterruptedException.java
rename to core/src/main/java/brooklyn/util/exceptions/RuntimeInterruptedException.java
index a125db4..dba5e2f 100644
--- a/core/src/main/java/brooklyn/util/RuntimeInterruptedException.java
+++ b/core/src/main/java/brooklyn/util/exceptions/RuntimeInterruptedException.java
@@ -1,4 +1,4 @@
-package brooklyn.util;
+package brooklyn.util.exceptions;
/**
* A {@link RuntimeException} that is thrown when a Thread is interrupted.
diff --git a/software/base/src/main/java/brooklyn/entity/basic/lifecycle/ScriptHelper.java b/software/base/src/main/java/brooklyn/entity/basic/lifecycle/ScriptHelper.java
index a1263e7..ba14942 100644
--- a/software/base/src/main/java/brooklyn/entity/basic/lifecycle/ScriptHelper.java
+++ b/software/base/src/main/java/brooklyn/entity/basic/lifecycle/ScriptHelper.java
@@ -15,7 +15,7 @@
import org.slf4j.LoggerFactory;
import brooklyn.util.GroovyJavaMethods;
-import brooklyn.util.RuntimeInterruptedException;
+import brooklyn.util.exceptions.RuntimeInterruptedException;
import brooklyn.util.mutex.WithMutexes;
import brooklyn.util.task.Tasks;
