You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ke...@apache.org on 2014/10/13 23:40:28 UTC
git commit: Restore JDK8 compatibility
Repository: incubator-aurora
Updated Branches:
refs/heads/master 7c50a35d3 -> 2376d30c4
Restore JDK8 compatibility
I misconfigured my IDE and noticed that we'd stopped compiling on JDK8.
Testing Done:
./gradlew -Pq build
With
```
diff --git a/build.gradle b/build.gradle
index 8f7eed0..af3d4ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,8 +38,8 @@ def httpAssetsPath = 'scheduler/assets'
def thriftVersion = '0.9.1'
compileJava {
- sourceCompatibility = 1.7
- targetCompatibility = 1.7
+ sourceCompatibility = 1.8
+ targetCompatibility = 1.8
}
```
Reviewed at https://reviews.apache.org/r/26504/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/2376d30c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/2376d30c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/2376d30c
Branch: refs/heads/master
Commit: 2376d30c4e56714f41aa4cb55c8cf455d06c803f
Parents: 7c50a35
Author: Kevin Sweeney <ke...@apache.org>
Authored: Mon Oct 13 14:39:26 2014 -0700
Committer: Kevin Sweeney <ke...@apache.org>
Committed: Mon Oct 13 14:39:26 2014 -0700
----------------------------------------------------------------------
src/main/java/org/apache/aurora/scheduler/sla/SlaUtil.java | 2 +-
.../org/apache/aurora/scheduler/state/LockManagerImplTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/2376d30c/src/main/java/org/apache/aurora/scheduler/sla/SlaUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/sla/SlaUtil.java b/src/main/java/org/apache/aurora/scheduler/sla/SlaUtil.java
index 7ecb05a..156b9c0 100644
--- a/src/main/java/org/apache/aurora/scheduler/sla/SlaUtil.java
+++ b/src/main/java/org/apache/aurora/scheduler/sla/SlaUtil.java
@@ -43,6 +43,6 @@ final class SlaUtil {
int total = sorted.size();
int percentileElements = (int) Math.floor(percentile / 100 * total);
int index = total - percentileElements - 1;
- return index >= 0 && index < total ? sorted.get(index) : 0;
+ return index >= 0 && index < total ? sorted.get(index) : 0L;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/2376d30c/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java
index d3c9041..a3054d8 100644
--- a/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java
@@ -174,7 +174,7 @@ public class LockManagerImplTest extends EasyMockTest {
final CountDownLatch reads = new CountDownLatch(2);
EasyMock.makeThreadSafe(storageUtil.storage, false);
- expect(storageUtil.storage.consistentRead(EasyMock.<Work<?, ?>>anyObject()))
+ expect(storageUtil.storage.consistentRead(EasyMock.<Work<Object, ?>>anyObject()))
.andAnswer(new IAnswer<Object>() {
@Override
public Object answer() throws Throwable {