Skip to content

Commit f48124e

Browse files
jbonofrejbonofre
committed
[KARAF-6600] Use https URL for Maven Central
(cherry picked from commit c29efdf)
1 parent 75750de commit f48124e

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

‎assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ org.ops4j.pax.url.mvn.certificateCheck=true
5656

5757
#
5858
# Default this to false. It's just weird to use undocumented repos
59-
# "false" means that http://repo1.maven.org/maven2@id=central won't be
59+
# "false" means that https://repo1.maven.org/maven2@id=central won't be
6060
# implicitly used as remote repository
6161
#
6262
org.ops4j.pax.url.mvn.useFallbackRepositories=false
@@ -101,9 +101,8 @@ org.ops4j.pax.url.mvn.defaultRepositories=\
101101
# profiles defined in effective settings.xml file will be _appended_ to this
102102
# list
103103
# The default list includes the following repositories:
104-
# http://repo1.maven.org/maven2@id=central
105-
# http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases
106-
# https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases
104+
# https://repo1.maven.org/maven2@id=central
105+
# https://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases
107106
# https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases
108107
# A repository url can be appended with zero or more of the following flags:
109108
# @snapshots : the repository contains snapshots
@@ -112,8 +111,8 @@ org.ops4j.pax.url.mvn.defaultRepositories=\
112111
# settings.xml this is optional but recommended
113112
#
114113
org.ops4j.pax.url.mvn.repositories= \
115-
http://repo1.maven.org/maven2@id=central, \
116-
http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, \
114+
https://repo1.maven.org/maven2@id=central, \
115+
https://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, \
117116
https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases
118117

119118
#

‎examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/default.profile/profile.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ library.jolokia-agent=mvn\:org.jolokia/jolokia-jvm/1.2.2/jar/agent
2222

2323
org.ops4j.pax.url.mvn.repositories= \
2424
file:${runtime.home}/${karaf.default.repository}@snapshots@id=karaf-default, \
25-
http://repo1.maven.org/maven2@id=central
25+
https://repo1.maven.org/maven2@id=central
2626

2727

‎itests/test/src/test/resources/etc/org.ops4j.pax.url.mvn.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ org.ops4j.pax.url.mvn.localRepository=${karaf.data}/repository
5353

5454
#
5555
# Default this to false. It's just weird to use undocumented repos
56-
# "false" means that http://repo1.maven.org/maven2@id=central won't be
56+
# "false" means that https://repo1.maven.org/maven2@id=central won't be
5757
# implicitly used as remote repository
5858
#
5959
org.ops4j.pax.url.mvn.useFallbackRepositories=false
@@ -108,7 +108,7 @@ org.ops4j.pax.url.mvn.defaultRepositories=\
108108
# settings.xml this is optional but recommended
109109
#
110110
org.ops4j.pax.url.mvn.repositories= \
111-
http://repo1.maven.org/maven2@id=central
111+
https://repo1.maven.org/maven2@id=central
112112

113113
#
114114
# Global policies override repository-specific settings (@checksum=..., @update=..., @releasesUpdate=..., ...)

‎kar/src/test/java/org/apache/karaf/kar/internal/KarTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void karExtractTest() throws Exception {
3434
File base = new File("target/test");
3535
base.mkdirs();
3636

37-
Kar kar = new Kar(new URI("http://repo1.maven.org/maven2/org/apache/karaf/features/framework/4.2.2/framework-4.2.2.kar"));
37+
Kar kar = new Kar(new URI("https://repo1.maven.org/maven2/org/apache/karaf/features/framework/4.2.2/framework-4.2.2.kar"));
3838
File repoDir = new File("target/test/framework-repo");
3939
repoDir.mkdirs();
4040
File resourcesDir = new File("target/test/framework-resources");

‎manual/src/main/asciidoc/user-guide/urls.adoc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The main information provided by a feature is the set of OSGi bundles that defin
1818

1919
[source,options="nowrap"]
2020
----
21-
<bundle>http://repo1.maven.org/maven2/org/apache/servicemix/nmr/org.apache.servicemix.nmr.api/1.0.0-m2/org.apache.servicemix.nmr.api-1.0.0-m2.jar</bundle>
21+
<bundle>https://repo1.maven.org/maven2/org/apache/servicemix/nmr/org.apache.servicemix.nmr.api/1.0.0-m2/org.apache.servicemix.nmr.api-1.0.0-m2.jar</bundle>
2222
----
2323

2424
Doing this will make sure the above bundle is installed while installing the feature.
@@ -94,8 +94,8 @@ Require Config Admin │ true
9494
Use fallback repository │ false │ Explicit org.ops4j.pax.url.mvn PID configuration (org.ops4j.pax.url.mvn.useFallbackRepositories)
9595
Offline mode │ false │ Default "false"
9696
SSL/TLS certificate check │ true │ Explicit org.ops4j.pax.url.mvn PID configuration (org.ops4j.pax.url.mvn.certificateCheck)
97-
Remote repositories │ http://repo1.maven.org/maven2/ │ PID configuration
98-
│ http://repository.apache.org/content/groups/snapshots-group/ │ PID configuration
97+
Remote repositories │ https://repo1.maven.org/maven2/ │ PID configuration
98+
│ https://repository.apache.org/content/groups/snapshots-group/ │ PID configuration
9999
│ https://oss.sonatype.org/content/repositories/snapshots/ │ PID configuration
100100
│ https://oss.sonatype.org/content/repositories/ops4j-snapshots/ │ PID configuration
101101
Default repositories │ file:/data/servers/apache-karaf-4.2.0-SNAPSHOT/system/ │ PID configuration
@@ -122,8 +122,8 @@ karaf@root()> maven:repository-list -v
122122
== Remote repositories
123123
ID │ URL │ Releases │ Snapshots │ Defined in
124124
────────────────────────────────┼────────────────────────────────────────────────────────────────┼─────────────┼─────────────┼───────────
125-
central │ http://repo1.maven.org/maven2/ │ yes (daily) │ no │ PID
126-
apache │ http://repository.apache.org/content/groups/snapshots-group/ │ no │ yes (daily) │ PID
125+
central │ https://repo1.maven.org/maven2/ │ yes (daily) │ no │ PID
126+
apache │ https://repository.apache.org/content/groups/snapshots-group/ │ no │ yes (daily) │ PID
127127
sonatype.snapshots.deploy │ https://oss.sonatype.org/content/repositories/snapshots/ │ no │ yes (daily) │ PID
128128
ops4j.sonatype.snapshots.deploy │ https://oss.sonatype.org/content/repositories/ops4j-snapshots/ │ no │ yes (daily) │ PID
129129
special │ https://repository.everfree.forest/ │ yes (daily) │ no │ SETTINGS

0 commit comments

Comments
 (0)