Merge remote-tracking branch 'origin/2.6.x'

Conflicts:
	bundles/code/org.eclipse.fx.code.editor.asciidoc.fx.e4/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor.asciidoc.fx.e4/pom.xml
	bundles/code/org.eclipse.fx.code.editor.asciidoc.fx/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor.asciidoc.fx/pom.xml
	bundles/code/org.eclipse.fx.code.editor.asciidoc/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor.asciidoc/pom.xml
	bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/pom.xml
	bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/pom.xml
	bundles/code/org.eclipse.fx.code.editor.configuration.text/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor.configuration.text/pom.xml
	bundles/code/org.eclipse.fx.code.editor.configuration/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor.configuration/pom.xml
	bundles/code/org.eclipse.fx.code.editor.e4/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor.e4/pom.xml
	bundles/code/org.eclipse.fx.code.editor.fx.e4/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor.fx.e4/pom.xml
	bundles/code/org.eclipse.fx.code.editor.fx.themes/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor.fx.themes/pom.xml
	bundles/code/org.eclipse.fx.code.editor.fx/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor.fx/pom.xml
	bundles/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/SimpleSourceTextEditorBuilder.java
	bundles/code/org.eclipse.fx.code.editor.langs.contrib/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor.langs.contrib/pom.xml
	bundles/code/org.eclipse.fx.code.editor.langs.themes/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor.langs.themes/pom.xml
	bundles/code/org.eclipse.fx.code.editor.langs/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor.langs/pom.xml
	bundles/code/org.eclipse.fx.code.editor/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.code.editor/pom.xml
	bundles/code/org.eclipse.fx.text.compat/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.text.compat/pom.xml
	bundles/code/org.eclipse.fx.text.ui/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.text.ui/pom.xml
	bundles/code/org.eclipse.fx.text/META-INF/MANIFEST.MF
	bundles/code/org.eclipse.fx.text/pom.xml
	bundles/runtime/javax.annotation.jre/pom.xml
	bundles/runtime/javax.xml.jre/pom.xml
	bundles/runtime/org.eclipse.fx.core.databinding/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.core.databinding/pom.xml
	bundles/runtime/org.eclipse.fx.core.di.context/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.core.di.context/pom.xml
	bundles/runtime/org.eclipse.fx.core.di/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.core.di/pom.xml
	bundles/runtime/org.eclipse.fx.core.fxml/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.core.fxml/pom.xml
	bundles/runtime/org.eclipse.fx.core.guice/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.core.guice/pom.xml
	bundles/runtime/org.eclipse.fx.core.log4j/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.core.log4j/pom.xml
	bundles/runtime/org.eclipse.fx.core.p2/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.core.p2/pom.xml
	bundles/runtime/org.eclipse.fx.core.slf4j/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.core.slf4j/pom.xml
	bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.core/pom.xml
	bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/internal/JavaDSServiceProcessor.java
	bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/property/ValidatedPropertyBase.java
	bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/text/SourceTextEditActions.java
	bundles/runtime/org.eclipse.fx.emf.databinding/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.emf.databinding/pom.xml
	bundles/runtime/org.eclipse.fx.emf.edit.ui/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.emf.edit.ui/pom.xml
	bundles/runtime/org.eclipse.fx.formats.svg/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.formats.svg/pom.xml
	bundles/runtime/org.eclipse.fx.javafx/pom.xml
	bundles/runtime/org.eclipse.fx.osgi.util/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.osgi.util/pom.xml
	bundles/runtime/org.eclipse.fx.osgi/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.osgi/pom.xml
	bundles/runtime/org.eclipse.fx.ui.animation/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.animation/pom.xml
	bundles/runtime/org.eclipse.fx.ui.controls/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.controls/pom.xml
	bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/skin/StyledTextSkin.java
	bundles/runtime/org.eclipse.fx.ui.databinding/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.databinding/pom.xml
	bundles/runtime/org.eclipse.fx.ui.di.interopt/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.di.interopt/pom.xml
	bundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.di/pom.xml
	bundles/runtime/org.eclipse.fx.ui.dialogs/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.dialogs/pom.xml
	bundles/runtime/org.eclipse.fx.ui.keybindings.e4/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.keybindings.e4/pom.xml
	bundles/runtime/org.eclipse.fx.ui.keybindings.generic/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.keybindings.generic/pom.xml
	bundles/runtime/org.eclipse.fx.ui.keybindings/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.keybindings/pom.xml
	bundles/runtime/org.eclipse.fx.ui.mobile/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.mobile/pom.xml
	bundles/runtime/org.eclipse.fx.ui.panes/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.panes/pom.xml
	bundles/runtime/org.eclipse.fx.ui.services/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.services/pom.xml
	bundles/runtime/org.eclipse.fx.ui.theme/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.theme/pom.xml
	bundles/runtime/org.eclipse.fx.ui.workbench.base/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.workbench.base/pom.xml
	bundles/runtime/org.eclipse.fx.ui.workbench.fx/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.workbench.fx/pom.xml
	bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base/pom.xml
	bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/pom.xml
	bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx/src/org/eclipse/fx/ui/workbench/renderers/fx/DefSashRenderer.java
	bundles/runtime/org.eclipse.fx.ui.workbench.services/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.workbench.services/pom.xml
	bundles/runtime/org.eclipse.fx.ui.workbench3/META-INF/MANIFEST.MF
	bundles/runtime/org.eclipse.fx.ui.workbench3/pom.xml
	releng/code/org.eclipse.fx.code.base.feature/feature.xml
	releng/code/org.eclipse.fx.code.base.feature/pom.xml
	releng/code/org.eclipse.fx.code.langs.feature/feature.xml
	releng/code/org.eclipse.fx.code.langs.feature/pom.xml
	releng/code/org.eclipse.fx.code.target.feature/feature.xml
	releng/code/org.eclipse.fx.code.target.feature/pom.xml
	releng/org.eclipse.fx.core.shared.updatesite/pom.xml
	releng/org.eclipse.fx.core.shared.updatesite/site.xml
	releng/org.eclipse.fx.releng/pom.xml
	releng/org.eclipse.fx.runtime.doc/META-INF/MANIFEST.MF
	releng/org.eclipse.fx.runtime.doc/pom.xml
	releng/org.eclipse.fx.shared.doc/META-INF/MANIFEST.MF
	releng/org.eclipse.fx.shared.doc/pom.xml
	releng/org.eclipse.fx.shared.releng/pom.xml
	releng/org.eclipse.fx.updatesite/pom.xml
	releng/org.eclipse.fx.updatesite/site.xml
	releng/runtime/org.eclipse.fx..slf4j.target.feature/feature.xml
	releng/runtime/org.eclipse.fx..slf4j.target.feature/pom.xml
	releng/runtime/org.eclipse.fx.core.feature/feature.xml
	releng/runtime/org.eclipse.fx.core.feature/pom.xml
	releng/runtime/org.eclipse.fx.core.shared.feature/feature.xml
	releng/runtime/org.eclipse.fx.core.shared.feature/pom.xml
	releng/runtime/org.eclipse.fx.runtime.e4fx.feature/feature.xml
	releng/runtime/org.eclipse.fx.runtime.e4fx.feature/pom.xml
	releng/runtime/org.eclipse.fx.runtime.e4fx.p2.feature/feature.xml
	releng/runtime/org.eclipse.fx.runtime.e4fx.p2.feature/pom.xml
	releng/runtime/org.eclipse.fx.runtime.feature/feature.xml
	releng/runtime/org.eclipse.fx.runtime.feature/pom.xml
	releng/runtime/org.eclipse.fx.runtime.min.feature/feature.xml
	releng/runtime/org.eclipse.fx.runtime.min.feature/pom.xml
	releng/runtime/org.eclipse.fx.target.feature/feature.xml
	releng/runtime/org.eclipse.fx.target.feature/pom.xml
	releng/runtime/org.eclipse.fx.target.rcp.feature/feature.xml
	releng/runtime/org.eclipse.fx.target.rcp.feature/pom.xml
	releng/runtime/org.eclipse.fx.target.rcp4.feature/feature.xml
	releng/runtime/org.eclipse.fx.target.rcp4.feature/pom.xml

