Merge "[534409] Failure running collections test under Java 9"
diff --git a/org.eclipse.mat.product/mat.p2.inf b/org.eclipse.mat.product/mat.p2.inf
index 345e4bb..fc16f34 100644
--- a/org.eclipse.mat.product/mat.p2.inf
+++ b/org.eclipse.mat.product/mat.p2.inf
@@ -8,7 +8,7 @@
addRepository(type:1,name:Memory Analyzer,location:http${#58}//download.eclipse.org/mat/1.7/update-site/);\
addRepository(type:0,name:Memory Analyzer latest development build,location:http${#58}//download.eclipse.org/mat/snapshots/update-site/,enabled:false);\
addRepository(type:1,name:Memory Analyzer latest development build,location:http${#58}//download.eclipse.org/mat/snapshots/update-site/,enabled:false);\
- addRepository(type:0,name:Eclipse Mars,location:http${#58}//download.eclipse.org/releases/mars/,enabled:true);\
- addRepository(type:1,name:Eclipse Mars,location:http${#58}//download.eclipse.org/releases/mars/,enabled:true);\
+ addRepository(type:0,name:Eclipse Photon,location:http${#58}//download.eclipse.org/releases/photon/,enabled:true);\
+ addRepository(type:1,name:Eclipse Photon,location:http${#58}//download.eclipse.org/releases/photon/,enabled:true);\
addRepository(type:0,name:IBM Diagnostic Tool Framework for Java,location:http${#58}//public.dhe.ibm.com/ibmdl/export/pub/software/websphere/runtimes/tools/dtfj/);\
addRepository(type:1,name:IBM Diagnostic Tool Framework for Java,location:http${#58}//public.dhe.ibm.com/ibmdl/export/pub/software/websphere/runtimes/tools/dtfj/)
diff --git a/org.eclipse.mat.product/mat.product b/org.eclipse.mat.product/mat.product
index 1ab4225..0b2d8d2 100644
--- a/org.eclipse.mat.product/mat.product
+++ b/org.eclipse.mat.product/mat.product
@@ -202,7 +202,7 @@
<property name="org.eclipse.update.reconcile" value="false" />
<plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="4"/>
- <property name="osgi.requiredJavaVersion" value="1.6" />
+ <property name="osgi.requiredJavaVersion" value="1.8" />
<property name="cssTheme" value="org.eclipse.e4.ui.css.theme.e4_default" />
<property name="applicationCSSResources" value="platform:/plugin/org.eclipse.platform/images/" />
</configurations>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1de10cc..afdc5c2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,7 +21,7 @@
<download-publish-path>/home/data/httpd/download.eclipse.org/mat/snapshots/update-site</download-publish-path>
<download-publish-rcp-path>/home/data/httpd/download.eclipse.org/mat/snapshots/rcp</download-publish-rcp-path>
<!-- mat-target specifies which .target definition file will be used -->
- <mat-target>mat-mars</mat-target>
+ <mat-target>mat-photon</mat-target>
<!-- mat-release-repo-url specifies from which p2 repo the MAT bundles
come, when the build-release profile is used -->
<mat-release-repo-url>http://download.eclipse.org/mat/1.7/update-site/</mat-release-repo-url>
@@ -205,31 +205,6 @@
<arch>x86_64</arch>
</environment>
<environment>
- <os>solaris</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>solaris</os>
- <ws>gtk</ws>
- <arch>sparc</arch>
- </environment>
- <environment>
- <os>aix</os>
- <ws>gtk</ws>
- <arch>ppc</arch>
- </environment>
- <environment>
- <os>aix</os>
- <ws>gtk</ws>
- <arch>ppc64</arch>
- </environment>
- <environment>
- <os>hpux</os>
- <ws>gtk</ws>
- <arch>ia64</arch>
- </environment>
- <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
@@ -242,11 +217,6 @@
<environment>
<os>linux</os>
<ws>gtk</ws>
- <arch>ppc</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
<arch>ppc64</arch>
</environment>
<environment>
@@ -254,16 +224,6 @@
<ws>gtk</ws>
<arch>ppc64le</arch>
</environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>s390x</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>s390</arch>
- </environment>
</environments>
</configuration>
</plugin>
