You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/01/16 08:03:16 UTC
[karaf] branch master updated: [KARAF-6600] Use https URL for Maven
Central
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new c29efdf [KARAF-6600] Use https URL for Maven Central
new f0b8774 Merge pull request #1063 from jbonofre/KARAF-6600
c29efdf is described below
commit c29efdf9a9b3570eccd1555d494d9aa5fbab7afa
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Thu Jan 16 06:25:49 2020 +0100
[KARAF-6600] Use https URL for Maven Central
---
.../main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg | 11 +++++------
.../src/main/resources/default.profile/profile.cfg | 2 +-
itests/test/src/test/resources/etc/org.ops4j.pax.url.mvn.cfg | 4 ++--
kar/src/test/java/org/apache/karaf/kar/internal/KarTest.java | 2 +-
manual/src/main/asciidoc/user-guide/urls.adoc | 10 +++++-----
5 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
index a3df328..5b01359 100644
--- a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
@@ -56,7 +56,7 @@ org.ops4j.pax.url.mvn.certificateCheck=true
#
# Default this to false. It's just weird to use undocumented repos
-# "false" means that http://repo1.maven.org/maven2@id=central won't be
+# "false" means that https://repo1.maven.org/maven2@id=central won't be
# implicitly used as remote repository
#
org.ops4j.pax.url.mvn.useFallbackRepositories=false
@@ -101,9 +101,8 @@ org.ops4j.pax.url.mvn.defaultRepositories=\
# profiles defined in effective settings.xml file will be _appended_ to this
# list
# The default list includes the following repositories:
-# http://repo1.maven.org/maven2@id=central
-# http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases
-# https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases
+# https://repo1.maven.org/maven2@id=central
+# https://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases
# https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases
# A repository url can be appended with zero or more of the following flags:
# @snapshots : the repository contains snapshots
@@ -112,8 +111,8 @@ org.ops4j.pax.url.mvn.defaultRepositories=\
# settings.xml this is optional but recommended
#
org.ops4j.pax.url.mvn.repositories= \
- http://repo1.maven.org/maven2@id=central, \
- http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, \
+ https://repo1.maven.org/maven2@id=central, \
+ https://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, \
https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases
#
diff --git a/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/default.profile/profile.cfg b/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/default.profile/profile.cfg
index ab7d49c..947f36e 100644
--- a/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/default.profile/profile.cfg
+++ b/examples/karaf-profile-example/karaf-profile-example-registry/src/main/resources/default.profile/profile.cfg
@@ -22,6 +22,6 @@ library.jolokia-agent=mvn\:org.jolokia/jolokia-jvm/1.2.2/jar/agent
org.ops4j.pax.url.mvn.repositories= \
file:${runtime.home}/${karaf.default.repository}@snapshots@id=karaf-default, \
- http://repo1.maven.org/maven2@id=central
+ https://repo1.maven.org/maven2@id=central
diff --git a/itests/test/src/test/resources/etc/org.ops4j.pax.url.mvn.cfg b/itests/test/src/test/resources/etc/org.ops4j.pax.url.mvn.cfg
index 5dd583e..e24df65 100644
--- a/itests/test/src/test/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ b/itests/test/src/test/resources/etc/org.ops4j.pax.url.mvn.cfg
@@ -53,7 +53,7 @@ org.ops4j.pax.url.mvn.localRepository=${karaf.data}/repository
#
# Default this to false. It's just weird to use undocumented repos
-# "false" means that http://repo1.maven.org/maven2@id=central won't be
+# "false" means that https://repo1.maven.org/maven2@id=central won't be
# implicitly used as remote repository
#
org.ops4j.pax.url.mvn.useFallbackRepositories=false
@@ -108,7 +108,7 @@ org.ops4j.pax.url.mvn.defaultRepositories=\
# settings.xml this is optional but recommended
#
org.ops4j.pax.url.mvn.repositories= \
- http://repo1.maven.org/maven2@id=central
+ https://repo1.maven.org/maven2@id=central
#
# Global policies override repository-specific settings (@checksum=..., @update=..., @releasesUpdate=..., ...)
diff --git a/kar/src/test/java/org/apache/karaf/kar/internal/KarTest.java b/kar/src/test/java/org/apache/karaf/kar/internal/KarTest.java
index b7b70c6..340b113 100644
--- a/kar/src/test/java/org/apache/karaf/kar/internal/KarTest.java
+++ b/kar/src/test/java/org/apache/karaf/kar/internal/KarTest.java
@@ -34,7 +34,7 @@ public class KarTest {
File base = new File("target/test");
base.mkdirs();
- Kar kar = new Kar(new URI("http://repo1.maven.org/maven2/org/apache/karaf/features/framework/4.2.2/framework-4.2.2.kar"));
+ Kar kar = new Kar(new URI("https://repo1.maven.org/maven2/org/apache/karaf/features/framework/4.2.2/framework-4.2.2.kar"));
File repoDir = new File("target/test/framework-repo");
repoDir.mkdirs();
File resourcesDir = new File("target/test/framework-resources");
diff --git a/manual/src/main/asciidoc/user-guide/urls.adoc b/manual/src/main/asciidoc/user-guide/urls.adoc
index baa737f..347f683 100644
--- a/manual/src/main/asciidoc/user-guide/urls.adoc
+++ b/manual/src/main/asciidoc/user-guide/urls.adoc
@@ -18,7 +18,7 @@ The main information provided by a feature is the set of OSGi bundles that defin
[source,options="nowrap"]
----
-<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>
+<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>
----
Doing this will make sure the above bundle is installed while installing the feature.
@@ -94,8 +94,8 @@ Require Config Admin │ true
Use fallback repository │ false │ Explicit org.ops4j.pax.url.mvn PID configuration (org.ops4j.pax.url.mvn.useFallbackRepositories)
Offline mode │ false │ Default "false"
SSL/TLS certificate check │ true │ Explicit org.ops4j.pax.url.mvn PID configuration (org.ops4j.pax.url.mvn.certificateCheck)
-Remote repositories │ http://repo1.maven.org/maven2/ │ PID configuration
- │ http://repository.apache.org/content/groups/snapshots-group/ │ PID configuration
+Remote repositories │ https://repo1.maven.org/maven2/ │ PID configuration
+ │ https://repository.apache.org/content/groups/snapshots-group/ │ PID configuration
│ https://oss.sonatype.org/content/repositories/snapshots/ │ PID configuration
│ https://oss.sonatype.org/content/repositories/ops4j-snapshots/ │ PID configuration
Default repositories │ file:/data/servers/apache-karaf-4.2.0-SNAPSHOT/system/ │ PID configuration
@@ -122,8 +122,8 @@ karaf@root()> maven:repository-list -v
== Remote repositories
ID │ URL │ Releases │ Snapshots │ Defined in
────────────────────────────────┼────────────────────────────────────────────────────────────────┼─────────────┼─────────────┼───────────
-central │ http://repo1.maven.org/maven2/ │ yes (daily) │ no │ PID
-apache │ http://repository.apache.org/content/groups/snapshots-group/ │ no │ yes (daily) │ PID
+central │ https://repo1.maven.org/maven2/ │ yes (daily) │ no │ PID
+apache │ https://repository.apache.org/content/groups/snapshots-group/ │ no │ yes (daily) │ PID
sonatype.snapshots.deploy │ https://oss.sonatype.org/content/repositories/snapshots/ │ no │ yes (daily) │ PID
ops4j.sonatype.snapshots.deploy │ https://oss.sonatype.org/content/repositories/ops4j-snapshots/ │ no │ yes (daily) │ PID
special │ https://repository.everfree.forest/ │ yes (daily) │ no │ SETTINGS