diff --git a/.devtoolset-3-eclipse-ecf.metadata b/.devtoolset-3-eclipse-ecf.metadata
index 4759bee..f001906 100644
--- a/.devtoolset-3-eclipse-ecf.metadata
+++ b/.devtoolset-3-eclipse-ecf.metadata
@@ -1 +1 @@
-bd43d6ed6cb055e968ec9e781f1ae4c3dc33249b SOURCES/org.eclipse.ecf-R-Release_HEAD-sdk_feature-140_2014-05-28_16-20-10.tar.bz2
+5be0a59edb9f30ffb8ae0b0802a04df872030d63 SOURCES/org.eclipse.ecf-R-Release_HEAD-sdk_feature-144_2014-11-16_21-26-19.tar.bz2
diff --git a/.gitignore b/.gitignore
index 48c4d20..e2bc824 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/org.eclipse.ecf-R-Release_HEAD-sdk_feature-140_2014-05-28_16-20-10.tar.bz2
+SOURCES/org.eclipse.ecf-R-Release_HEAD-sdk_feature-144_2014-11-16_21-26-19.tar.bz2
diff --git a/SOURCES/eclipse-ecf-no-apache-source.patch b/SOURCES/eclipse-ecf-no-apache-source.patch
deleted file mode 100644
index 517adf4..0000000
--- a/SOURCES/eclipse-ecf-no-apache-source.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml.orig 2014-03-19 15:40:59.856504656 +0000
-+++ releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml 2014-03-19 15:41:23.653503134 +0000
-@@ -62,32 +62,4 @@
- version="0.0.0"
- unpack="false"/>
-
--
--
--
--
--
--
--
--
-
diff --git a/SPECS/eclipse-ecf.spec b/SPECS/eclipse-ecf.spec
index 5261026..7a87695 100644
--- a/SPECS/eclipse-ecf.spec
+++ b/SPECS/eclipse-ecf.spec
@@ -1,61 +1,52 @@
%{?scl:%scl_package eclipse-ecf}
%{!?scl:%global pkg_name %{name}}
-%{!?maven_scl:%global maven_scl_prefix %{nil}}
+%{?java_common_find_provides_and_requires}
-%{?maven_scl:%global base_or_scl_root %{_scl_root}}
-%{!?maven_scl:%global base_or_scl_root %{nil}}
+# The core sub-package must be archful because it is required to be in
+# libdir by the platform, but we have no natives, so suppress debuginfo
+%global debug_package %{nil}
-%{?maven_scl:%global base_or_scl %{maven_scl_prefix}}
-%{!?maven_scl:%global base_or_scl %{nil}}
+# This exclude breaks the cyclic dependency on the platform to aide in
+# bootstrapping
+%global __requires_exclude osgi*
-%global tag R-Release_HEAD-sdk_feature-140_2014-05-28_16-20-10
-%global contextQualifier v20140528-1620
-
-%define __requires_exclude osgi*
+%global git_tag R-Release_HEAD-sdk_feature-144_2014-11-16_21-26-19
Name: %{?scl_prefix}eclipse-ecf
-Version: 3.8.1
-Release: 1.1%{?dist}
-Summary: Eclipse Communication Framework (ECF)
+Version: 3.9.1
+Release: 2.5%{?dist}
+Summary: Eclipse Communication Framework (ECF) Eclipse plug-in
License: EPL
URL: http://www.eclipse.org/ecf/
-Source0: http://git.eclipse.org/c/ecf/org.eclipse.ecf.git/snapshot/org.eclipse.ecf-%{tag}.tar.bz2
-
-# no source plugins for third party libs
-Patch0: %{pkg_name}-no-apache-source.patch
-
-BuildRequires: java-devel >= 1.7.0
-%if 0%{?rhel} < 7
-BuildRequires: %{maven_scl_prefix}ant
-%endif
-BuildRequires: %{?scl_prefix}eclipse-pde
-BuildRequires: %{?scl_prefix}httpcomponents-client >= 4.3.5-1
-BuildRequires: %{?scl_prefix}httpcomponents-core
-BuildRequires: %{base_or_scl}apache-commons-codec
-BuildRequires: %{base_or_scl}apache-commons-logging
+Source0: http://git.eclipse.org/c/ecf/org.eclipse.ecf.git/snapshot/org.eclipse.ecf-%{git_tag}.tar.bz2
-BuildArch: noarch
+BuildRequires: java-devel
+BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.3.0
+BuildRequires: %{?scl_prefix_java_common}httpcomponents-client
+BuildRequires: %{?scl_prefix_java_common}httpcomponents-core
+BuildRequires: %{?scl_prefix_java_common}apache-commons-codec
+BuildRequires: %{?scl_prefix_java_common}apache-commons-logging
%description
-ECF is a framework for building distributed servers, applications,
-and tools. It provides a modular implementation of the OSGi 4.2
-Remote Services standard, along with support for REST-based and
-SOAP-based remote services, and asynchronous messaging for remote services.
+ECF is a set of frameworks for building communications into applications and
+services. It provides a lightweight, modular, transport-independent, fully
+compliant implementation of the OSGi Remote Services standard.
-%package core
-Summary: ECF core bundles
-Group: System Environment/Libraries
-Requires: jpackage-utils
-%{?scl:Requires: %scl_runtime}
+%package core
+Summary: Eclipse ECF Core
+Requires: java
+Requires: %{?scl_prefix}eclipse-filesystem
+Obsoletes: %{name}-core < %{version}-%{release}
%description core
ECF bundles required by eclipse-platform.
%prep
-%setup -q -n org.eclipse.ecf-%{tag}
+%setup -q -n org.eclipse.ecf-%{git_tag}
-%patch0 -b .orig
+find . -type f -name "*.jar" -exec rm {} \;
+find . -type f -name "*.class" -exec rm {} \;
#get just the bits we need
mkdir -p ecf/plugins
@@ -79,92 +70,106 @@ cp -r providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl ec
rm -rf `ls | grep -v "ecf"`
-find . -type f -name "*.jar" -exec rm {} \;
-find . -type f -name "*.class" -exec rm {} \;
-
+# Orbit deps for PDE build
+%{?scl:scl enable %{scl_maven} %{scl} - < 1.4
sed -i -e 's#(Object) ((URIID) o)#((URIID) o)#g' ecf/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/URIID.java
%build
-%if 0%{?rhel} < 7
-%{?scl:scl enable %{maven_scl} - << "EOF"}
-%endif
-%{_bindir}/eclipse-pdebuild -f org.eclipse.ecf.core.feature \
- -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
-%{_bindir}/eclipse-pdebuild -f org.eclipse.ecf.core.ssl.feature \
- -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
-%{_bindir}/eclipse-pdebuild -f org.eclipse.ecf.filetransfer.feature \
- -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
-%{_bindir}/eclipse-pdebuild -f org.eclipse.ecf.filetransfer.ssl.feature \
- -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
-%{_bindir}/eclipse-pdebuild -f org.eclipse.ecf.filetransfer.httpclient4.feature \
- -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
-%{_bindir}/eclipse-pdebuild -f org.eclipse.ecf.filetransfer.httpclient4.ssl.feature \
- -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
-%if 0%{?rhel} < 7
+OPTIONS="-DforceContextQualifier=$(date +v%Y%m%d-%H00)"
+
+%{?scl:scl enable %{scl_maven} %{scl} - < - 3.8.1-1.1
-- Rebuild against new httpcomponents
+* Tue Apr 07 2015 Mat Booth - 3.9.1-2.5
+- Resolves: rhbz#1208867 - Fix upgrade path from DTS30
+
+* Tue Jan 13 2015 Mat Booth - 3.9.1-2.4
+- Related: rhbz#1175105 - Rebuild for latest httpcomponents
+- Also remove temp versions fix, fix disttag
-* Mon Jun 30 2014 Mat Booth - 3.8.1-1
+* Mon Jan 12 2015 Mat Booth - 3.9.1-2.3
+- Related: rhbz#1175105 - Temporarily fix dep versions so we can use
+ java-common collection deps in the future
+
+* Fri Jan 09 2015 Mat Booth - 3.9.1-2.2
+- Related: rhbz#1175105 - Don't use java-headless
+
+* Wed Jan 07 2015 Mat Booth - 3.9.1-2.1
+- Resolves: rhbz#1175105 - Import into DTS 3.1
+
+* Tue Dec 09 2014 Roland Grunberg - 3.9.1-2
+- Symlink ECF bundles into javadir.
+
+* Thu Nov 27 2014 Mat Booth - 3.9.1-1
- Update to latest upstream release
-* Tue Jun 10 2014 Roland Grunberg - 3.8.0-2.5
-- Use %%{maven_scl}ant on RHEL 6 due to issues with DTS 3.0 ant.
+* Thu Nov 27 2014 Mat Booth - 3.9.0-3
+- Make core package archful so it can be installed into libdir
+ where eclipse-platform expects it to be
-* Tue Jun 10 2014 Roland Grunberg - 3.8.0-2.4
-- Build non-bootstrapped.
-- Change Import-Package to require httpcomponents > 4.3.0.
+* Tue Nov 18 2014 Mat Booth - 3.9.0-2
+- Rebuild for new commons-codec
-* Wed May 21 2014 Mat Booth - 3.8.0-2.3
-- Drop R on java-headless
+* Tue Aug 19 2014 Mat Booth - 3.9.0-1
+- Update to latest upstream release
+- Drop unneeded patch
-* Mon May 19 2014 Roland Grunberg - 3.8.0-2.2
-- Packages necessary features.
+* Wed Aug 6 2014 Alexander Kurtakov 3.8.1-3
+- Rebuild against latest httpcomponents.
-* Fri May 16 2014 Roland Grunberg - 3.8.0-2.1
-- Make changes to build on DTS 3.0.
+* Mon Jul 21 2014 Alexander Kurtakov 3.8.1-2
+- Rebuild for apache-commons-logging 1.2.
+
+* Wed Jun 25 2014 Mat Booth - 3.8.1-1
+- Update to latest upstream release
+
+* Wed Jun 11 2014 Roland Grunberg - 3.8.0-4
+- Remove problematic manifest alterations from specfile.
+
+* Fri Jun 06 2014 Mat Booth - 3.8.0-3
+- Rebuild against latest httpcomponents.
* Mon May 12 2014 Alexander Kurtakov 3.8.0-2
- Rebuild against latest httpcomponents.