You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2014/10/09 10:07:23 UTC

git commit: [MRM-1864] use SSL by default for central

Repository: archiva
Updated Branches:
  refs/heads/master f3ed08b69 -> f21dcf5ef


[MRM-1864] use SSL by default for central

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


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/f21dcf5e
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/f21dcf5e
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/f21dcf5e

Branch: refs/heads/master
Commit: f21dcf5ef57ca68179af455e405aa05ab5e32542
Parents: f3ed08b
Author: Brett Porter <br...@apache.org>
Authored: Thu Oct 9 19:04:26 2014 +1100
Committer: Brett Porter <br...@apache.org>
Committed: Thu Oct 9 19:04:26 2014 +1100

----------------------------------------------------------------------
 .../resources/org/apache/archiva/configuration/default-archiva.xml | 2 +-
 .../archiva/admin/repository/remote/RemoteRepositoryAdminTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/f21dcf5e/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml
----------------------------------------------------------------------
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 309dd3c..a74f09c 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>

http://git-wip-us.apache.org/repos/asf/archiva/blob/f21dcf5e/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java
----------------------------------------------------------------------
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 6886446..5d8c7e9 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() );