Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2020-06-29 07:50:56 +0000
committerMickael Istria2020-06-29 07:50:56 +0000
commit4ba6ff7b188d38345c70d6b5a58a979fa6ca0a77 (patch)
treeaa0f7ede6f340cf5daab27926e8aa6afc9df032d
parent964ee2e134e80633a404a1240adeca7804fcdc3c (diff)
downloadorg.eclipse.epp.packages-master.tar.gz
org.eclipse.epp.packages-master.tar.xz
org.eclipse.epp.packages-master.zip
Use httpS for download.eclipse.orgHEADmaster
Change-Id: I66b4c3a99361d4906228f0cc82337b34677634ee Signed-off-by: Mickael Istria <mistria@redhat.com>
-rw-r--r--packages/org.eclipse.epp.package.common.feature/p2.inf6
-rw-r--r--packages/org.eclipse.epp.package.cpp.feature/p2.inf10
-rw-r--r--packages/org.eclipse.epp.package.javascript.feature/p2.inf6
-rw-r--r--packages/org.eclipse.epp.package.jee.feature/p2.inf10
-rw-r--r--packages/org.eclipse.epp.package.parallel.feature/p2.inf10
-rw-r--r--releng/org.eclipse.epp.config/parent/pom.xml6
-rwxr-xr-xreleng/org.eclipse.epp.config/tools/createSettings.sh2
7 files changed, 30 insertions, 20 deletions
diff --git a/packages/org.eclipse.epp.package.common.feature/p2.inf b/packages/org.eclipse.epp.package.common.feature/p2.inf
index aa36dcad..f3c230eb 100644
--- a/packages/org.eclipse.epp.package.common.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.common.feature/p2.inf
@@ -3,5 +3,7 @@ properties.1.name=org.eclipse.equinox.p2.type.category
properties.1.value=false
instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/releases/latest,name:Latest Eclipse Release,enabled:true);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/releases/latest,name:Latest Eclipse Release,enabled:true);
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/latest);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/latest);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.eclipse.org/releases/latest,name:Latest Eclipse Release,enabled:true);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.eclipse.org/releases/latest,name:Latest Eclipse Release,enabled:true);
diff --git a/packages/org.eclipse.epp.package.cpp.feature/p2.inf b/packages/org.eclipse.epp.package.cpp.feature/p2.inf
index f8975e59..c8acbc0a 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.cpp.feature/p2.inf
@@ -41,9 +41,11 @@ update.severity = 0
update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/9.11,type:0,name:CDT,enabled:true); \
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/9.11,type:1,name:CDT,enabled:true);
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/latest);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/latest);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/tools/cdt/releases/9.11,type:0,name:CDT,enabled:true); \
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//download.eclipse.org/tools/cdt/releases/9.11,type:1,name:CDT,enabled:true);
instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/9.11,type:0); \
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/9.11,type:1);
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(location:https${#58}//download.eclipse.org/tools/cdt/releases/9.11,type:0); \
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(location:https${#58}//download.eclipse.org/tools/cdt/releases/9.11,type:1);
diff --git a/packages/org.eclipse.epp.package.javascript.feature/p2.inf b/packages/org.eclipse.epp.package.javascript.feature/p2.inf
index 46938954..c8d46167 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.javascript.feature/p2.inf
@@ -7,5 +7,7 @@ requires.1.name=org.eclipse.platform.ide
requires.1.greedy=true
instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/wildwebdeveloper/releases/latest,name:Latest Eclipse Wild Web Developer release,enabled:true);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/wildwebdeveloper/releases/latest,name:Latest Eclipse Wild Web Developer release,enabled:true);
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/latest);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/latest);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.eclipse.org/wildwebdeveloper/releases/latest,name:Latest Eclipse Wild Web Developer release,enabled:true);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.eclipse.org/wildwebdeveloper/releases/latest,name:Latest Eclipse Wild Web Developer release,enabled:true);
diff --git a/packages/org.eclipse.epp.package.jee.feature/p2.inf b/packages/org.eclipse.epp.package.jee.feature/p2.inf
index cf9d8f93..87625b0e 100644
--- a/packages/org.eclipse.epp.package.jee.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.jee.feature/p2.inf
@@ -21,9 +21,11 @@ update.severity = 0
update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/latest,name:The Eclipse Web Tools Platform (WTP) software repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/latest,name:The Eclipse Web Tools Platform (WTP) software repository);
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/latest);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/latest);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.eclipse.org/webtools/repository/latest,name:The Eclipse Web Tools Platform (WTP) software repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.eclipse.org/webtools/repository/latest,name:The Eclipse Web Tools Platform (WTP) software repository);
instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/webtools/repository/latest);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/webtools/repository/latest);
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.eclipse.org/webtools/repository/latest);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//download.eclipse.org/webtools/repository/latest);
diff --git a/packages/org.eclipse.epp.package.parallel.feature/p2.inf b/packages/org.eclipse.epp.package.parallel.feature/p2.inf
index 4e7bb81f..eb29b34b 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.parallel.feature/p2.inf
@@ -18,12 +18,14 @@ requires.3.optional=true
# Preload PTP update site / repository
instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/tools/ptp/updates/photon,name:PTP);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/tools/ptp/updates/photon,name:PTP);
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/latest);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/latest);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//download.eclipse.org/tools/ptp/updates/photon,name:PTP);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//download.eclipse.org/tools/ptp/updates/photon,name:PTP);
instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tools/ptp/updates/photon);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tools/ptp/updates/photon);
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:https${#58}//download.eclipse.org/tools/ptp/updates/photon);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:https${#58}//download.eclipse.org/tools/ptp/updates/photon);
# Bug 490515 - Prevent upgrade from old to new EPP package layout
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
index b24966ef..1c9cfd97 100644
--- a/releng/org.eclipse.epp.config/parent/pom.xml
+++ b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -42,7 +42,7 @@
<!-- Human readable name of the release, e.g. used in the about dialog (see about.mappings) -->
<eclipse.simultaneous.release.name>2020-09 M1 (4.17.0 M1)</eclipse.simultaneous.release.name>
<!-- Upstream p2 repository, used as a source for pre-compiled build artifacts -->
- <eclipse.simultaneous.release.repository>http://download.eclipse.org/staging/2020-09/</eclipse.simultaneous.release.repository>
+ <eclipse.simultaneous.release.repository>https://download.eclipse.org/staging/2020-09/</eclipse.simultaneous.release.repository>
</properties>
<prerequisites>
@@ -68,7 +68,7 @@
</repository>
<repository>
<id>license-feature</id>
- <url>http://download.eclipse.org/cbi/updates/license/</url>
+ <url>https://download.eclipse.org/cbi/updates/license/</url>
<layout>p2</layout>
</repository>
</repositories>
@@ -195,7 +195,7 @@
<version>${tycho.version}</version>
<configuration>
<extraArtifactRepositoryProperties>
- <p2.statsURI>http://download.eclipse.org/stats/technology/epp/packages/${eclipse.simultaneous.release.id}/</p2.statsURI>
+ <p2.statsURI>https://download.eclipse.org/stats/technology/epp/packages/${eclipse.simultaneous.release.id}/</p2.statsURI>
</extraArtifactRepositoryProperties>
<includeAllDependencies>true</includeAllDependencies>
<compress>true</compress>
diff --git a/releng/org.eclipse.epp.config/tools/createSettings.sh b/releng/org.eclipse.epp.config/tools/createSettings.sh
index 07fe56ad..1b8ee915 100755
--- a/releng/org.eclipse.epp.config/tools/createSettings.sh
+++ b/releng/org.eclipse.epp.config/tools/createSettings.sh
@@ -44,7 +44,7 @@ echo " <mirrorOf>central</mirrorOf>" >>$SETTINGS_FILE
echo " </mirror>" >>$SETTINGS_FILE
echo " <mirror>" >>$SETTINGS_FILE
echo " <id>example-mirror</id>" >>$SETTINGS_FILE
-echo " <mirrorOf>http://download.eclipse.org/</mirrorOf>" >>$SETTINGS_FILE
+echo " <mirrorOf>https://download.eclipse.org/</mirrorOf>" >>$SETTINGS_FILE
echo " <url>file:/home/data/httpd/download.eclipse.org/</url>" >>$SETTINGS_FILE
echo " <layout>p2</layout>" >>$SETTINGS_FILE
echo " <mirrorOfLayouts>p2</mirrorOfLayouts>" >>$SETTINGS_FILE

Back to the top