diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 27386c7..f7d6089 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -24,8 +24,8 @@ jobs:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
     with:
-      ff-goal: '-P run-its install'         # site use project version for reporting
-      verify-goal: '-P run-its install'     # should be the same as for first build
+      ff-goal: '-ntp -P run-its install'         # site use project version for reporting
+      verify-goal: '-ntp -P run-its install'     # should be the same as for first build
 
   deploy:
     name: Deploy
diff --git a/pom.xml b/pom.xml
index e12387a..87e6b82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,6 +183,11 @@
       <artifactId>slf4j-api</artifactId>
       <version>1.7.9</version>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>1.7.9</version>
+    </dependency>
 
     <!-- needed to debug plugin under m2e -->
     <dependency>
@@ -210,6 +215,18 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>9.4.51.v20230217</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>9.4.51.v20230217</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/src/main/java/org/codehaus/mojo/wagon/AbstractCopyMojo.java b/src/main/java/org/mojohaus/mojo/wagon/AbstractCopyMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/wagon/AbstractCopyMojo.java
rename to src/main/java/org/mojohaus/mojo/wagon/AbstractCopyMojo.java
index 653c08d..86f1f60 100644
--- a/src/main/java/org/codehaus/mojo/wagon/AbstractCopyMojo.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/AbstractCopyMojo.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -80,4 +80,4 @@ private void disconnectWagon( Wagon wagon )
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/codehaus/mojo/wagon/AbstractDoubleWagonMojo.java b/src/main/java/org/mojohaus/mojo/wagon/AbstractDoubleWagonMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/wagon/AbstractDoubleWagonMojo.java
rename to src/main/java/org/mojohaus/mojo/wagon/AbstractDoubleWagonMojo.java
index 1fde336..f8babb8 100644
--- a/src/main/java/org/codehaus/mojo/wagon/AbstractDoubleWagonMojo.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/AbstractDoubleWagonMojo.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/wagon/AbstractSingleWagonMojo.java b/src/main/java/org/mojohaus/mojo/wagon/AbstractSingleWagonMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/wagon/AbstractSingleWagonMojo.java
rename to src/main/java/org/mojohaus/mojo/wagon/AbstractSingleWagonMojo.java
index 6ae305e..239854b 100644
--- a/src/main/java/org/codehaus/mojo/wagon/AbstractSingleWagonMojo.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/AbstractSingleWagonMojo.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -92,4 +92,4 @@ public void execute()
     protected abstract void execute( Wagon wagon )
         throws MojoExecutionException, WagonException, IOException;
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/codehaus/mojo/wagon/AbstractWagonListMojo.java b/src/main/java/org/mojohaus/mojo/wagon/AbstractWagonListMojo.java
similarity index 93%
rename from src/main/java/org/codehaus/mojo/wagon/AbstractWagonListMojo.java
rename to src/main/java/org/mojohaus/mojo/wagon/AbstractWagonListMojo.java
index ab7230f..f362c2b 100644
--- a/src/main/java/org/codehaus/mojo/wagon/AbstractWagonListMojo.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/AbstractWagonListMojo.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@
 
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.codehaus.mojo.wagon.shared.WagonDownload;
-import org.codehaus.mojo.wagon.shared.WagonFileSet;
+import org.mojohaus.mojo.wagon.shared.WagonDownload;
+import org.mojohaus.mojo.wagon.shared.WagonFileSet;
 
 /**
  * Contains common configuration to scan for Wagon's files
diff --git a/src/main/java/org/codehaus/mojo/wagon/AbstractWagonMojo.java b/src/main/java/org/mojohaus/mojo/wagon/AbstractWagonMojo.java
similarity index 90%
rename from src/main/java/org/codehaus/mojo/wagon/AbstractWagonMojo.java
rename to src/main/java/org/mojohaus/mojo/wagon/AbstractWagonMojo.java
index cd2e486..8ebc4cb 100644
--- a/src/main/java/org/codehaus/mojo/wagon/AbstractWagonMojo.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/AbstractWagonMojo.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -7,9 +7,9 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.wagon.Wagon;
-import org.codehaus.mojo.wagon.shared.WagonFactory;
-import org.codehaus.mojo.wagon.shared.WagonFileSet;
-import org.codehaus.mojo.wagon.shared.WagonUtils;
+import org.mojohaus.mojo.wagon.shared.WagonFactory;
+import org.mojohaus.mojo.wagon.shared.WagonFileSet;
+import org.mojohaus.mojo.wagon.shared.WagonUtils;
 
 /**
  * Provides base functionality for dealing with I/O using wagon.
@@ -61,4 +61,4 @@ protected WagonFileSet getWagonFileSet( String fromDir, String includes, String
     {
         return WagonUtils.getWagonFileSet( fromDir, includes, excludes, caseSensitive, toDir );
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/codehaus/mojo/wagon/CopyMojo.java b/src/main/java/org/mojohaus/mojo/wagon/CopyMojo.java
similarity index 94%
rename from src/main/java/org/codehaus/mojo/wagon/CopyMojo.java
rename to src/main/java/org/mojohaus/mojo/wagon/CopyMojo.java
index f561f6d..dc15f92 100644
--- a/src/main/java/org/codehaus/mojo/wagon/CopyMojo.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/CopyMojo.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,8 +26,8 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.WagonException;
-import org.codehaus.mojo.wagon.shared.WagonCopy;
-import org.codehaus.mojo.wagon.shared.WagonFileSet;
+import org.mojohaus.mojo.wagon.shared.WagonCopy;
+import org.mojohaus.mojo.wagon.shared.WagonFileSet;
 
 /**
  * Copy artifacts from one Wagon repository to another Wagon repository.
@@ -78,4 +78,4 @@ protected void copy( Wagon srcWagon, Wagon targetWagon )
         wagonCopy.copy( srcWagon, fileSet, targetWagon, optimize, this.getLog() );
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/codehaus/mojo/wagon/DownloadMojo.java b/src/main/java/org/mojohaus/mojo/wagon/DownloadMojo.java
similarity index 95%
rename from src/main/java/org/codehaus/mojo/wagon/DownloadMojo.java
rename to src/main/java/org/mojohaus/mojo/wagon/DownloadMojo.java
index 398e0cc..43622da 100644
--- a/src/main/java/org/codehaus/mojo/wagon/DownloadMojo.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/DownloadMojo.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.WagonException;
-import org.codehaus.mojo.wagon.shared.WagonFileSet;
+import org.mojohaus.mojo.wagon.shared.WagonFileSet;
 
 /**
  * Transfers a set of files from a remote URL to a specified local directory.
diff --git a/src/main/java/org/codehaus/mojo/wagon/DownloadSingleMojo.java b/src/main/java/org/mojohaus/mojo/wagon/DownloadSingleMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/wagon/DownloadSingleMojo.java
rename to src/main/java/org/mojohaus/mojo/wagon/DownloadSingleMojo.java
index c104815..d6a2cf4 100644
--- a/src/main/java/org/codehaus/mojo/wagon/DownloadSingleMojo.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/DownloadSingleMojo.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/wagon/ExistMojo.java b/src/main/java/org/mojohaus/mojo/wagon/ExistMojo.java
similarity index 95%
rename from src/main/java/org/codehaus/mojo/wagon/ExistMojo.java
rename to src/main/java/org/mojohaus/mojo/wagon/ExistMojo.java
index 5583c87..55806c1 100644
--- a/src/main/java/org/codehaus/mojo/wagon/ExistMojo.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/ExistMojo.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.WagonException;
-import org.codehaus.mojo.wagon.shared.WagonDownload;
+import org.mojohaus.mojo.wagon.shared.WagonDownload;
 
 /**
  * Check for the existing of remote resource.
@@ -56,4 +56,4 @@ protected void execute( Wagon wagon )
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/codehaus/mojo/wagon/ListMojo.java b/src/main/java/org/mojohaus/mojo/wagon/ListMojo.java
similarity index 95%
rename from src/main/java/org/codehaus/mojo/wagon/ListMojo.java
rename to src/main/java/org/mojohaus/mojo/wagon/ListMojo.java
index 1a83541..ef24e61 100644
--- a/src/main/java/org/codehaus/mojo/wagon/ListMojo.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/ListMojo.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 import java.util.List;
 
diff --git a/src/main/java/org/codehaus/mojo/wagon/MergeMavenRepoMojo.java b/src/main/java/org/mojohaus/mojo/wagon/MergeMavenRepoMojo.java
similarity index 94%
rename from src/main/java/org/codehaus/mojo/wagon/MergeMavenRepoMojo.java
rename to src/main/java/org/mojohaus/mojo/wagon/MergeMavenRepoMojo.java
index d324be7..8c90376 100644
--- a/src/main/java/org/codehaus/mojo/wagon/MergeMavenRepoMojo.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/MergeMavenRepoMojo.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.WagonException;
-import org.codehaus.mojo.wagon.shared.MavenRepoMerger;
+import org.mojohaus.mojo.wagon.shared.MavenRepoMerger;
 
 /**
  * Merge artifacts from one Maven repository to another Maven repository.
@@ -45,4 +45,4 @@ protected void copy( Wagon srcWagon, Wagon targetWagon )
         mavenRepoMerger.merge( srcWagon, targetWagon, optimize, this.getLog() );
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/codehaus/mojo/wagon/SshExecMojo.java b/src/main/java/org/mojohaus/mojo/wagon/SshExecMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/wagon/SshExecMojo.java
rename to src/main/java/org/mojohaus/mojo/wagon/SshExecMojo.java
index 65f7d8b..2c3a6e2 100644
--- a/src/main/java/org/codehaus/mojo/wagon/SshExecMojo.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/SshExecMojo.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/wagon/UploadMojo.java b/src/main/java/org/mojohaus/mojo/wagon/UploadMojo.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/wagon/UploadMojo.java
rename to src/main/java/org/mojohaus/mojo/wagon/UploadMojo.java
index cff4fe0..1d752d8 100644
--- a/src/main/java/org/codehaus/mojo/wagon/UploadMojo.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/UploadMojo.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -29,7 +29,7 @@
 import org.apache.maven.shared.model.fileset.FileSet;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.WagonException;
-import org.codehaus.mojo.wagon.shared.WagonUpload;
+import org.mojohaus.mojo.wagon.shared.WagonUpload;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
diff --git a/src/main/java/org/codehaus/mojo/wagon/UploadSingleMojo.java b/src/main/java/org/mojohaus/mojo/wagon/UploadSingleMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/wagon/UploadSingleMojo.java
rename to src/main/java/org/mojohaus/mojo/wagon/UploadSingleMojo.java
index 603d1b3..b83c88f 100644
--- a/src/main/java/org/codehaus/mojo/wagon/UploadSingleMojo.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/UploadSingleMojo.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/wagon/shared/DefaultMavenRepoMerger.java b/src/main/java/org/mojohaus/mojo/wagon/shared/DefaultMavenRepoMerger.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/wagon/shared/DefaultMavenRepoMerger.java
rename to src/main/java/org/mojohaus/mojo/wagon/shared/DefaultMavenRepoMerger.java
index b2d721a..5bbf196 100644
--- a/src/main/java/org/codehaus/mojo/wagon/shared/DefaultMavenRepoMerger.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/shared/DefaultMavenRepoMerger.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonCopy.java b/src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonCopy.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonCopy.java
rename to src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonCopy.java
index 5c0f2e3..c84192e 100644
--- a/src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonCopy.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonCopy.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonDownload.java b/src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonDownload.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonDownload.java
rename to src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonDownload.java
index 47c835d..d72c861 100644
--- a/src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonDownload.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonDownload.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonFactory.java b/src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonFactory.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonFactory.java
rename to src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonFactory.java
index f3acdbd..747fec2 100644
--- a/src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonFactory.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonFactory.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Server;
diff --git a/src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonUpload.java b/src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonUpload.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonUpload.java
rename to src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonUpload.java
index 8ff7234..615f601 100644
--- a/src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonUpload.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonUpload.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,6 @@
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.shared.model.fileset.FileSet;
 import org.apache.maven.shared.model.fileset.util.FileSetManager;
 import org.apache.maven.wagon.CommandExecutor;
diff --git a/src/main/java/org/codehaus/mojo/wagon/shared/MavenRepoMerger.java b/src/main/java/org/mojohaus/mojo/wagon/shared/MavenRepoMerger.java
similarity index 96%
rename from src/main/java/org/codehaus/mojo/wagon/shared/MavenRepoMerger.java
rename to src/main/java/org/mojohaus/mojo/wagon/shared/MavenRepoMerger.java
index 71310b9..9d95ea6 100644
--- a/src/main/java/org/codehaus/mojo/wagon/shared/MavenRepoMerger.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/shared/MavenRepoMerger.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/wagon/shared/SelectorUtils.java b/src/main/java/org/mojohaus/mojo/wagon/shared/SelectorUtils.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/wagon/shared/SelectorUtils.java
rename to src/main/java/org/mojohaus/mojo/wagon/shared/SelectorUtils.java
index 6d34e2f..e926acc 100644
--- a/src/main/java/org/codehaus/mojo/wagon/shared/SelectorUtils.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/shared/SelectorUtils.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/wagon/shared/WagonCopy.java b/src/main/java/org/mojohaus/mojo/wagon/shared/WagonCopy.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/wagon/shared/WagonCopy.java
rename to src/main/java/org/mojohaus/mojo/wagon/shared/WagonCopy.java
index 6e70961..ff877df 100644
--- a/src/main/java/org/codehaus/mojo/wagon/shared/WagonCopy.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/shared/WagonCopy.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/wagon/shared/WagonDirectoryScanner.java b/src/main/java/org/mojohaus/mojo/wagon/shared/WagonDirectoryScanner.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/wagon/shared/WagonDirectoryScanner.java
rename to src/main/java/org/mojohaus/mojo/wagon/shared/WagonDirectoryScanner.java
index fa67927..8264a87 100644
--- a/src/main/java/org/codehaus/mojo/wagon/shared/WagonDirectoryScanner.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/shared/WagonDirectoryScanner.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/wagon/shared/WagonDownload.java b/src/main/java/org/mojohaus/mojo/wagon/shared/WagonDownload.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/wagon/shared/WagonDownload.java
rename to src/main/java/org/mojohaus/mojo/wagon/shared/WagonDownload.java
index e174e6c..e39a98f 100644
--- a/src/main/java/org/codehaus/mojo/wagon/shared/WagonDownload.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/shared/WagonDownload.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/wagon/shared/WagonFactory.java b/src/main/java/org/mojohaus/mojo/wagon/shared/WagonFactory.java
similarity index 86%
rename from src/main/java/org/codehaus/mojo/wagon/shared/WagonFactory.java
rename to src/main/java/org/mojohaus/mojo/wagon/shared/WagonFactory.java
index 558b0cd..c80798e 100644
--- a/src/main/java/org/codehaus/mojo/wagon/shared/WagonFactory.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/shared/WagonFactory.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 import org.apache.maven.settings.Settings;
 import org.apache.maven.wagon.Wagon;
diff --git a/src/main/java/org/codehaus/mojo/wagon/shared/WagonFileSet.java b/src/main/java/org/mojohaus/mojo/wagon/shared/WagonFileSet.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/wagon/shared/WagonFileSet.java
rename to src/main/java/org/mojohaus/mojo/wagon/shared/WagonFileSet.java
index c96df5f..69f224b 100644
--- a/src/main/java/org/codehaus/mojo/wagon/shared/WagonFileSet.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/shared/WagonFileSet.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/wagon/shared/WagonUpload.java b/src/main/java/org/mojohaus/mojo/wagon/shared/WagonUpload.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/wagon/shared/WagonUpload.java
rename to src/main/java/org/mojohaus/mojo/wagon/shared/WagonUpload.java
index 7e2e38d..5a85fa2 100644
--- a/src/main/java/org/codehaus/mojo/wagon/shared/WagonUpload.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/shared/WagonUpload.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/wagon/shared/WagonUtils.java b/src/main/java/org/mojohaus/mojo/wagon/shared/WagonUtils.java
similarity index 95%
rename from src/main/java/org/codehaus/mojo/wagon/shared/WagonUtils.java
rename to src/main/java/org/mojohaus/mojo/wagon/shared/WagonUtils.java
index fd45dc7..7561856 100644
--- a/src/main/java/org/codehaus/mojo/wagon/shared/WagonUtils.java
+++ b/src/main/java/org/mojohaus/mojo/wagon/shared/WagonUtils.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 import org.codehaus.plexus.util.StringUtils;
 
diff --git a/src/test/java/org/mojohaus/mojo/wagon/AbstractJettyIT.java b/src/test/java/org/mojohaus/mojo/wagon/AbstractJettyIT.java
new file mode 100644
index 0000000..c06a866
--- /dev/null
+++ b/src/test/java/org/mojohaus/mojo/wagon/AbstractJettyIT.java
@@ -0,0 +1,49 @@
+package org.mojohaus.mojo.wagon;
+
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.handler.DefaultHandler;
+import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.junit.After;
+import org.junit.Before;
+
+public abstract class AbstractJettyIT {
+
+    private Server server;
+    private int port;
+
+    @Before
+    public void runJetty() throws Exception {
+        server = new Server();
+        ServerConnector connector = new ServerConnector(server);
+        connector.setPort(0);
+        connector.setHost("localhost");
+        server.addConnector(connector);
+
+        ResourceHandler resource_handler = new ResourceHandler();
+        resource_handler.setDirectoriesListed(true);
+        resource_handler.setResourceBase(getDirectoryToServe());
+
+        HandlerList handlers = new HandlerList();
+        handlers.setHandlers(new Handler[] { resource_handler, new DefaultHandler() });
+        server.setHandler(handlers);
+
+        server.start();
+        this.port = connector.getLocalPort();
+    }
+
+
+    @After
+    public void tearDown() throws Exception {
+        server.stop();
+    }
+
+    protected int getServerPort() {
+        return this.port;
+    }
+
+    protected abstract String getDirectoryToServe();
+
+}
diff --git a/src/test/java/org/codehaus/mojo/wagon/Wagon334MojoHttpIT.java b/src/test/java/org/mojohaus/mojo/wagon/Wagon334MojoHttpIT.java
similarity index 98%
rename from src/test/java/org/codehaus/mojo/wagon/Wagon334MojoHttpIT.java
rename to src/test/java/org/mojohaus/mojo/wagon/Wagon334MojoHttpIT.java
index a91a916..6bbc821 100644
--- a/src/test/java/org/codehaus/mojo/wagon/Wagon334MojoHttpIT.java
+++ b/src/test/java/org/mojohaus/mojo/wagon/Wagon334MojoHttpIT.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 import java.io.File;
 
diff --git a/src/test/java/org/codehaus/mojo/wagon/WagonMojoFtpBasicIT.java b/src/test/java/org/mojohaus/mojo/wagon/WagonMojoFtpBasicIT.java
similarity index 98%
rename from src/test/java/org/codehaus/mojo/wagon/WagonMojoFtpBasicIT.java
rename to src/test/java/org/mojohaus/mojo/wagon/WagonMojoFtpBasicIT.java
index 4e944fc..10b28db 100644
--- a/src/test/java/org/codehaus/mojo/wagon/WagonMojoFtpBasicIT.java
+++ b/src/test/java/org/mojohaus/mojo/wagon/WagonMojoFtpBasicIT.java
@@ -1,7 +1,13 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
+import io.takari.maven.testing.TestResources;
+import io.takari.maven.testing.executor.MavenExecution;
+import io.takari.maven.testing.executor.MavenExecutionResult;
+import io.takari.maven.testing.executor.MavenRuntime;
+import io.takari.maven.testing.executor.MavenRuntime.MavenRuntimeBuilder;
+import io.takari.maven.testing.executor.MavenVersions;
+import io.takari.maven.testing.executor.junit.MavenJUnitTestRunner;
 import java.io.File;
-
 import org.apache.ftpserver.ConnectionConfigFactory;
 import org.apache.ftpserver.FtpServer;
 import org.apache.ftpserver.FtpServerFactory;
@@ -15,14 +21,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import io.takari.maven.testing.TestResources;
-import io.takari.maven.testing.executor.MavenExecution;
-import io.takari.maven.testing.executor.MavenExecutionResult;
-import io.takari.maven.testing.executor.MavenRuntime;
-import io.takari.maven.testing.executor.MavenRuntime.MavenRuntimeBuilder;
-import io.takari.maven.testing.executor.MavenVersions;
-import io.takari.maven.testing.executor.junit.MavenJUnitTestRunner;
-
 @RunWith( MavenJUnitTestRunner.class )
 @MavenVersions( { "3.2.5" } )
 public class WagonMojoFtpBasicIT
diff --git a/src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpIT.java b/src/test/java/org/mojohaus/mojo/wagon/WagonMojoHttpIT.java
similarity index 60%
rename from src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpIT.java
rename to src/test/java/org/mojohaus/mojo/wagon/WagonMojoHttpIT.java
index e701c06..69f390d 100644
--- a/src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpIT.java
+++ b/src/test/java/org/mojohaus/mojo/wagon/WagonMojoHttpIT.java
@@ -1,11 +1,6 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
-import java.io.File;
-
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static java.util.Objects.requireNonNull;
 
 import io.takari.maven.testing.TestResources;
 import io.takari.maven.testing.executor.MavenExecution;
@@ -14,20 +9,33 @@
 import io.takari.maven.testing.executor.MavenRuntime.MavenRuntimeBuilder;
 import io.takari.maven.testing.executor.MavenVersions;
 import io.takari.maven.testing.executor.junit.MavenJUnitTestRunner;
+import java.io.File;
+import java.net.URL;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @RunWith( MavenJUnitTestRunner.class )
 @MavenVersions( { "3.2.5" } )
-public class WagonMojoHttpIT
+public class WagonMojoHttpIT extends AbstractJettyIT
 {
     @Rule
     public final TestResources resources = new TestResources();
+    private final MavenRuntimeBuilder mavenBuilder;
 
-    public final MavenRuntime maven;
+    public MavenRuntime maven;
 
     public WagonMojoHttpIT( MavenRuntimeBuilder builder )
         throws Exception
     {
-        this.maven = builder.withCliOptions( "-B" ).build();
+        this.mavenBuilder = builder.withCliOptions( "-B" );
+    }
+
+    @Before
+    public void setPort() throws Exception {
+        this.maven = this.mavenBuilder.withCliOptions( "-Dserver.port=" + getServerPort() ).build();
     }
 
     @Test
@@ -41,6 +49,12 @@ public void testDownload()
         result.assertErrorFreeLog();
 
         Assert.assertTrue( new File( result.getBasedir(),
-                        "target/it/http-download/1.1/commons-dbutils-1.1-sources.jar" ).exists() );
+                        "target/it/http-download/commons-dbutils-1.1-sources.txt" ).exists() );
+    }
+
+    @Override
+    protected String getDirectoryToServe() {
+        URL classLocation = getClass().getResource(".");
+        return requireNonNull(classLocation).getPath();
     }
 }
diff --git a/src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpSettingsIT.java b/src/test/java/org/mojohaus/mojo/wagon/WagonMojoHttpSettingsIT.java
similarity index 60%
rename from src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpSettingsIT.java
rename to src/test/java/org/mojohaus/mojo/wagon/WagonMojoHttpSettingsIT.java
index a1e9e24..d4fa98e 100644
--- a/src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpSettingsIT.java
+++ b/src/test/java/org/mojohaus/mojo/wagon/WagonMojoHttpSettingsIT.java
@@ -1,10 +1,6 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
-import java.io.File;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static java.util.Objects.requireNonNull;
 
 import io.takari.maven.testing.TestResources;
 import io.takari.maven.testing.executor.MavenExecution;
@@ -13,20 +9,32 @@
 import io.takari.maven.testing.executor.MavenRuntime.MavenRuntimeBuilder;
 import io.takari.maven.testing.executor.MavenVersions;
 import io.takari.maven.testing.executor.junit.MavenJUnitTestRunner;
+import java.io.File;
+import java.net.URL;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @RunWith( MavenJUnitTestRunner.class )
 @MavenVersions( { "3.2.5" } )
-public class WagonMojoHttpSettingsIT
+public class WagonMojoHttpSettingsIT extends AbstractJettyIT
 {
     @Rule
     public final TestResources resources = new TestResources();
 
-    public final MavenRuntime maven;
+    public MavenRuntime maven;
+    private final MavenRuntimeBuilder mavenBuilder;
 
     public WagonMojoHttpSettingsIT( MavenRuntimeBuilder builder )
         throws Exception
     {
-        this.maven = builder.withCliOptions( "-B", "-e", "-s", "settings.xml" ).build();
+        this.mavenBuilder = builder.withCliOptions( "-B", "-e", "-s", "settings.xml");
+    }
+
+    @Before
+    public void setPort() throws Exception {
+        this.maven = this.mavenBuilder.withCliOptions( "-Dserver.port=" + getServerPort() ).build();
     }
 
     @Test
@@ -39,4 +47,10 @@ public void testDownload()
         MavenExecutionResult result = mavenExec.execute( "clean", "verify" );
         result.assertErrorFreeLog();
     }
+
+    @Override
+    protected String getDirectoryToServe() {
+        URL classLocation = getClass().getResource(".");
+        return requireNonNull(classLocation).getPath();
+    }
 }
diff --git a/src/test/java/org/codehaus/mojo/wagon/WagonMojoSshIT.java b/src/test/java/org/mojohaus/mojo/wagon/WagonMojoSshIT.java
similarity index 97%
rename from src/test/java/org/codehaus/mojo/wagon/WagonMojoSshIT.java
rename to src/test/java/org/mojohaus/mojo/wagon/WagonMojoSshIT.java
index a692ac0..39a74e1 100644
--- a/src/test/java/org/codehaus/mojo/wagon/WagonMojoSshIT.java
+++ b/src/test/java/org/mojohaus/mojo/wagon/WagonMojoSshIT.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 import java.io.File;
 
diff --git a/src/test/projects/ftp-basic/pom.xml b/src/test/projects/ftp-basic/pom.xml
index 19c08f1..fe8c33f 100644
--- a/src/test/projects/ftp-basic/pom.xml
+++ b/src/test/projects/ftp-basic/pom.xml
@@ -31,7 +31,7 @@
         <configuration>
           <skip>false</skip>
           <serverId>anonymous.ftp</serverId>
-          <url>ftp://anonymous@localhost:8221/test-classes/org/codehaus/mojo/wagon</url>
+          <url>ftp://anonymous@localhost:8221/test-classes/org/mojohaus/mojo/wagon</url>
         </configuration>
         <executions>
           <execution>
diff --git a/src/test/projects/http-download/pom.xml b/src/test/projects/http-download/pom.xml
index b0011a4..ad46182 100644
--- a/src/test/projects/http-download/pom.xml
+++ b/src/test/projects/http-download/pom.xml
@@ -10,6 +10,7 @@
   <properties>
     <downloadDirectory.base>${project.build.directory}/it/http-download</downloadDirectory.base>
     <wagon.api.version>3.0.0</wagon.api.version>
+    <server.port>8080</server.port>
   </properties>
 
   <build>
@@ -42,7 +43,7 @@
               <goal>list</goal>
             </goals>
             <configuration>
-              <url>https://repo1.maven.org/maven2/commons-dbutils/commons-dbutils</url>
+              <url>http://localhost:${server.port}/http-download</url>
             </configuration>
           </execution>
 
@@ -54,8 +55,8 @@
               <goal>download-single</goal>
             </goals>
             <configuration>
-              <url>https://repo1.maven.org/maven2/commons-dbutils/commons-dbutils/1.1</url>
-              <fromFile>commons-dbutils-1.1-sources.jar</fromFile>
+              <url>http://localhost:${server.port}/http-download</url>
+              <fromFile>commons-dbutils-1.1-sources.txt</fromFile>
               <toDir>${downloadDirectory.base}</toDir>
             </configuration>
           </execution>
@@ -66,7 +67,7 @@
               <goal>download-single</goal>
             </goals>
             <configuration>
-              <url>https://repo1.maven.org/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-sources.jar</url>
+              <url>http://localhost:${server.port}/http-download/commons-dbutils-1.2-sources.txt</url>
               <toDir>${downloadDirectory.base}</toDir>
             </configuration>
           </execution>
@@ -77,7 +78,7 @@
               <goal>download</goal>
             </goals>
             <configuration>
-              <url>https://repo1.maven.org/maven2/commons-dbutils/commons-dbutils</url>
+              <url>http://localhost:${server.port}/http-download</url>
               <includes>1.1/**</includes>
               <excludes>1.0/**, 1.2/**, 1.3/**, 1.4/**, 1.5/**, 1.6/**</excludes>
               <toDir>${downloadDirectory.base}</toDir>
diff --git a/src/test/resources/org/mojohaus/mojo/wagon/http-download/1.1/common-dbutils-1.1.pom.asc b/src/test/resources/org/mojohaus/mojo/wagon/http-download/1.1/common-dbutils-1.1.pom.asc
new file mode 100644
index 0000000..c6cac69
--- /dev/null
+++ b/src/test/resources/org/mojohaus/mojo/wagon/http-download/1.1/common-dbutils-1.1.pom.asc
@@ -0,0 +1 @@
+empty
diff --git a/src/test/resources/org/mojohaus/mojo/wagon/http-download/commons-dbutils-1.1-sources.txt b/src/test/resources/org/mojohaus/mojo/wagon/http-download/commons-dbutils-1.1-sources.txt
new file mode 100644
index 0000000..c6cac69
--- /dev/null
+++ b/src/test/resources/org/mojohaus/mojo/wagon/http-download/commons-dbutils-1.1-sources.txt
@@ -0,0 +1 @@
+empty
diff --git a/src/test/resources/org/mojohaus/mojo/wagon/http-download/commons-dbutils-1.2-sources.txt b/src/test/resources/org/mojohaus/mojo/wagon/http-download/commons-dbutils-1.2-sources.txt
new file mode 100644
index 0000000..c6cac69
--- /dev/null
+++ b/src/test/resources/org/mojohaus/mojo/wagon/http-download/commons-dbutils-1.2-sources.txt
@@ -0,0 +1 @@
+empty
diff --git a/src/test/resources/simplelogger.properties b/src/test/resources/simplelogger.properties
new file mode 100644
index 0000000..cd90c2a
--- /dev/null
+++ b/src/test/resources/simplelogger.properties
@@ -0,0 +1 @@
+org.slf4j.simpleLogger.defaultLogLevel=warn