This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 05e0640  Fix Ci issue (#149)
05e0640 is described below

commit 05e06405f224010a359fcef0dcb8c77aa90ca82d
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Mon Aug 16 10:45:49 2021 +1000

    Fix Ci issue (#149)
    
    * fix use of hostname on ci server
    
    Signed-off-by: Olivier Lamy <ol...@apache.org>
---
 pom.xml                                                        |  6 ++++++
 .../java/org/apache/maven/plugins/dependency/TestGetMojo.java  | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 031a60c..5a87aad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,7 @@ under the License.
     <pluginTestingVersion>3.1.0</pluginTestingVersion>
     <javaVersion>7</javaVersion>
     
<project.build.outputTimestamp>2021-06-07T12:17:08Z</project.build.outputTimestamp>
+    <slf4j.version>1.7.30</slf4j.version>
   </properties>
 
   <dependencyManagement>
@@ -359,6 +360,11 @@ under the License.
       <version>${jettyVersion}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java 
b/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
index ee23525..fc052e7 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.dependency;
  */
 
 import java.io.File;
+import java.net.InetAddress;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
@@ -38,6 +39,7 @@ import org.eclipse.jetty.security.ConstraintSecurityHandler;
 import org.eclipse.jetty.security.HashLoginService;
 import org.eclipse.jetty.security.LoginService;
 import org.eclipse.jetty.security.authentication.BasicAuthenticator;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.ResourceHandler;
 import org.eclipse.jetty.util.security.Constraint;
@@ -124,8 +126,12 @@ public class TestGetMojo
         org.eclipse.jetty.server.Server server = createServer();
         try {
             server.start();
+            ServerConnector serverConnector = 
(ServerConnector)server.getConnectors()[0];
+            String url = "http://"; + (serverConnector.getHost() == null ?
+                    InetAddress.getLoopbackAddress().getHostName() : 
serverConnector.getHost());
+            url = url + ":" + serverConnector.getLocalPort() + "/maven";
 
-            setVariableValueToObject( mojo, "remoteRepositories", 
"myserver::default::" + server.getURI() );
+            setVariableValueToObject( mojo, "remoteRepositories", 
"myserver::default::" + url );
             mojo.setGroupId( "test" );
             mojo.setArtifactId( "test" );
             mojo.setVersion( "1.0" );
@@ -208,7 +214,7 @@ public class TestGetMojo
     {
         org.eclipse.jetty.server.Server server = new 
org.eclipse.jetty.server.Server( 0 );
         server.setStopAtShutdown( true );
-
+        
         LoginService loginService = new HashLoginService( "myrealm",
             "src/test/resources/unit/get-test/realm.properties" );
         server.addBean( loginService );

Reply via email to