From: Brett Porter <brett@apache.org>
Date: Thu, 9 Oct 2014 08:04:26 +0000 (+1100)
Subject: [MRM-1864] use SSL by default for central
X-Git-Tag: archiva-2.2.0~87
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f21dcf5ef57ca68179af455e405aa05ab5e32542;p=archiva.git

[MRM-1864] use SSL by default for central

This matches the default configuration used in the latest version of Maven.
---

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml
index 309dd3c34..a74f09ceb 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml
@@ -33,7 +33,7 @@
     <remoteRepository>
       <id>central</id>
       <name>Central Repository</name>
-      <url>http://repo.maven.apache.org/maven2</url>
+      <url>https://repo.maven.apache.org/maven2</url>
       <layout>default</layout>
     </remoteRepository>
   </remoteRepositories>
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java
index 68864460b..5d8c7e96c 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java
@@ -48,7 +48,7 @@ public class RemoteRepositoryAdminTest
     {
         RemoteRepository central = remoteRepositoryAdmin.getRemoteRepository( "central" );
         assertNotNull( central );
-        assertEquals( "http://repo.maven.apache.org/maven2", central.getUrl() );
+        assertEquals( "https://repo.maven.apache.org/maven2", central.getUrl() );
         assertEquals( 60, central.getTimeout() );
         assertNull( central.getUserName() );
         assertNull( central.getPassword() );