TCI - Update Tycho to 1.4 to support Java 11
Change-Id: I6f83d401c46a16aabe1812ce012373fd77cc27a1
Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
index b784f02..41f8bb3 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
@@ -16,6 +16,7 @@
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.custom.ui.swt.di
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+Import-Package: javax.annotation;version="1.2.0",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
org.eclipse.swt.widgets;version="0.0.0"
Bundle-ActivationPolicy: lazy
diff --git a/releng/org.eclipse.emf.ecp.rap.parent/pom.xml b/releng/org.eclipse.emf.ecp.rap.parent/pom.xml
index ad538d6..eddbc76 100644
--- a/releng/org.eclipse.emf.ecp.rap.parent/pom.xml
+++ b/releng/org.eclipse.emf.ecp.rap.parent/pom.xml
@@ -12,8 +12,8 @@
There are no platform dependent fragments, so the platform is arbitrary -->
<properties>
- <tycho-version>1.2.0</tycho-version>
- <tycho-extras-version>1.2.0</tycho-extras-version>
+ <tycho-version>1.4.0</tycho-version>
+ <tycho-extras-version>1.4.0</tycho-extras-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
diff --git a/releng/org.eclipse.emf.ecp.releng/pom.xml b/releng/org.eclipse.emf.ecp.releng/pom.xml
index 637a315..85d9fa2 100644
--- a/releng/org.eclipse.emf.ecp.releng/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng/pom.xml
@@ -9,8 +9,8 @@
<packaging>pom</packaging>
<properties>
- <tycho-version>1.2.0</tycho-version>
- <tycho-extras-version>1.2.0</tycho-extras-version>
+ <tycho-version>1.4.0</tycho-version>
+ <tycho-extras-version>1.4.0</tycho-extras-version>
<javadoc-version>2.10.3</javadoc-version>
<ecp-version>1.25.0</ecp-version>
<javadoc-title>EMF Client Platform ${ecp-version} API</javadoc-title>
diff --git a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng/pom.xml b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng/pom.xml
index cba7b81..2e51a33 100644
--- a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng/pom.xml
+++ b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng/pom.xml
@@ -9,8 +9,8 @@
<packaging>pom</packaging>
<properties>
- <tycho-version>1.2.0</tycho-version>
- <tycho-extras-version>1.2.0</tycho-extras-version>
+ <tycho-version>1.4.0</tycho-version>
+ <tycho-extras-version>1.4.0</tycho-extras-version>
<javadoc-version>2.9</javadoc-version>
<javadoc-title>EMFForms Spreadsheet 1.0.0 API</javadoc-title>
<maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
diff --git a/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
index c61f7bd..336d576 100644
--- a/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
@@ -27,4 +27,5 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.edit.swt.test
-Import-Package: org.eclipse.emf.ecp.view.test.common.swt.spi;version="[1.25.0,1.25.1)"
+Import-Package: javax.annotation;version="1.2.0",
+ org.eclipse.emf.ecp.view.test.common.swt.spi;version="[1.25.0,1.25.1)"
