Switch to EASE release update sites and fix build issues
Change-Id: If3d3ea4898b0aec2e6582fb3deeafdecc97ecaa4
Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com>
diff --git a/org.eclipse.tea.ease/src/org/eclipse/tea/ease/EaseScriptTask.java b/org.eclipse.tea.ease/src/org/eclipse/tea/ease/EaseScriptTask.java
index f080321..22e8608 100644
--- a/org.eclipse.tea.ease/src/org/eclipse/tea/ease/EaseScriptTask.java
+++ b/org.eclipse.tea.ease/src/org/eclipse/tea/ease/EaseScriptTask.java
@@ -60,10 +60,8 @@
engine.setOutputStream(log.info());
engine.setCloseStreamsOnTerminate(false);
- ScriptResult result = engine.executeSync(s.getResource());
- if (result.hasException()) {
- throw result.getException();
- }
+ ScriptResult result = engine.execute(s.getResource());
+ result.get(); // waits and throws in case.
}
@Override
diff --git a/org.eclipse.tea.ease/src/org/eclipse/tea/ease/internal/EaseTaskWrapper.java b/org.eclipse.tea.ease/src/org/eclipse/tea/ease/internal/EaseTaskWrapper.java
index 82323cf..e1c8178 100644
--- a/org.eclipse.tea.ease/src/org/eclipse/tea/ease/internal/EaseTaskWrapper.java
+++ b/org.eclipse.tea.ease/src/org/eclipse/tea/ease/internal/EaseTaskWrapper.java
@@ -70,7 +70,7 @@
}
// last try to use whatever it is as script.
- scriptEngine.inject(task);
+ scriptEngine.inject(task, false);
}
@Override
diff --git a/pom.xml b/pom.xml
index f2bf1ad..15a5ba1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,9 +66,9 @@
<url>https://mduft.github.io/lcdsl-latest</url>
</repository>
<repository>
- <id>ease-nightly</id>
+ <id>ease-release</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/ease/integration/nightly</url>
+ <url>http://download.eclipse.org/ease/release/latest</url>
</repository>
</repositories>
