Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2019-05-03 22:56:16 -0400
committerslewis2019-05-03 22:56:16 -0400
commit190b12323f38130082ace05fa2de71c8cfe22e3c (patch)
tree0908dc0fb0389236134935f42538eb66b71237da
parentfa0d107804b4c69d2aab49295bfc9a7960214bbe (diff)
downloadorg.eclipse.ecf-190b12323f38130082ace05fa2de71c8cfe22e3c.tar.gz
org.eclipse.ecf-190b12323f38130082ace05fa2de71c8cfe22e3c.tar.xz
org.eclipse.ecf-190b12323f38130082ace05fa2de71c8cfe22e3c.zip
Revert back to no win target
-rw-r--r--pom.xml2
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml7
-rw-r--r--releng/org.eclipse.ecf.releng.target/ecf-photon.target5
3 files changed, 8 insertions, 6 deletions
diff --git a/pom.xml b/pom.xml
index 7c6cf59a1..c389eea32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,7 +181,9 @@
<module>providers/bundles/org.eclipse.ecf.provider.filetransfer.efs</module>
<module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4</module>
<module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45</module>
+ <!--
<module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32</module>
+ -->
<module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl</module>
<module>providers/bundles/org.eclipse.ecf.provider.filetransfer</module>
<module>providers/bundles/org.eclipse.ecf.provider.filetransfer.scp</module>
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml
index 8dcfcdf23..f09560adf 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml
@@ -30,6 +30,7 @@
version="0.0.0"
unpack="false"/>
+<!--
<plugin
id="org.eclipse.ecf.provider.filetransfer.httpclient45.win32"
os="win32"
@@ -37,7 +38,7 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+-->
<plugin
id="org.apache.commons.codec"
download-size="0"
@@ -75,7 +76,7 @@
version="0.0.0"
unpack="false"/>
-
+<!--
<plugin
id="org.apache.httpcomponents.httpclient.win"
os="win32"
@@ -83,7 +84,7 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+-->
<plugin
id="org.apache.httpcomponents.httpcore"
download-size="0"
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-photon.target b/releng/org.eclipse.ecf.releng.target/ecf-photon.target
index 8656ca54d..924f57f23 100644
--- a/releng/org.eclipse.ecf.releng.target/ecf-photon.target
+++ b/releng/org.eclipse.ecf.releng.target/ecf-photon.target
@@ -26,8 +26,10 @@
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.6.v20190213-1430"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.6.v20190213-1430"/>
+ <!--
<unit id="org.apache.httpcomponents.httpclient.win" version="4.5.6.v20190213-1947"/>
<unit id="org.apache.httpcomponents.httpclient.win.source" version="4.5.6.v20190213-1947"/>
+ -->
<unit id="org.apache.httpcomponents.httpcore" version="4.4.10.v20190123-2214"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
<unit id="com.sun.jna" version="4.5.1.v20180403-1933"/>
@@ -45,7 +47,4 @@
<repository location="http://download.eclipse.org/releases/photon"/>
</location>
</locations>
- <environment>
- <os>win32</os>
- </environment>
</target> \ No newline at end of file

Back to the top