diff --git a/eclipse-ecf-feature-deps.patch b/eclipse-ecf-feature-deps.patch
index 1a3e26d..f4f8917 100644
--- a/eclipse-ecf-feature-deps.patch
+++ b/eclipse-ecf-feature-deps.patch
@@ -63,3 +63,61 @@
unpack="false"/>
+--- releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml.orig 2016-12-04 06:16:14.000000000 +0000
++++ releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml 2017-01-04 12:03:11.312697101 +0000
+@@ -30,6 +30,7 @@
+
+
+
++
+
+
+
+
+-
+-
+
+--- releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml.orig 2016-12-04 06:16:14.000000000 +0000
++++ releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml 2017-01-04 12:05:48.238868061 +0000
+@@ -48,11 +48,4 @@
+ version="0.0.0"
+ unpack="false"/>
+
+-
+-
+
+--- releng/features/org.eclipse.ecf.xmpp.feature/feature.xml.orig 2017-01-04 12:35:24.342531553 +0000
++++ releng/features/org.eclipse.ecf.xmpp.feature/feature.xml 2017-01-04 12:36:03.274095480 +0000
+@@ -30,6 +30,7 @@
+
+
+
++
+
+
+
+
+-
+-
+
diff --git a/eclipse-ecf-tycho.patch b/eclipse-ecf-tycho.patch
deleted file mode 100644
index 1af0850..0000000
--- a/eclipse-ecf-tycho.patch
+++ /dev/null
@@ -1,1162 +0,0 @@
-From 68aa09d58dd62b01f121a4f2eedac4a7c28d4f15 Mon Sep 17 00:00:00 2001
-From: Mat Booth
-Date: Wed, 4 May 2016 01:26:19 +0100
-Subject: Bug 396457 - [Releng][Maven] Create a build based on tycho
-
-First part of adding the necessary machinery to build ECF with tycho.
-Adds two new projects, one to contain target platform definitions,
-and one to contain p2 repository definitions. Adds a parent pom at
-the root of the project and a gitignore file to mask built artifacts
-from the git repo. Poms are added and the build enabled for all the
-core features and plug-ins used by Equinox P2 (i.e. the minimum
-necessary to build the Eclipse Platform itself.)
-
-Change-Id: I0b41b4a611e2b3588fe876f14bd7c8e80de07b67
-Signed-off-by: Mat Booth
----
- .gitignore | 1 +
- .../bundles/org.eclipse.ecf.filetransfer/pom.xml | 15 ++
- framework/bundles/org.eclipse.ecf.identity/pom.xml | 15 ++
- framework/bundles/org.eclipse.ecf.ssl/pom.xml | 15 ++
- framework/bundles/org.eclipse.ecf/pom.xml | 15 ++
- pom.xml | 284 +++++++++++++++++++++
- .../pom.xml | 15 ++
- .../pom.xml | 15 ++
- .../pom.xml | 15 ++
- .../org.eclipse.ecf.provider.filetransfer/pom.xml | 15 ++
- .../features/org.eclipse.ecf.core.feature/pom.xml | 15 ++
- .../org.eclipse.ecf.core.ssl.feature/pom.xml | 15 ++
- .../org.eclipse.ecf.filetransfer.feature/pom.xml | 15 ++
- .../pom.xml | 15 ++
- .../pom.xml | 15 ++
- .../pom.xml | 15 ++
- releng/org.eclipse.ecf.releng.repository/.project | 11 +
- .../org.eclipse.ecf.releng.repository/category.xml | 22 ++
- releng/org.eclipse.ecf.releng.repository/pom.xml | 16 ++
- releng/org.eclipse.ecf.releng.target/.project | 11 +
- .../org.eclipse.ecf.releng.target/ecf-luna.target | 38 +++
- .../org.eclipse.ecf.releng.target/ecf-mars.target | 38 +++
- .../org.eclipse.ecf.releng.target/ecf-neon.target | 41 +++
- releng/org.eclipse.ecf.releng.target/pom.xml | 55 ++++
- 24 files changed, 727 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 framework/bundles/org.eclipse.ecf.filetransfer/pom.xml
- create mode 100644 framework/bundles/org.eclipse.ecf.identity/pom.xml
- create mode 100644 framework/bundles/org.eclipse.ecf.ssl/pom.xml
- create mode 100644 framework/bundles/org.eclipse.ecf/pom.xml
- create mode 100644 pom.xml
- create mode 100644 providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl/pom.xml
- create mode 100644 providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/pom.xml
- create mode 100644 providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl/pom.xml
- create mode 100644 providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml
- create mode 100644 releng/features/org.eclipse.ecf.core.feature/pom.xml
- create mode 100644 releng/features/org.eclipse.ecf.core.ssl.feature/pom.xml
- create mode 100644 releng/features/org.eclipse.ecf.filetransfer.feature/pom.xml
- create mode 100644 releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/pom.xml
- create mode 100644 releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/pom.xml
- create mode 100644 releng/features/org.eclipse.ecf.filetransfer.ssl.feature/pom.xml
- create mode 100644 releng/org.eclipse.ecf.releng.repository/.project
- create mode 100644 releng/org.eclipse.ecf.releng.repository/category.xml
- create mode 100644 releng/org.eclipse.ecf.releng.repository/pom.xml
- create mode 100644 releng/org.eclipse.ecf.releng.target/.project
- create mode 100644 releng/org.eclipse.ecf.releng.target/ecf-luna.target
- create mode 100644 releng/org.eclipse.ecf.releng.target/ecf-mars.target
- create mode 100644 releng/org.eclipse.ecf.releng.target/ecf-neon.target
- create mode 100644 releng/org.eclipse.ecf.releng.target/pom.xml
-
-diff --git a/.gitignore b/.gitignore
-new file mode 100644
-index 0000000..2f7896d
---- /dev/null
-+++ b/.gitignore
-@@ -0,0 +1 @@
-+target/
-diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/pom.xml b/framework/bundles/org.eclipse.ecf.filetransfer/pom.xml
-new file mode 100644
-index 0000000..62854c1
---- /dev/null
-+++ b/framework/bundles/org.eclipse.ecf.filetransfer/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.filetransfer
-+ 5.0.0-SNAPSHOT
-+ eclipse-plugin
-+
-diff --git a/framework/bundles/org.eclipse.ecf.identity/pom.xml b/framework/bundles/org.eclipse.ecf.identity/pom.xml
-new file mode 100644
-index 0000000..29415e5
---- /dev/null
-+++ b/framework/bundles/org.eclipse.ecf.identity/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.identity
-+ 3.7.0-SNAPSHOT
-+ eclipse-plugin
-+
-diff --git a/framework/bundles/org.eclipse.ecf.ssl/pom.xml b/framework/bundles/org.eclipse.ecf.ssl/pom.xml
-new file mode 100644
-index 0000000..645f1a2
---- /dev/null
-+++ b/framework/bundles/org.eclipse.ecf.ssl/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.ssl
-+ 1.2.0-SNAPSHOT
-+ eclipse-plugin
-+
-diff --git a/framework/bundles/org.eclipse.ecf/pom.xml b/framework/bundles/org.eclipse.ecf/pom.xml
-new file mode 100644
-index 0000000..3cbd474
---- /dev/null
-+++ b/framework/bundles/org.eclipse.ecf/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf
-+ 3.8.0-SNAPSHOT
-+ eclipse-plugin
-+
-diff --git a/pom.xml b/pom.xml
-new file mode 100644
-index 0000000..066d87b
---- /dev/null
-+++ b/pom.xml
-@@ -0,0 +1,284 @@
-+
-+
-+
-+ 4.0.0
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ pom
-+
-+ Eclipse Communication Framework
-+ https://www.eclipse.org/ecf/
-+
-+
-+
-+ Eclipse Public License v1.0
-+ http://www.eclipse.org/legal/epl-v10.html
-+ repo
-+
-+ All rights reserved.
-+
-+ This program and the accompanying materials are made
-+ available under the terms of the Eclipse Public License v1.0
-+ which accompanies this distribution, and is available at
-+ http://www.eclipse.org/legal/epl-v10.htm
-+
-+
-+
-+
-+
-+ https://bugs.eclipse.org/bugs/buglist.cgi?product=ECF
-+ Bugzilla
-+
-+
-+
-+ 0.25.0
-+ 1.1.3
-+ neon
-+ UTF-8
-+ UTF-8
-+ scm:git:https://git.eclipse.org/r/ecf/org.eclipse.ecf
-+
-+ true
-+
-+
-+
-+
-+ repo.eclipse.org
-+ https://repo.eclipse.org/content/groups/releases/
-+
-+
-+
-+
-+ framework/bundles/org.eclipse.ecf
-+ framework/bundles/org.eclipse.ecf.filetransfer
-+ framework/bundles/org.eclipse.ecf.identity
-+ framework/bundles/org.eclipse.ecf.ssl
-+
-+ providers/bundles/org.eclipse.ecf.provider.filetransfer
-+ providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4
-+ providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl
-+ providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl
-+
-+ releng/features/org.eclipse.ecf.core.feature
-+ releng/features/org.eclipse.ecf.core.ssl.feature
-+ releng/features/org.eclipse.ecf.filetransfer.feature
-+ releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature
-+ releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature
-+ releng/features/org.eclipse.ecf.filetransfer.ssl.feature
-+
-+ releng/org.eclipse.ecf.releng.target
-+ releng/org.eclipse.ecf.releng.repository
-+
-+
-+
-+
-+
-+ org.eclipse.tycho
-+ tycho-maven-plugin
-+ ${tycho-version}
-+ true
-+
-+
-+ org.eclipse.tycho
-+ target-platform-configuration
-+ ${tycho-version}
-+
-+
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.releng.target
-+ ecf-${target-platform}
-+ 1.0.0-SNAPSHOT
-+
-+
-+
-+
-+ win32
-+ win32
-+ x86
-+
-+
-+ win32
-+ win32
-+ x86_64
-+
-+
-+ linux
-+ gtk
-+ x86
-+
-+
-+ linux
-+ gtk
-+ x86_64
-+
-+
-+ macosx
-+ cocoa
-+ x86_64
-+
-+
-+
-+
-+
-+ org.eclipse.tycho
-+ tycho-source-plugin
-+ ${tycho-version}
-+
-+
-+ plugin-source
-+
-+ plugin-source
-+
-+
-+
-+
-+
-+ org.eclipse.tycho.extras
-+ tycho-source-feature-plugin
-+ ${tycho-version}
-+
-+ false
-+
-+
-+
-+ source-feature
-+ package
-+
-+ source-feature
-+
-+
-+
-+
-+
-+
-+
-+
-+ org.eclipse.tycho
-+ tycho-compiler-plugin
-+ ${tycho-version}
-+
-+
-+ ${project.basedir}/.settings/org.eclipse.jdt.core.prefs
-+
-+
-+
-+
-+ org.eclipse.tycho
-+ tycho-packaging-plugin
-+ ${tycho-version}
-+
-+
-+ org.eclipse.tycho.extras
-+ tycho-buildtimestamp-jgit
-+ ${tycho-version}
-+
-+
-+ org.eclipse.tycho.extras
-+ tycho-sourceref-jgit
-+ ${tycho-version}
-+
-+
-+
-+ 'v'yyyyMMdd-HHmm
-+
-+ true
-+
-+
-+ true
-+
-+ jgit
-+ warning
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ pack-and-sign
-+
-+
-+
-+ org.eclipse.tycho
-+ target-platform-configuration
-+ ${tycho-version}
-+
-+ true
-+
-+
-+
-+ org.eclipse.tycho.extras
-+ tycho-pack200a-plugin
-+ ${tycho-version}
-+
-+
-+ pack200-normalize
-+
-+ normalize
-+
-+ verify
-+
-+
-+
-+
-+ org.eclipse.cbi.maven.plugins
-+ eclipse-jarsigner-plugin
-+ ${cbi-version}
-+
-+
-+ sign
-+ verify
-+
-+ sign
-+
-+
-+
-+
-+
-+ org.eclipse.tycho.extras
-+ tycho-pack200b-plugin
-+ ${tycho-version}
-+
-+
-+ pack200-pack
-+
-+ pack
-+
-+ verify
-+
-+
-+
-+
-+ org.eclipse.tycho
-+ tycho-p2-plugin
-+ ${tycho-version}
-+
-+
-+ p2-metadata
-+
-+ p2-metadata
-+
-+ verify
-+
-+
-+
-+ false
-+
-+
-+
-+
-+
-+
-+
-diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl/pom.xml
-new file mode 100644
-index 0000000..6ff8456
---- /dev/null
-+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.provider.filetransfer.httpclient4.ssl
-+ 1.1.0-SNAPSHOT
-+ eclipse-plugin
-+
-diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/pom.xml
-new file mode 100644
-index 0000000..77b917c
---- /dev/null
-+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.provider.filetransfer.httpclient4
-+ 1.1.100-SNAPSHOT
-+ eclipse-plugin
-+
-diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl/pom.xml
-new file mode 100644
-index 0000000..e54ae2c
---- /dev/null
-+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.provider.filetransfer.ssl
-+ 1.0.0-SNAPSHOT
-+ eclipse-plugin
-+
-diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml
-new file mode 100644
-index 0000000..c8f33ff
---- /dev/null
-+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.provider.filetransfer
-+ 3.2.200-SNAPSHOT
-+ eclipse-plugin
-+
-diff --git a/releng/features/org.eclipse.ecf.core.feature/pom.xml b/releng/features/org.eclipse.ecf.core.feature/pom.xml
-new file mode 100644
-index 0000000..e38669d
---- /dev/null
-+++ b/releng/features/org.eclipse.ecf.core.feature/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.core.feature
-+ 1.3.0-SNAPSHOT
-+ eclipse-feature
-+
-diff --git a/releng/features/org.eclipse.ecf.core.ssl.feature/pom.xml b/releng/features/org.eclipse.ecf.core.ssl.feature/pom.xml
-new file mode 100644
-index 0000000..3064359
---- /dev/null
-+++ b/releng/features/org.eclipse.ecf.core.ssl.feature/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.core.ssl.feature
-+ 1.1.0-SNAPSHOT
-+ eclipse-feature
-+
-diff --git a/releng/features/org.eclipse.ecf.filetransfer.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.feature/pom.xml
-new file mode 100644
-index 0000000..5a3ea51
---- /dev/null
-+++ b/releng/features/org.eclipse.ecf.filetransfer.feature/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.filetransfer.feature
-+ 3.13.2-SNAPSHOT
-+ eclipse-feature
-+
-diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/pom.xml
-new file mode 100644
-index 0000000..a85eb0c
---- /dev/null
-+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.filetransfer.httpclient4.feature
-+ 3.13.2-SNAPSHOT
-+ eclipse-feature
-+
-diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/pom.xml
-new file mode 100644
-index 0000000..a7c4a44
---- /dev/null
-+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.filetransfer.httpclient4.ssl.feature
-+ 1.1.0-SNAPSHOT
-+ eclipse-feature
-+
-diff --git a/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/pom.xml
-new file mode 100644
-index 0000000..0cd677a
---- /dev/null
-+++ b/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.filetransfer.ssl.feature
-+ 1.1.0-SNAPSHOT
-+ eclipse-feature
-+
-diff --git a/releng/org.eclipse.ecf.releng.repository/.project b/releng/org.eclipse.ecf.releng.repository/.project
-new file mode 100644
-index 0000000..aab39c5
---- /dev/null
-+++ b/releng/org.eclipse.ecf.releng.repository/.project
-@@ -0,0 +1,11 @@
-+
-+
-+ org.eclipse.ecf.releng.repository
-+
-+
-+
-+
-+
-+
-+
-+
-diff --git a/releng/org.eclipse.ecf.releng.repository/category.xml b/releng/org.eclipse.ecf.releng.repository/category.xml
-new file mode 100644
-index 0000000..167336c
---- /dev/null
-+++ b/releng/org.eclipse.ecf.releng.repository/category.xml
-@@ -0,0 +1,22 @@
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-diff --git a/releng/org.eclipse.ecf.releng.repository/pom.xml b/releng/org.eclipse.ecf.releng.repository/pom.xml
-new file mode 100644
-index 0000000..0730895
---- /dev/null
-+++ b/releng/org.eclipse.ecf.releng.repository/pom.xml
-@@ -0,0 +1,16 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.releng.repository
-+ eclipse-repository
-+
-+ ECF p2 Repository
-+
-diff --git a/releng/org.eclipse.ecf.releng.target/.project b/releng/org.eclipse.ecf.releng.target/.project
-new file mode 100644
-index 0000000..cc61b55
---- /dev/null
-+++ b/releng/org.eclipse.ecf.releng.target/.project
-@@ -0,0 +1,11 @@
-+
-+
-+ org.eclipse.ecf.releng.target
-+
-+
-+
-+
-+
-+
-+
-+
-diff --git a/releng/org.eclipse.ecf.releng.target/ecf-luna.target b/releng/org.eclipse.ecf.releng.target/ecf-luna.target
-new file mode 100644
-index 0000000..99586c4
---- /dev/null
-+++ b/releng/org.eclipse.ecf.releng.target/ecf-luna.target
-@@ -0,0 +1,38 @@
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-diff --git a/releng/org.eclipse.ecf.releng.target/ecf-mars.target b/releng/org.eclipse.ecf.releng.target/ecf-mars.target
-new file mode 100644
-index 0000000..0a5d678
---- /dev/null
-+++ b/releng/org.eclipse.ecf.releng.target/ecf-mars.target
-@@ -0,0 +1,38 @@
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-diff --git a/releng/org.eclipse.ecf.releng.target/ecf-neon.target b/releng/org.eclipse.ecf.releng.target/ecf-neon.target
-new file mode 100644
-index 0000000..cd2924d
---- /dev/null
-+++ b/releng/org.eclipse.ecf.releng.target/ecf-neon.target
-@@ -0,0 +1,41 @@
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-diff --git a/releng/org.eclipse.ecf.releng.target/pom.xml b/releng/org.eclipse.ecf.releng.target/pom.xml
-new file mode 100644
-index 0000000..bca1f3c
---- /dev/null
-+++ b/releng/org.eclipse.ecf.releng.target/pom.xml
-@@ -0,0 +1,55 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.releng.target
-+ 1.0.0-SNAPSHOT
-+ pom
-+
-+ ECF Target Platform Definitions
-+
-+
-+
-+
-+ org.codehaus.mojo
-+ build-helper-maven-plugin
-+ 1.10
-+
-+
-+ attach-artifacts
-+ package
-+
-+ attach-artifact
-+
-+
-+
-+
-+ ecf-luna.target
-+ target
-+ ecf-luna
-+
-+
-+ ecf-mars.target
-+ target
-+ ecf-mars
-+
-+
-+ ecf-neon.target
-+ target
-+ ecf-neon
-+
-+
-+
-+
-+
-+
-+
-+
-+
-diff --git a/framework/bundles/org.eclipse.ecf.discovery/pom.xml b/framework/bundles/org.eclipse.ecf.discovery/pom.xml
-new file mode 100644
-index 0000000..39abef6
---- /dev/null
-+++ b/framework/bundles/org.eclipse.ecf.discovery/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.discovery
-+ 5.0.200-SNAPSHOT
-+ eclipse-plugin
-+
-diff --git a/pom.xml b/pom.xml
-index b2470aa..a6a692c 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -67,11 +67,16 @@
- framework/bundles/org.eclipse.ecf.filetransfer
- framework/bundles/org.eclipse.ecf.identity
- framework/bundles/org.eclipse.ecf.ssl
-+ framework/bundles/org.eclipse.ecf.discovery
-
- providers/bundles/org.eclipse.ecf.provider.filetransfer
- providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4
- providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl
- providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl
-+ providers/bundles/org.eclipse.ecf.provider.discovery
-+ providers/bundles/org.eclipse.ecf.provider.dnssd
-+ providers/bundles/org.eclipse.ecf.provider.jmdns
-+ providers/bundles/org.eclipse.ecf.provider.zookeeper
-
- releng/features/org.eclipse.ecf.core.feature
- releng/features/org.eclipse.ecf.core.ssl.feature
-@@ -79,6 +84,10 @@
- releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature
- releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature
- releng/features/org.eclipse.ecf.filetransfer.ssl.feature
-+ releng/features/org.eclipse.ecf.discovery.feature
-+ releng/features/org.eclipse.ecf.discovery.dnssd.feature
-+ releng/features/org.eclipse.ecf.discovery.jmdns.feature
-+ releng/features/org.eclipse.ecf.discovery.zookeeper.feature
-
- releng/org.eclipse.ecf.releng.target
- releng/org.eclipse.ecf.releng.repository
-diff --git a/providers/bundles/org.eclipse.ecf.provider.discovery/pom.xml b/providers/bundles/org.eclipse.ecf.provider.discovery/pom.xml
-new file mode 100644
-index 0000000..1a77273
---- /dev/null
-+++ b/providers/bundles/org.eclipse.ecf.provider.discovery/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.provider.discovery
-+ 3.0.0-SNAPSHOT
-+ eclipse-plugin
-+
-diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/pom.xml b/providers/bundles/org.eclipse.ecf.provider.dnssd/pom.xml
-new file mode 100644
-index 0000000..3802da6
---- /dev/null
-+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.provider.dnssd
-+ 1.2.100-SNAPSHOT
-+ eclipse-plugin
-+
-diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/pom.xml b/providers/bundles/org.eclipse.ecf.provider.jmdns/pom.xml
-new file mode 100644
-index 0000000..b9e3102
---- /dev/null
-+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.provider.jmdns
-+ 4.3.100-SNAPSHOT
-+ eclipse-plugin
-+
-diff --git a/providers/bundles/org.eclipse.ecf.provider.zookeeper/pom.xml b/providers/bundles/org.eclipse.ecf.provider.zookeeper/pom.xml
-new file mode 100644
-index 0000000..aa50958
---- /dev/null
-+++ b/providers/bundles/org.eclipse.ecf.provider.zookeeper/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.provider.zookeeper
-+ 1.2.100-SNAPSHOT
-+ eclipse-plugin
-+
-diff --git a/releng/features/org.eclipse.ecf.discovery.dnssd.feature/pom.xml b/releng/features/org.eclipse.ecf.discovery.dnssd.feature/pom.xml
-new file mode 100644
-index 0000000..8c4a5a1
---- /dev/null
-+++ b/releng/features/org.eclipse.ecf.discovery.dnssd.feature/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.discovery.dnssd.feature
-+ 1.0.0-SNAPSHOT
-+ eclipse-feature
-+
-diff --git a/releng/features/org.eclipse.ecf.discovery.feature/pom.xml b/releng/features/org.eclipse.ecf.discovery.feature/pom.xml
-new file mode 100644
-index 0000000..0329c3f
---- /dev/null
-+++ b/releng/features/org.eclipse.ecf.discovery.feature/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.discovery.feature
-+ 1.0.0-SNAPSHOT
-+ eclipse-feature
-+
-diff --git a/releng/features/org.eclipse.ecf.discovery.jmdns.feature/pom.xml b/releng/features/org.eclipse.ecf.discovery.jmdns.feature/pom.xml
-new file mode 100644
-index 0000000..d9f97d0
---- /dev/null
-+++ b/releng/features/org.eclipse.ecf.discovery.jmdns.feature/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.discovery.jmdns.feature
-+ 1.0.0-SNAPSHOT
-+ eclipse-feature
-+
-diff --git a/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/pom.xml b/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/pom.xml
-new file mode 100644
-index 0000000..7a5acb2
---- /dev/null
-+++ b/releng/features/org.eclipse.ecf.discovery.zookeeper.feature/pom.xml
-@@ -0,0 +1,15 @@
-+
-+
-+ 4.0.0
-+
-+ org.eclipse.ecf
-+ ecf-parent
-+ 1.0.0-SNAPSHOT
-+ ../../../
-+
-+ org.eclipse.ecf
-+ org.eclipse.ecf.discovery.zookeeper.feature
-+ 1.0.0-SNAPSHOT
-+ eclipse-feature
-+
---
-cgit v0.11.2-4-g4a35
-
-
diff --git a/eclipse-ecf.spec b/eclipse-ecf.spec
index 1c5ae82..53afe26 100644
--- a/eclipse-ecf.spec
+++ b/eclipse-ecf.spec
@@ -6,10 +6,10 @@
# bootstrapping
%global __requires_exclude .*org\.eclipse\.equinox.*
-%global git_tag R-Release_HEAD-sdk_feature-279_279
+%global git_tag R-Release_HEAD-sdk_feature-3.13.3-Hipp-Tycho-49
Name: eclipse-ecf
-Version: 3.13.2
+Version: 3.13.3
Release: 1%{?dist}
Summary: Eclipse Communication Framework (ECF) Eclipse plug-in
@@ -19,12 +19,16 @@ Source0: http://git.eclipse.org/c/ecf/org.eclipse.ecf.git/snapshot/org.ec
# Change how feature deps are specified, to avoid embedding versions
Patch0: eclipse-ecf-feature-deps.patch
-Patch1: eclipse-ecf-tycho.patch
BuildRequires: tycho
BuildRequires: tycho-extras
BuildRequires: maven-plugin-build-helper
BuildRequires: eclipse-filesystem
+BuildRequires: eclipse-emf-runtime
+BuildRequires: eclipse-pde
+BuildRequires: osgi-annotation
+BuildRequires: xpp3-minimal
+BuildRequires: irclib
BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-core
BuildRequires: apache-commons-codec
@@ -71,23 +75,57 @@ find . -type f -name "*.jar" -exec rm {} \;
find . -type f -name "*.class" -exec rm {} \;
%patch0
-%patch1 -p1
# Allow building on java > 1.4
sed -i -e 's#(Object) ((URIID) o)#((URIID) o)#g' framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/URIID.java
+# Correction for content of runtime package
+%pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.presence']" releng/features/org.eclipse.ecf.core/feature.xml
+
+# Don't build examples or tests
+sed -i -e '/examples/d' -e '/tests/d' pom.xml
+%pom_disable_module releng/features/org.eclipse.ecf.tests.feature
+%pom_disable_module releng/features/org.eclipse.ecf.eventadmin.examples.feature
+%pom_disable_module releng/features/org.eclipse.ecf.remoteservice.examples.feature
+%pom_disable_module releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature
+%pom_xpath_remove "feature/requires/import[@feature='org.eclipse.ecf.remoteservice.sdk.examples.feature']" releng/features/org.eclipse.ecf.core/feature.xml
+%pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.example.clients']" releng/features/org.eclipse.ecf.core/feature.xml
+%pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.example.collab']" releng/features/org.eclipse.ecf.core/feature.xml
+%pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.example.collab.editor']" releng/features/org.eclipse.ecf.core/feature.xml
+
# Don't use target platform or jgit packaging bits
%pom_xpath_remove "pom:target"
%pom_xpath_remove "pom:plugin[pom:artifactId='tycho-packaging-plugin']/pom:dependencies"
%pom_xpath_remove "pom:plugin[pom:artifactId='tycho-packaging-plugin']/pom:configuration/pom:sourceReferences"
%pom_xpath_remove "pom:plugin[pom:artifactId='tycho-packaging-plugin']/pom:configuration/pom:timestampProvider"
+%pom_disable_module releng/org.eclipse.ecf.releng.repository
+
+# Remove unnecesary dep on json
+%pom_xpath_remove "feature/requires/import[@plugin='org.json']" releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
# Using latest zookeeper requires non-trivial port
%pom_disable_module releng/features/org.eclipse.ecf.discovery.zookeeper.feature
%pom_disable_module providers/bundles/org.eclipse.ecf.provider.zookeeper
+%pom_xpath_remove "feature/includes[@id='org.eclipse.ecf.discovery.zookeeper.feature']" releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
+
+# Using latest rome requires non-trivial port
+%pom_disable_module releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature
+%pom_disable_module framework/bundles/org.eclipse.ecf.remoteservice.rest.synd
+%pom_xpath_remove "feature/includes[@id='org.eclipse.ecf.remoteservice.rest.synd.feature']" releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
+
+# Use system libs
+ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/osgi/
+ln -s %{_javadir}/xpp3-minimal.jar protocols/bundles/org.jivesoftware.smack/jars/xpp.jar
+ln -s %{_javadir}/irclib.jar providers/bundles/org.eclipse.ecf.provider.irc/lib
%mvn_package "::{pom,target}::" __noinstall
%mvn_package "::jar:{sources,sources-feature}:" sdk
+%mvn_package ":org.eclipse.ecf.{core,sdk}" sdk
+%mvn_package ":org.eclipse.ecf.docshare*" sdk
+for p in $(grep ' - 3.13.3-1
+- Update to latest release
+
* Wed Sep 14 2016 Mat Booth - 3.13.2-1
- Update to latest release
- Set qualifiers to source-modification-time instead of build-time, to
diff --git a/sources b/sources
index e71d510..602d6a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a70ef97e707ff634b825211149d3d944 org.eclipse.ecf-R-Release_HEAD-sdk_feature-279_279.tar.xz
+SHA512 (org.eclipse.ecf-R-Release_HEAD-sdk_feature-3.13.3-Hipp-Tycho-49.tar.xz) = f70c9df5425650a22961382eff6d720a4a397d500187f29e8d7b32fcad53cffd41768c81d15dc79dd897112de9744e3d2b8ff8784c31f3ee83757ae191d3b348