Bug 546516 - Change SimRel to use and exploit https:
Change-Id: Ib453683f554fdd2ea0fc4afabf2cfdbef7e28e76
Signed-off-by: Frederic Gurr <frederic.gurr@eclipse-foundation.org>
diff --git a/build.xml b/build.xml
index 8000099..9e0dc72 100644
--- a/build.xml
+++ b/build.xml
@@ -64,7 +64,7 @@
'rewriteRepositoryURLValue' is simlar to the git_protocol property but applies to URLs in the *aggr* files.
If running on Eclipse.org (or, if you otherwise have direct access to the file system, say with a mirrored repository)
it is more efficient to use direct file access ("rewriteRepositoryURLValue=file:///home/data/httpd/download.eclipse.org")
- rather than the default specified in the *aggr* files ("http://download.eclipse.org"). If this property exists (i.e. has
+ rather than the default specified in the *aggr* files ("https://download.eclipse.org"). If this property exists (i.e. has
a value) then the script does a simple search-and-replace to rewrite matching URLs.
- installEclipseAndTools
@@ -80,7 +80,7 @@
- platformLocation
'platformLocation' is the location from where to the binary platform.
By default, it is
- http://download.eclipse.org/eclipse/downloads/drops4/R-4.8-201806110500
+ https://download.eclipse.org/eclipse/downloads/drops4/R-4.8-201806110500
If you have access to the binary platform archive on your file system, you can specify
its location instead, for some savings in "download time". For example:
file:///files/eclipsefiles/
@@ -117,7 +117,7 @@
value="org.eclipse.equinox.p2.director" />
<property
name="otherArgsAggr"
- value="-metadataRepository http://download.eclipse.org/cbi/updates/aggregator/ide/4.8/I20180518-0759/ -artifactRepository http://download.eclipse.org/cbi/updates/aggregator/ide/4.8/I20180518-0759/ -installIU org.eclipse.cbi.p2repo.aggregator.engine.feature.feature.group" />
+ value="-metadataRepository https://download.eclipse.org/cbi/updates/aggregator/ide/4.8/I20180518-0759/ -artifactRepository https://download.eclipse.org/cbi/updates/aggregator/ide/4.8/I20180518-0759/ -installIU org.eclipse.cbi.p2repo.aggregator.engine.feature.feature.group" />
<!--
Remote builds should use eclipse.p2.mirrors=true
@@ -186,7 +186,7 @@
value="org.eclipse.equinox.p2.director" />
<property
name="repoReportURL"
- value="http://download.eclipse.org/cbi/updates/analyzers/4.7/" />
+ value="https://download.eclipse.org/cbi/updates/analyzers/4.7/" />
<property
name="OTHER_ARGS_TESTS"
@@ -226,7 +226,7 @@
value="org.eclipse.equinox.p2.director" />
<property
name="OTHER_ARGS_RELENG"
- value="-metadataRepository http://download.eclipse.org/webtools/releng/repository/ -artifactRepository http://download.eclipse.org/webtools/releng/repository/ -installIU org.eclipse.wtp.releng.tools.feature.feature.group" />
+ value="-metadataRepository https://download.eclipse.org/webtools/releng/repository/ -artifactRepository https://download.eclipse.org/webtools/releng/repository/ -installIU org.eclipse.wtp.releng.tools.feature.feature.group" />
<property
name="vm_args_releng"
@@ -658,7 +658,7 @@
-->
<property
name="platformLocation"
- value="http://download.eclipse.org/eclipse/downloads/drops4/R-4.8-201806110500/" />
+ value="https://download.eclipse.org/eclipse/downloads/drops4/R-4.8-201806110500/" />
<property
name="platformFilename"
value="eclipse-platform-4.8-linux-gtk-x86_64.tar.gz" />
@@ -709,7 +709,7 @@
-->
<property
name="commonRepositoryDownloadURLValue"
- value="http://download.eclipse.org" />
+ value="https://download.eclipse.org" />
<condition property="localRepoExists">
<available file="${buildModelDir}/.git" />
diff --git a/production.properties b/production.properties
index a7d402c..3e5e3b5 100644
--- a/production.properties
+++ b/production.properties
@@ -14,7 +14,7 @@
# This is important, for efficiency in production builds,
# It is used to "rewrite" the URLS in aggr file that are specified as
-# http://download.eclipse.org/<projectRepos>
+# https://download.eclipse.org/<projectRepos>
rewriteRepositoryURLValue=file:///home/data/httpd/download.eclipse.org
# we specify root location of platform as "file://" on production machine
diff --git a/promoteUtils/checkComposites.sh b/promoteUtils/checkComposites.sh
index 58b4fb7..933aba5 100755
--- a/promoteUtils/checkComposites.sh
+++ b/promoteUtils/checkComposites.sh
@@ -24,7 +24,7 @@
baseEclipseDirSegment=eclipse/downloads/drops4/R-4.8-201806110500
baseEclipse=eclipse-platform-4.8-linux-gtk-x86_64.tar.gz
repoFileAccess=file:///home/data/httpd/download.eclipse.org/
-repoHttpAccess=http://download.eclipse.org
+repoHttpAccess=https://download.eclipse.org
repoAccess=${repoFileAccess}
declare -a namesArray
diff --git a/promoteUtils/promote.shsource b/promoteUtils/promote.shsource
index db084fe..d936d06 100644
--- a/promoteUtils/promote.shsource
+++ b/promoteUtils/promote.shsource
@@ -40,7 +40,7 @@
export JAVA_CMD=${JAVA_EXEC_DIR}/java
# remember, the '&' should be uescaped here ... the p2 api (or underlying xml) will escape it.
-export devArgs="-Djava.io.tmpdir=${BUILD_HOME}/tmp -Dp2MirrorsURL=http://www.eclipse.org/downloads/download.php?format=xml&file=/releases/${release}/${dirdate} -DartifactRepoDirectory=${REPO_ROOT}/releases/${release}/${dirdate} -Dp2StatsURI=http://download.eclipse.org/stats/releases/${release} -Dp2ArtifactRepositoryName=${release}/${dirdate}"
+export devArgs="-Djava.io.tmpdir=${BUILD_HOME}/tmp -Dp2MirrorsURL=http://www.eclipse.org/downloads/download.php?format=xml&file=/releases/${release}/${dirdate} -DartifactRepoDirectory=${REPO_ROOT}/releases/${release}/${dirdate} -Dp2StatsURI=https://download.eclipse.org/stats/releases/${release} -Dp2ArtifactRepositoryName=${release}/${dirdate}"
mkdir -p ${BUILD_HOME}/tmp
diff --git a/promoteUtils/writeComposites.sh b/promoteUtils/writeComposites.sh
index ceee89c..5f1087b 100755
--- a/promoteUtils/writeComposites.sh
+++ b/promoteUtils/writeComposites.sh
@@ -16,7 +16,7 @@
# this number is just used to allocate an initial array (or, something) so would be a very minor
# performance hit to have to "grow" it. But, could be improved in future.
printf "%s\n" " <children size='4'>" >> ${outfile}
- printf "%s\n" " <child location='http://download.eclipse.org/technology/epp/packages/$stream/'/>" >> ${outfile}
+ printf "%s\n" " <child location='https://download.eclipse.org/technology/epp/packages/$stream/'/>" >> ${outfile}
}
@@ -37,7 +37,7 @@
# this number is just used to allocate an initial array (or, something) so would be a very minor
# performance hit to have to "grow" it. But, could be improved in future.
printf "%s\n" " <children size='3'>" >> ${outfile}
- printf "%s\n" " <child location='http://download.eclipse.org/technology/epp/packages/$stream/'/>" >> ${outfile}
+ printf "%s\n" " <child location='https://download.eclipse.org/technology/epp/packages/$stream/'/>" >> ${outfile}
}
diff --git a/respin/simrel_respin.sh b/respin/simrel_respin.sh
index c0f2395..1c4013d 100755
--- a/respin/simrel_respin.sh
+++ b/respin/simrel_respin.sh
@@ -57,7 +57,7 @@
git checkout -b ${tag}_respin
#transform repo
-ant -f ${simrel_tools_path}/transformToOneRepo/changeAllRepos.xml -DnewRepository=http://download.eclipse.org/releases/${release_name}/${release_dir_name}/ -Djavax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl
+ant -f ${simrel_tools_path}/transformToOneRepo/changeAllRepos.xml -DnewRepository=https://download.eclipse.org/releases/${release_name}/${release_dir_name}/ -Djavax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl
#git diff
git diff ${tag} || true
diff --git a/runManuallyRarely/add-composite-epp-packages.xml b/runManuallyRarely/add-composite-epp-packages.xml
index 2e0aa54..1586c2d 100644
--- a/runManuallyRarely/add-composite-epp-packages.xml
+++ b/runManuallyRarely/add-composite-epp-packages.xml
@@ -14,7 +14,7 @@
name="Mars repository"/>
<add>
<repository
- location="http://download.eclipse.org/technology/epp/packages/${release}/" />
+ location="https://download.eclipse.org/technology/epp/packages/${release}/" />
</add>
</p2.composite.repository>
</target>
diff --git a/templateFiles/release/index.html b/templateFiles/release/index.html
index c0190bb..b341d63 100644
--- a/templateFiles/release/index.html
+++ b/templateFiles/release/index.html
@@ -28,7 +28,7 @@
<div id="midcolumn" style="font-size: 1.5em;">
<p>
This software site repository URL,<br />
- <code>http://download.eclipse.org/releases/mars/</code><br />
+ <code>https://download.eclipse.org/releases/mars/</code><br />
provides access to the software repository for the
<!--
<a href="http://www.eclipse.org/mars/">
diff --git a/templateFiles/staging/index.html b/templateFiles/staging/index.html
index e20bdd2..443407b 100644
--- a/templateFiles/staging/index.html
+++ b/templateFiles/staging/index.html
@@ -28,7 +28,7 @@
<div id="midcolumn" style="font-size: 1.5em;">
<p>
This software site repository URL,
- <code>http://download.eclipse.org/releases/staging/</code><br />
+ <code>https://download.eclipse.org/releases/staging/</code><br />
provides temporary access to a software repository for the
Eclipse Mars
<!--
diff --git a/transformToOneRepo/changeAllRepos.xml b/transformToOneRepo/changeAllRepos.xml
index 23b2b84..49d589e 100644
--- a/transformToOneRepo/changeAllRepos.xml
+++ b/transformToOneRepo/changeAllRepos.xml
@@ -72,7 +72,7 @@
-->
<property
name="newRepository"
- value="http://download.eclipse.org/releases/neon/201609281000/" />
+ value="https://download.eclipse.org/releases/neon/201609281000/" />
<echo message="calling the XSLT Ant task" />
<echo message=" transforming files in ${inputDirectory}" />
