From 9801b606d0808248f988bfcab5ded038cab12389 Mon Sep 17 00:00:00 2001 From: bitionaire Date: Tue, 16 Aug 2016 09:47:09 +0200 Subject: [PATCH] * Fixed check connection error message (was MalformedURLException) * Fixed log message level * Fixed vendor information --- pom.xml | 2 +- .../com/oneandone/go/plugin/maven/MavenRepositoryPoller.java | 5 +++++ .../oneandone/go/plugin/maven/client/RepositoryClient.java | 2 +- src/main/resources/plugin.xml | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7849c5a9..84ce07ec 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.oneandone go-maven-poller - 1.1.2 + 1.1.3 https://github.com/1and1/go-maven-poller diff --git a/src/main/java/com/oneandone/go/plugin/maven/MavenRepositoryPoller.java b/src/main/java/com/oneandone/go/plugin/maven/MavenRepositoryPoller.java index 1ecf6873..b627c590 100644 --- a/src/main/java/com/oneandone/go/plugin/maven/MavenRepositoryPoller.java +++ b/src/main/java/com/oneandone/go/plugin/maven/MavenRepositoryPoller.java @@ -91,6 +91,11 @@ public PackageRevisionMessage latestModificationSince(final PackageMaterialPrope public CheckConnectionResultMessage checkConnectionToRepository(final PackageMaterialProperties repoConfig) { try { final MavenRepoConfig mavenRepoConfig = new MavenRepoConfig(repoConfig); + + if (mavenRepoConfig.isRepoUrlMissing()) { + return new CheckConnectionResultMessage(CheckConnectionResultMessage.STATUS.FAILURE, "Repo URL missing"); + } + if (!new RepositoryConnector(mavenRepoConfig).testConnection()) { return new CheckConnectionResultMessage(CheckConnectionResultMessage.STATUS.FAILURE, "Did not get HTTP Status 200 response"); } diff --git a/src/main/java/com/oneandone/go/plugin/maven/client/RepositoryClient.java b/src/main/java/com/oneandone/go/plugin/maven/client/RepositoryClient.java index 88adc411..ee18b5c0 100644 --- a/src/main/java/com/oneandone/go/plugin/maven/client/RepositoryClient.java +++ b/src/main/java/com/oneandone/go/plugin/maven/client/RepositoryClient.java @@ -49,7 +49,7 @@ public MavenRevision getLatest() { latest.setLastModified(lastUpdatedTimestamp.or(new Date())); setLocationAndTrackBack(latest); } else { - LOGGER.error("getLatest returning null"); + LOGGER.debug("getLatest returning null"); } return latest; diff --git a/src/main/resources/plugin.xml b/src/main/resources/plugin.xml index 38df8c86..7f7e53b7 100644 --- a/src/main/resources/plugin.xml +++ b/src/main/resources/plugin.xml @@ -6,7 +6,7 @@ 16.3 Polls a Maven repository by maven-metadata.xml - 1und1 Internet AG + 1&1 Internet SE https://github.com/1and1/go-maven-poller