Merge branch 'eclipse-ecf:master' into master

Author: scottslewis

releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.filetransfer.httpclient4.feature"
       label="%featureName"
-      version="3.14.33.qualifier"
+      version="3.14.34.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -25,9 +25,6 @@
 
    <plugin
          id="org.eclipse.ecf.provider.filetransfer.httpclient4"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>

releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/pom.xml

@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.filetransfer.httpclient4.feature</artifactId>
-  <version>3.14.33-SNAPSHOT</version>
+  <version>3.14.34-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>

releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.filetransfer.httpclient45.feature"
       label="%featureName"
-      version="1.2.0.qualifier"
+      version="1.2.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -25,17 +25,11 @@
 
    <plugin
          id="org.eclipse.ecf.provider.filetransfer.httpclient45"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.ecf.provider.filetransfer.httpclient45.win32"
          os="win32"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>

releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/pom.xml

@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.filetransfer.httpclient45.feature</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>

releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.filetransfer.httpclient5.feature"
       label="%featureName"
-      version="1.2.0.qualifier"
+      version="1.2.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -25,9 +25,11 @@
 
    <plugin
          id="org.eclipse.ecf.provider.filetransfer.httpclient5"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf.provider.filetransfer.httpclient5.win32"
+         os="win32"
+         version="0.0.0"/>
 
 </feature>

releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/pom.xml

@@ -10,5 +10,5 @@
   </parent>
   <artifactId>org.eclipse.ecf.filetransfer.httpclient5.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
 </project>