Skip to content
Permalink
Browse files

[WFCORE-4429] Default to https when accessing repositories.

  • Loading branch information
jamezp authored and jmesnil committed Apr 16, 2019
1 parent 01c661b commit 96bebe0f1c3821ac8ef4d861f4c403cb267ecb93
@@ -62,7 +62,7 @@
/** The relative location of the cache directory to the directory indicated by {@link #ROOT_PROPERTY} */
private static final String CACHE_FOLDER_PROPERTY = "org.jboss.model.test.classpath.cache";

/** A comma separated list of maven repository urls. If not set it will use http://repository.jboss.org/nexus/content/groups/developer/ */
/** A comma separated list of maven repository urls. If not set it will use https://repository.jboss.org/nexus/content/groups/developer/ */
static final String MAVEN_REPOSITORY_URLS = "org.jboss.model.test.maven.repository.urls";

private final MavenUtil mavenUtil;
@@ -249,7 +249,7 @@ private static Integer getProxyPort(String systemProperty) {
remoteRepositories.add(repository.build());
}
//always add jboss developer repository
RemoteRepository.Builder repository = new RemoteRepository.Builder("jboss-developer", "default", "http://repository.jboss.org/nexus/content/groups/developer/");
RemoteRepository.Builder repository = new RemoteRepository.Builder("jboss-developer", "default", "https://repository.jboss.org/nexus/content/groups/developer/");
if (httpProxy != null) {
repository.setProxy(httpProxy);
}
@@ -59,15 +59,15 @@ public static void after(){
@Test
public void testWithPassedRepository() throws Exception {
System.setProperty("maven.repo.local", tmpdir.newFolder("repository").getAbsolutePath());
System.setProperty("remote.maven.repo", "http://repository.jboss.org/nexus/content/groups/public/,https://maven-central.storage.googleapis.com/");
System.setProperty("remote.maven.repo", "https://repository.jboss.org/nexus/content/groups/public/,https://maven-central.storage.googleapis.com/");

try {
clearCachedSettings();
MavenSettings settings = MavenSettings.getSettings();
List<String> remoteRepos = settings.getRemoteRepositories();
Assert.assertTrue(remoteRepos.size() >= 3); //at least 3 must be present, other can come from settings.xml
Assert.assertTrue(remoteRepos.contains("https://repo1.maven.org/maven2/"));
Assert.assertTrue(remoteRepos.contains("http://repository.jboss.org/nexus/content/groups/public/"));
Assert.assertTrue(remoteRepos.contains("https://repository.jboss.org/nexus/content/groups/public/"));
Assert.assertTrue(remoteRepos.contains("https://maven-central.storage.googleapis.com/"));

} finally {
@@ -49,7 +49,7 @@
<repository>
<id>brew-maven-repo</id>
<name>Red Hat Brew repo</name>
<url>http://download.lab.bos.redhat.com/brewroot/repos/jb-eap-6-rhel-6-build/latest/maven/</url>
<url>https://download.lab.bos.redhat.com/brewroot/repos/jb-eap-6-rhel-6-build/latest/maven/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
@@ -65,7 +65,7 @@
<pluginRepository>
<id>brew-maven-repo</id>
<name>Red Hat Brew repo</name>
<url>http://download.lab.bos.redhat.com/brewroot/repos/jb-eap-6-rhel-6-build/latest/maven/</url>
<url>https://download.lab.bos.redhat.com/brewroot/repos/jb-eap-6-rhel-6-build/latest/maven/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>

0 comments on commit 96bebe0

Please sign in to comment.
You can’t perform that action at this time.