You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2020/01/16 17:34:57 UTC
[archiva] branch master updated (7f6436c -> 5887922)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from 7f6436c Setting jackson version
new a59df13 Improving log messages
new 5887922 Switching to https protocol for repo.maven.apache.org
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../archiva/rest/services/DefaultRemoteRepositoriesService.java | 6 +++---
.../apache/archiva/rest/services/RemoteRepositoriesServiceTest.java | 2 +-
.../org/apache/archiva/remotedownload/DownloadArtifactsTest.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
[archiva] 01/02: Improving log messages
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit a59df13f7c5437e7002d924bfd63a5a244068a46
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Thu Jan 16 18:33:40 2020 +0100
Improving log messages
---
.../archiva/rest/services/DefaultRemoteRepositoriesService.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
index 53522ff..f32ddde 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
@@ -129,7 +129,7 @@ public class DefaultRemoteRepositoriesService
try {
RemoteRepository remoteRepository = remoteRepositoryAdmin.getRemoteRepository(repositoryId);
if (remoteRepository == null) {
- log.warn("ignore scheduleDownloadRemote for repo with id {} as not exists", repositoryId);
+ log.warn("Remote repository {} does not exist. Connectivity check returns false.", repositoryId);
return Boolean.FALSE;
}
NetworkProxy networkProxy = null;
@@ -137,8 +137,8 @@ public class DefaultRemoteRepositoriesService
networkProxy = proxyRegistry.getNetworkProxy(remoteRepository.getRemoteDownloadNetworkProxyId());
if (networkProxy == null) {
log.warn(
- "your remote repository is configured to download remote index trought a proxy we cannot find id:{}",
- remoteRepository.getRemoteDownloadNetworkProxyId());
+ "A network proxy {} was configured for repository {}. But the proxy with the given id does not exist.",
+ remoteRepository.getRemoteDownloadNetworkProxyId(), repositoryId);
}
}
[archiva] 02/02: Switching to https protocol for
repo.maven.apache.org
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 588792244951496ee0874690f09ffec825419e92
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Thu Jan 16 18:34:29 2020 +0100
Switching to https protocol for repo.maven.apache.org
---
.../org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java | 2 +-
.../java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
index 556b5f4..b2471ed 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
@@ -238,7 +238,7 @@ public class RemoteRepositoriesServiceTest
RemoteRepository getRemoteMavenRepository()
{
- return new RemoteRepository( Locale.getDefault( ),"id-maven1", "Maven1", "http://repo.maven.apache.org/maven2", "default", "foo", "foopassword", 120,
+ return new RemoteRepository( Locale.getDefault( ),"id-maven1", "Maven1", "https://repo.maven.apache.org/maven2", "default", "foo", "foopassword", 120,
"cool repo3" );
}
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
index d7124ed..acd74d0 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
@@ -211,7 +211,7 @@ public class DownloadArtifactsTest
resp.setStatus( 302 );
resp.getWriter().write( "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n" + "<html><head>\n"
+ "<title>302 Found</title>\n" + "</head><body>\n" + "<h1>Found</h1>\n"
- + "<p>The document has moved <a href=\"http://repo.maven.apache.org/maven2/junit/junit/4.9/junit-4.9.jar\">here</a>.</p>\n"
+ + "<p>The document has moved <a href=\"https://repo.maven.apache.org/maven2/junit/junit/4.9/junit-4.9.jar\">here</a>.</p>\n"
+ "</body></html>\n" + "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n"
+ "<html><head>\n" );
resp.sendRedirect( "http://localhost:" + getServletContext().getAttribute( "redirectToPort" ) + "/maven2/"