You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/10/27 21:43:05 UTC
[maven-dependency-plugin] 02/03: - Review changes,
use random port for Jetty server.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MDEP-579
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 67718ad5d1fff820b7c8b763ba8209fb334add5e
Author: Pim Moerenhout <pi...@gmail.com>
AuthorDate: Tue Aug 20 17:29:42 2019 +0200
- Review changes, use random port for Jetty server.
---
.../maven/plugins/dependency/TestGetMojo.java | 50 ++++++++++++---------
src/test/resources/unit/get-test/realm.properties | 2 +-
.../get-test/repository/test/test/1.0/test-1.0.jar | Bin 1804 -> 2178 bytes
.../repository/test/test/1.0/test-1.0.jar.sha1 | 2 +-
.../get-test/repository/test/test/1.0/test-1.0.pom | 15 ++-----
.../repository/test/test/1.0/test-1.0.pom.sha1 | 2 +-
6 files changed, 35 insertions(+), 36 deletions(-)
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 c41ed56..8ecd249 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
@@ -62,13 +62,13 @@ public class TestGetMojo
assertNotNull( mojo );
LegacySupport legacySupport = lookup( LegacySupport.class );
- MavenSession session = newMavenSession(new MavenProjectStub());
+ MavenSession session = newMavenSession( new MavenProjectStub() );
Settings settings = session.getSettings();
Server server = new Server();
server.setId( "myserver" );
server.setUsername( "foo" );
server.setPassword( "bar" );
- settings.addServer(server);
+ settings.addServer( server );
legacySupport.setSession( session );
DefaultRepositorySystemSession repoSession =
(DefaultRepositorySystemSession) legacySupport.getRepositorySession();
@@ -129,17 +129,21 @@ public class TestGetMojo
public void testRemoteRepositoriesAuthentication()
throws Exception
{
- org.eclipse.jetty.server.Server server = createServer( 8000 );
- server.start();
+ org.eclipse.jetty.server.Server server = createServer();
+ try {
+ server.start();
- setVariableValueToObject( mojo, "remoteRepositories", "myserver::default::http://localhost:8000/maven" );
- mojo.setGroupId( "test" );
- mojo.setArtifactId( "test" );
- mojo.setVersion( "1.0" );
+ setVariableValueToObject( mojo, "remoteRepositories", "myserver::default::" + server.getURI() );
+ mojo.setGroupId( "test" );
+ mojo.setArtifactId( "test" );
+ mojo.setVersion( "1.0" );
- mojo.execute();
-
- server.stop();
+ mojo.execute();
+ }
+ finally
+ {
+ server.stop();
+ }
}
/**
@@ -197,24 +201,26 @@ public class TestGetMojo
}
}
- private ContextHandler createContextHandler() {
+ private ContextHandler createContextHandler()
+ {
ResourceHandler resourceHandler = new ResourceHandler();
- Path resourceDirectory = Paths.get("src", "test", "resources", "unit", "get-test", "repository");
- resourceHandler.setResourceBase(resourceDirectory.toString());
- resourceHandler.setDirectoriesListed(true);
+ Path resourceDirectory = Paths.get( "src", "test", "resources", "unit", "get-test", "repository" );
+ resourceHandler.setResourceBase( resourceDirectory.toString() );
+ resourceHandler.setDirectoriesListed( true );
- ContextHandler contextHandler = new ContextHandler("/maven");
- contextHandler.setHandler(resourceHandler);
+ ContextHandler contextHandler = new ContextHandler( "/maven" );
+ contextHandler.setHandler( resourceHandler );
return contextHandler;
}
- private org.eclipse.jetty.server.Server createServer( int port) {
- org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server( port );
+ private org.eclipse.jetty.server.Server createServer()
+ {
+ 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);
+ LoginService loginService = new HashLoginService( "myrealm",
+ "src/test/resources/unit/get-test/realm.properties" );
+ server.addBean( loginService );
ConstraintSecurityHandler security = new ConstraintSecurityHandler();
server.setHandler( security );
diff --git a/src/test/resources/unit/get-test/realm.properties b/src/test/resources/unit/get-test/realm.properties
index dcd199f..e616630 100644
--- a/src/test/resources/unit/get-test/realm.properties
+++ b/src/test/resources/unit/get-test/realm.properties
@@ -16,4 +16,4 @@
# under the License.
# username: password[,rolename ...]
-foo: bar,userrole
\ No newline at end of file
+foo: bar,userrole
diff --git a/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.jar b/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.jar
index 37a4da5..fdf53e9 100644
Binary files a/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.jar and b/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.jar differ
diff --git a/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.jar.sha1 b/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.jar.sha1
index 0864701..e1d138a 100644
--- a/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.jar.sha1
+++ b/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.jar.sha1
@@ -1 +1 @@
-0c4e63c56b0d2ab20f8d559cdedb4e4d76f91c63
\ No newline at end of file
+cd6c154c2c15ff5d75bd15c62388db0057ce5598
\ No newline at end of file
diff --git a/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.pom b/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.pom
index ee5233d..1add1ce 100644
--- a/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.pom
+++ b/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.pom
@@ -26,16 +26,9 @@ under the License.
<artifactId>test</artifactId>
<version>1.0</version>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
</project>
\ No newline at end of file
diff --git a/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.pom.sha1 b/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.pom.sha1
index e072920..5dab4ca 100644
--- a/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.pom.sha1
+++ b/src/test/resources/unit/get-test/repository/test/test/1.0/test-1.0.pom.sha1
@@ -1 +1 @@
-25f93607d7da80b975b5fea2072f628d049c2110
\ No newline at end of file
+fc2169034b2608b4cee1fd4af9bb0aa11c948fac
\ No newline at end of file