2 files changed, 2 insertions, 2 deletions

diff --git a/releng/org.eclipse.fx.releng/pom.xml b/releng/org.eclipse.fx.releng/pom.xml
index 6d5b57e94..6a0fb03df 100755
--- a/releng/org.eclipse.fx.releng/pom.xml
+++ b/releng/org.eclipse.fx.releng/pom.xml
@@ -16,7 +16,7 @@
 	<properties>
 		<tycho-version>0.25.0</tycho-version>
 		<tycho-extras.version>0.25.0</tycho-extras.version>
-		<cbi-plugins.version>1.1.2-SNAPSHOT</cbi-plugins.version>
+		<cbi-plugins.version>1.1.3</cbi-plugins.version>
 		<junit-version>4.8.1</junit-version>
 		<mockito-version>1.8.4</mockito-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/releng/org.eclipse.fx.shared.releng/pom.xml b/releng/org.eclipse.fx.shared.releng/pom.xml
index 41e83adea..79be4cec6 100755
--- a/releng/org.eclipse.fx.shared.releng/pom.xml
+++ b/releng/org.eclipse.fx.shared.releng/pom.xml
@@ -17,7 +17,7 @@
 		<!-- KEEP VERSION 0.22.0 other one will fail on hudson -->
 		<tycho-version>0.22.0</tycho-version>
 		<tycho-extras.version>0.22.0</tycho-extras.version>
-		<cbi-plugins.version>1.1.2-SNAPSHOT</cbi-plugins.version>
+		<cbi-plugins.version>1.1.3</cbi-plugins.version>
 		<junit-version>4.8.1</junit-version>
 		<mockito-version>1.8.4</mockito-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>