Merge branch 'ptp_9_0'
Change-Id: I4fddb5432000dd8f7c01a7ba19b5fb0c438b398b
Signed-off-by: Greg Watson <g.watson@computer.org>
diff --git a/core/org.eclipse.ptp.doc.isv/pom.xml b/core/org.eclipse.ptp.doc.isv/pom.xml
index 17d8e30..6b88c52 100644
--- a/core/org.eclipse.ptp.doc.isv/pom.xml
+++ b/core/org.eclipse.ptp.doc.isv/pom.xml
@@ -142,6 +142,14 @@
<type>eclipse-plugin</type>
</dependency>
</dependencies>
+ <!-- This needs to be explicitely set now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=395281 -->
+ <repositories>
+ <repository>
+ <id>platform</id>
+ <layout>p2</layout>
+ <url>${help-docs-eclipserun-repo}</url>
+ </repository>
+ </repositories>
</configuration>
<executions>
<execution>
diff --git a/pom.xml b/pom.xml
index 062e7bc..53c2356 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,18 +15,19 @@
<name>PTP Parent</name>
<properties>
- <ptp-version>9.0.2</ptp-version>
- <remote-version>2.0.1</remote-version>
- <eclipse-release>mars</eclipse-release>
- <tycho-version>0.19.0</tycho-version>
+ <ptp-version>nightly</ptp-version>
+ <remote-version>nightly</remote-version>
+ <eclipse-release>neon</eclipse-release>
+ <tycho-version>0.23.1</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
- <platform-site>http://download.eclipse.org/eclipse/updates/4.5</platform-site>
+ <platform-site>http://download.eclipse.org/eclipse/updates/4.6milestones</platform-site>
<tm-site>http://download.eclipse.org/tm/terminal/updates/4.0milestones</tm-site>
<cdt-site>http://download.eclipse.org/tools/cdt/builds/${eclipse-release}/milestones</cdt-site>
- <egit-site>http://download.eclipse.org/egit/updates-3.7</egit-site>
+ <egit-site>http://download.eclipse.org/egit/updates-stable-nightly</egit-site>
<photran-site>https://hudson.eclipse.org/ptp/job/ptp-nightly-photran/lastSuccessfulBuild/artifact/org.eclipse.photran.repo/target/repository/</photran-site>
<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/${remote-version}</remote-site>
<license-site>http://download.eclipse.org/cbi/updates/license</license-site>
+ <help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.5</help-docs-eclipserun-repo>
<!-- The following property is used by the production profile to install the final repo and -->
<!-- associated components. It should be overridden if installing into a different location. -->
<ptp-install-dir>/home/data/httpd/download.eclipse.org/tools/ptp/builds/${ptp-version}</ptp-install-dir>
diff --git a/rdt/org.eclipse.ptp.rdt.sync.ui/src/org/eclipse/ptp/internal/rdt/sync/ui/preferences/SyncFileFilterDialog.java b/rdt/org.eclipse.ptp.rdt.sync.ui/src/org/eclipse/ptp/internal/rdt/sync/ui/preferences/SyncFileFilterDialog.java
index 5294974..7d76ce8 100644
--- a/rdt/org.eclipse.ptp.rdt.sync.ui/src/org/eclipse/ptp/internal/rdt/sync/ui/preferences/SyncFileFilterDialog.java
+++ b/rdt/org.eclipse.ptp.rdt.sync.ui/src/org/eclipse/ptp/internal/rdt/sync/ui/preferences/SyncFileFilterDialog.java
@@ -169,7 +169,7 @@
GridLayout treeLayout = new GridLayout(2, false);
treeViewerComposite.setLayout(treeLayout);
- gd = new GridData(SWT.FILL, SWT.FILL, GRAB_EXCESS, GRAB_EXCESS);
+ gd = new GridData(SWT.FILL, SWT.FILL, GRAB_EXCESS, false, 2, 1);
if (DEBUG) {
colorComposite(treeViewerComposite, SWT.COLOR_RED);
}
@@ -233,7 +233,7 @@
}
filterWidget = new SyncFilterWidget(composite, SWT.NONE);
- filterWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ filterWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
filterWidget.setFilter(filter);
filterWidget.addNewPatternChangeListener(this);
diff --git a/tools/etfw/org.eclipse.ptp.etfw.jaxb/META-INF/MANIFEST.MF b/tools/etfw/org.eclipse.ptp.etfw.jaxb/META-INF/MANIFEST.MF
index e809651..0b08ef4 100644
--- a/tools/etfw/org.eclipse.ptp.etfw.jaxb/META-INF/MANIFEST.MF
+++ b/tools/etfw/org.eclipse.ptp.etfw.jaxb/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@
Bundle-Activator: org.eclipse.ptp.internal.etfw.jaxb.osgi.Activator
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime.compatibility,
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
org.eclipse.ptp.rm.jaxb.core,
org.eclipse.ptp.etfw.toolopts,
org.eclipse.debug.core,
