This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch pre-MRESOLVER-92
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/pre-MRESOLVER-92 by this push:
new 6f1be18 removed those files which were added by the commit of
MRESOLVER-7
6f1be18 is described below
commit 6f1be18c24aa60223832406741b66f226a6c48f2
Author: tibordigana <tibordig...@apache.org>
AuthorDate: Sun Aug 11 14:39:53 2019 +0200
removed those files which were added by the commit of MRESOLVER-7
---
.../eclipse/aether/internal/impl/collect/Args.java | 70 ---------
.../impl/collect/DependencyCollectionUtils.java | 173 ---------------------
.../internal/impl/collect/DependencyContext.java | 74 ---------
.../impl/collect/PremanagedDependency.java | 149 ------------------
.../aether/internal/impl/collect/Results.java | 84 ----------
.../collect/DefaultDependencyCollectorTest.java | 39 -----
.../artifact-descriptions/gid3_aid1_1.ini | 7 -
.../artifact-descriptions/gid3_aid2_1.ini | 2 -
.../artifact-descriptions/gid3_aid3_1.ini | 2 -
.../artifact-descriptions/gid3_aid3_2.ini | 2 -
.../aether/util/concurrency/FutureResult.java | 69 --------
11 files changed, 671 deletions(-)
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/Args.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/Args.java
deleted file mode 100644
index e2c1229..0000000
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/Args.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.eclipse.aether.internal.impl.collect;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.concurrent.ExecutorService;
-
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.RequestTrace;
-import org.eclipse.aether.collection.CollectRequest;
-import org.eclipse.aether.util.ConfigUtils;
-import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
-
-class Args
-{
-
- final RepositorySystemSession session;
-
- final boolean ignoreRepos;
-
- final boolean premanagedState;
-
- final RequestTrace trace;
-
- final DataPool pool;
-
- final NodeStack nodes;
-
- final DefaultDependencyCollectionContext collectionContext;
-
- final DefaultVersionFilterContext versionContext;
-
- final CollectRequest request;
-
- final ExecutorService executor;
-
- @SuppressWarnings( "checkstyle:parameternumber" )
- Args( RepositorySystemSession session, RequestTrace trace, DataPool pool,
NodeStack nodes,
- DefaultDependencyCollectionContext collectionContext,
DefaultVersionFilterContext versionContext,
- CollectRequest request, ExecutorService executor )
- {
- this.session = session;
- this.request = request;
- this.ignoreRepos = session.isIgnoreArtifactDescriptorRepositories();
- this.premanagedState = ConfigUtils.getBoolean( session, false,
DependencyManagerUtils.CONFIG_PROP_VERBOSE );
- this.trace = trace;
- this.pool = pool;
- this.nodes = nodes;
- this.collectionContext = collectionContext;
- this.versionContext = versionContext;
- this.executor = executor;
- }
-
-}
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectionUtils.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectionUtils.java
deleted file mode 100644
index 876301b..0000000
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectionUtils.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.eclipse.aether.internal.impl.collect;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.aether.DefaultRepositorySystemSession;
-import org.eclipse.aether.RepositoryException;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.artifact.ArtifactProperties;
-import org.eclipse.aether.collection.VersionFilter;
-import org.eclipse.aether.graph.DefaultDependencyNode;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.repository.ArtifactRepository;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
-import org.eclipse.aether.resolution.ArtifactDescriptorResult;
-import org.eclipse.aether.resolution.VersionRangeRequest;
-import org.eclipse.aether.resolution.VersionRangeResolutionException;
-import org.eclipse.aether.resolution.VersionRangeResult;
-import org.eclipse.aether.version.Version;
-
-/**
- * Utility methods for dependency collection.
- *
- */
-public class DependencyCollectionUtils
-{
-
- @SuppressWarnings( "checkstyle:parameternumber" )
- static DefaultDependencyNode addDependencyNode( DependencyNode parent,
List<Artifact> relocations,
- PremanagedDependency
preManaged, VersionRangeResult rangeResult,
- Version version,
Dependency d, Collection<Artifact> aliases,
- List<RemoteRepository>
repos, String requestContext )
- {
- DefaultDependencyNode child = new DefaultDependencyNode( d );
- preManaged.applyTo( child );
- child.setRelocations( relocations );
- child.setVersionConstraint( rangeResult.getVersionConstraint() );
- child.setVersion( version );
- child.setAliases( aliases );
- child.setRepositories( repos );
- child.setRequestContext( requestContext );
- parent.getChildren().add( child );
- return child;
- }
-
- @SuppressWarnings( "checkstyle:parameternumber" )
- static DefaultDependencyNode createDependencyNode( DependencyNode parent,
List<Artifact> relocations,
- PremanagedDependency
preManaged, VersionRangeResult rangeResult,
- Version version,
Dependency d,
-
ArtifactDescriptorResult descriptorResult,
- DependencyNode
cycleNode )
- {
- DefaultDependencyNode child =
- addDependencyNode( parent, relocations, preManaged, rangeResult,
version, d, descriptorResult.getAliases(),
- cycleNode.getRepositories(),
cycleNode.getRequestContext() );
- child.setChildren( cycleNode.getChildren() );
- return child;
- }
-
- static ArtifactDescriptorRequest createArtifactDescriptorRequest( Args
args, List<RemoteRepository> repositories,
-
Dependency d )
- {
- ArtifactDescriptorRequest descriptorRequest = new
ArtifactDescriptorRequest();
- descriptorRequest.setArtifact( d.getArtifact() );
- descriptorRequest.setRepositories( repositories );
- descriptorRequest.setRequestContext( args.request.getRequestContext()
);
- descriptorRequest.setTrace( args.trace );
- return descriptorRequest;
- }
-
- static VersionRangeRequest createVersionRangeRequest( Args args,
List<RemoteRepository> repositories,
- Dependency
dependency )
- {
- VersionRangeRequest rangeRequest = new VersionRangeRequest();
- rangeRequest.setArtifact( dependency.getArtifact() );
- rangeRequest.setRepositories( repositories );
- rangeRequest.setRequestContext( args.request.getRequestContext() );
- rangeRequest.setTrace( args.trace );
- return rangeRequest;
- }
-
- static boolean isLackingDescriptor( Artifact artifact )
- {
- return artifact.getProperty( ArtifactProperties.LOCAL_PATH, null ) !=
null;
- }
-
- static List<RemoteRepository> getRemoteRepositories( ArtifactRepository
repository,
-
List<RemoteRepository> repositories )
- {
- if ( repository instanceof RemoteRepository )
- {
- return Collections.singletonList( (RemoteRepository) repository );
- }
- if ( repository != null )
- {
- return Collections.emptyList();
- }
- return repositories;
- }
-
- static List<? extends Version> filterVersions( Dependency dependency,
VersionRangeResult rangeResult,
- VersionFilter verFilter,
DefaultVersionFilterContext verContext )
- throws VersionRangeResolutionException
- {
- if ( rangeResult.getVersions().isEmpty() )
- {
- throw new VersionRangeResolutionException( rangeResult, "No
versions available for "
- + dependency.getArtifact() + " within specified range" );
- }
-
- List<? extends Version> versions;
- if ( verFilter != null &&
rangeResult.getVersionConstraint().getRange() != null )
- {
- verContext.set( dependency, rangeResult );
- try
- {
- verFilter.filterVersions( verContext );
- }
- catch ( RepositoryException e )
- {
- throw new VersionRangeResolutionException( rangeResult,
"Failed to filter versions for "
- + dependency.getArtifact() + ": " + e.getMessage(), e );
- }
- versions = verContext.get();
- if ( versions.isEmpty() )
- {
- throw new VersionRangeResolutionException( rangeResult, "No
acceptable versions for "
- + dependency.getArtifact() + ": " +
rangeResult.getVersions() );
- }
- }
- else
- {
- versions = rangeResult.getVersions();
- }
- return versions;
- }
-
- static RepositorySystemSession optimizeSession( RepositorySystemSession
session )
- {
- DefaultRepositorySystemSession optimized = new
DefaultRepositorySystemSession( session );
- optimized.setArtifactTypeRegistry(
CachingArtifactTypeRegistry.newInstance( session ) );
- return optimized;
- }
-
- static String getId( Dependency d )
- {
- Artifact a = d.getArtifact();
- return a.getGroupId() + ':' + a.getArtifactId() + ':' +
a.getClassifier() + ':' + a.getExtension();
- }
-}
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyContext.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyContext.java
deleted file mode 100644
index 48af70f..0000000
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyContext.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.aether.internal.impl.collect;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.Future;
-
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.resolution.ArtifactDescriptorResult;
-import org.eclipse.aether.resolution.VersionRangeResult;
-import org.eclipse.aether.version.Version;
-
-class DependencyContext
-{
- Dependency origDependency;
-
- DefaultDependencyCollectionContext context;
-
- List<Artifact> relocations;
-
- boolean disableVersionManagement;
-
- Args args;
-
- PremanagedDependency preManaged;
-
- boolean traverse;
-
- VersionRangeResult rangeResult;
-
- Version version;
-
- Artifact originalArtifact;
-
- Dependency managedDependency;
-
- Future<ArtifactDescriptorResult> futureDescriptorResult;
-
- ArtifactDescriptorResult descriptorResult;
-
- DependencyContext()
- {
- // empty
- }
-
- DependencyContext( DefaultDependencyCollectionContext context, Dependency
dependency )
- {
- this.context = context;
- this.origDependency = dependency;
- this.relocations = Collections.emptyList();
- this.disableVersionManagement = false;
- this.args = context.getArgs();
- }
-
-}
\ No newline at end of file
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/PremanagedDependency.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/PremanagedDependency.java
deleted file mode 100644
index 361213e..0000000
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/PremanagedDependency.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.eclipse.aether.internal.impl.collect;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.collection.DependencyManagement;
-import org.eclipse.aether.collection.DependencyManager;
-import org.eclipse.aether.graph.DefaultDependencyNode;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.graph.Exclusion;
-import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
-
-class PremanagedDependency
-{
- final String premanagedVersion;
-
- final String premanagedScope;
-
- final Boolean premanagedOptional;
-
- /**
- * @since 1.4.0
- */
- final Collection<Exclusion> premanagedExclusions;
-
- /**
- * @since 1.4.0
- */
- final Map<String, String> premanagedProperties;
-
- final int managedBits;
-
- final Dependency managedDependency;
-
- final boolean premanagedState;
-
- @SuppressWarnings( "checkstyle:parameternumber" )
- PremanagedDependency( String premanagedVersion, String premanagedScope,
Boolean premanagedOptional,
- Collection<Exclusion> premanagedExclusions,
Map<String, String> premanagedProperties,
- int managedBits, Dependency managedDependency,
boolean premanagedState )
- {
- this.premanagedVersion = premanagedVersion;
- this.premanagedScope = premanagedScope;
- this.premanagedOptional = premanagedOptional;
- this.premanagedExclusions =
- premanagedExclusions != null
- ? Collections.unmodifiableCollection( new ArrayList<>(
premanagedExclusions ) )
- : null;
-
- this.premanagedProperties =
- premanagedProperties != null
- ? Collections.unmodifiableMap( new HashMap<>(
premanagedProperties ) )
- : null;
-
- this.managedBits = managedBits;
- this.managedDependency = managedDependency;
- this.premanagedState = premanagedState;
- }
-
- static PremanagedDependency create( DependencyManager depManager,
Dependency dependency,
- boolean disableVersionManagement,
boolean premanagedState )
- {
- DependencyManagement depMngt = depManager != null ?
depManager.manageDependency( dependency ) : null;
-
- int managedBits = 0;
- String premanagedVersion = null;
- String premanagedScope = null;
- Boolean premanagedOptional = null;
- Collection<Exclusion> premanagedExclusions = null;
- Map<String, String> premanagedProperties = null;
-
- if ( depMngt != null )
- {
- if ( depMngt.getVersion() != null && !disableVersionManagement )
- {
- Artifact artifact = dependency.getArtifact();
- premanagedVersion = artifact.getVersion();
- dependency = dependency.setArtifact( artifact.setVersion(
depMngt.getVersion() ) );
- managedBits |= DependencyNode.MANAGED_VERSION;
- }
- if ( depMngt.getProperties() != null )
- {
- Artifact artifact = dependency.getArtifact();
- premanagedProperties = artifact.getProperties();
- dependency = dependency.setArtifact( artifact.setProperties(
depMngt.getProperties() ) );
- managedBits |= DependencyNode.MANAGED_PROPERTIES;
- }
- if ( depMngt.getScope() != null )
- {
- premanagedScope = dependency.getScope();
- dependency = dependency.setScope( depMngt.getScope() );
- managedBits |= DependencyNode.MANAGED_SCOPE;
- }
- if ( depMngt.getOptional() != null )
- {
- premanagedOptional = dependency.isOptional();
- dependency = dependency.setOptional( depMngt.getOptional() );
- managedBits |= DependencyNode.MANAGED_OPTIONAL;
- }
- if ( depMngt.getExclusions() != null )
- {
- premanagedExclusions = dependency.getExclusions();
- dependency = dependency.setExclusions( depMngt.getExclusions()
);
- managedBits |= DependencyNode.MANAGED_EXCLUSIONS;
- }
- }
- return new PremanagedDependency( premanagedVersion, premanagedScope,
premanagedOptional,
- premanagedExclusions,
premanagedProperties, managedBits, dependency,
- premanagedState );
-
- }
-
- public void applyTo( DefaultDependencyNode child )
- {
- child.setManagedBits( managedBits );
- if ( premanagedState )
- {
- child.setData(
DependencyManagerUtils.NODE_DATA_PREMANAGED_VERSION, premanagedVersion );
- child.setData( DependencyManagerUtils.NODE_DATA_PREMANAGED_SCOPE,
premanagedScope );
- child.setData(
DependencyManagerUtils.NODE_DATA_PREMANAGED_OPTIONAL, premanagedOptional );
- child.setData(
DependencyManagerUtils.NODE_DATA_PREMANAGED_EXCLUSIONS, premanagedExclusions );
- child.setData(
DependencyManagerUtils.NODE_DATA_PREMANAGED_PROPERTIES, premanagedProperties );
- }
- }
-}
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/Results.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/Results.java
deleted file mode 100644
index 27d6121..0000000
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/Results.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.eclipse.aether.internal.impl.collect;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.collection.CollectResult;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.util.ConfigUtils;
-
-class Results
-{
-
- private final CollectResult result;
-
- private final int maxExceptions;
-
- private final int maxCycles;
-
- String errorPath;
-
- @SuppressWarnings( { "checkstyle:magicnumber" } )
- Results( CollectResult result, RepositorySystemSession session )
- {
- this.result = result;
- maxExceptions = ConfigUtils.getInteger( session, 50,
DefaultDependencyCollector.CONFIG_PROP_MAX_EXCEPTIONS );
- maxCycles = ConfigUtils.getInteger( session, 10,
DefaultDependencyCollector.CONFIG_PROP_MAX_CYCLES );
- }
-
- public void addException( Dependency dependency, Exception e, NodeStack
nodes )
- {
- if ( maxExceptions < 0 || result.getExceptions().size() <
maxExceptions )
- {
- result.addException( e );
- if ( errorPath == null )
- {
- StringBuilder buffer = new StringBuilder( 256 );
- for ( int i = 0; i < nodes.size(); i++ )
- {
- if ( buffer.length() > 0 )
- {
- buffer.append( " -> " );
- }
- Dependency dep = nodes.get( i ).getDependency();
- if ( dep != null )
- {
- buffer.append( dep.getArtifact() );
- }
- }
- if ( buffer.length() > 0 )
- {
- buffer.append( " -> " );
- }
- buffer.append( dependency.getArtifact() );
- errorPath = buffer.toString();
- }
- }
- }
-
- public void addCycle( NodeStack nodes, int cycleEntry, Dependency
dependency )
- {
- if ( maxCycles < 0 || result.getCycles().size() < maxCycles )
- {
- result.addCycle( new DefaultDependencyCycle( nodes, cycleEntry,
dependency ) );
- }
- }
-
-}
\ No newline at end of file
diff --git
a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
index 88ced9f..3232040 100644
---
a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
+++
b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectorTest.java
@@ -68,7 +68,6 @@ import
org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
import org.eclipse.aether.util.graph.manager.DefaultDependencyManager;
import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
-import org.eclipse.aether.util.graph.selector.ScopeDependencySelector;
import org.eclipse.aether.util.graph.version.HighestVersionFilter;
import org.junit.Before;
import org.junit.Test;
@@ -569,44 +568,6 @@ public class DefaultDependencyCollectorTest
assertEquals( 1, result.getRoot().getChildren().size() );
}
- /**
- * Tests that scope based dependency selection happens before dependency
management.
- * <p>
- * This is not really correct (see MRESOLVER-9), but there are a number of
tests
- * in the Maven and Maven Integration Testing projects that currently rely
on this
- * behaviour.
- */
- @Test
- public void testSelectionBeforeManagement()
- throws DependencyCollectionException
- {
- session.setDependencySelector( new ScopeDependencySelector(
"provided", "test" ) );
- session.setDependencyManager( new ClassicDependencyManager() );
-
- Dependency dependency = newDep( "gid3:aid1:ext:1", "compile" );
- CollectRequest request = new CollectRequest( dependency,
Arrays.asList( repository ) );
- CollectResult result = collector.collectDependencies( session, request
);
-
- assertEquals( 0, result.getExceptions().size() );
-
- DependencyNode root = result.getRoot();
- Dependency newDependency = root.getDependency();
-
- assertEquals( dependency, newDependency );
- assertEquals( dependency.getArtifact(), newDependency.getArtifact() );
-
- assertEquals( 1, root.getChildren().size() );
-
- Dependency expect = newDep( "gid3:aid2:ext:1", "compile" );
- DependencyNode childLevel1 = root.getChildren().get( 0 );
- assertEquals( expect, childLevel1.getDependency() );
-
- // With proper dependency management, the test scope of aid3 would
- // be managed to compile, and we would get another child.
- // Currently, the dependency gets filtered by ScopeDependencyManager.
- assertEquals( 0, childLevel1.getChildren().size() );
- }
-
static class TestDependencyManager
implements DependencyManager
{
diff --git
a/maven-resolver-impl/src/test/resources/artifact-descriptions/gid3_aid1_1.ini
b/maven-resolver-impl/src/test/resources/artifact-descriptions/gid3_aid1_1.ini
deleted file mode 100644
index ffc6dbd..0000000
---
a/maven-resolver-impl/src/test/resources/artifact-descriptions/gid3_aid1_1.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[dependencies]
-gid3:aid2:ext:1:compile
-
-[managed-dependencies]
-gid3:aid3:ext:1:compile:!optional
-
-
diff --git
a/maven-resolver-impl/src/test/resources/artifact-descriptions/gid3_aid2_1.ini
b/maven-resolver-impl/src/test/resources/artifact-descriptions/gid3_aid2_1.ini
deleted file mode 100644
index 8d64166..0000000
---
a/maven-resolver-impl/src/test/resources/artifact-descriptions/gid3_aid2_1.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[dependencies]
-gid3:aid3:ext:2:test:optional
diff --git
a/maven-resolver-impl/src/test/resources/artifact-descriptions/gid3_aid3_1.ini
b/maven-resolver-impl/src/test/resources/artifact-descriptions/gid3_aid3_1.ini
deleted file mode 100644
index 4322fc6..0000000
---
a/maven-resolver-impl/src/test/resources/artifact-descriptions/gid3_aid3_1.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[dependencies]
-
diff --git
a/maven-resolver-impl/src/test/resources/artifact-descriptions/gid3_aid3_2.ini
b/maven-resolver-impl/src/test/resources/artifact-descriptions/gid3_aid3_2.ini
deleted file mode 100644
index 4322fc6..0000000
---
a/maven-resolver-impl/src/test/resources/artifact-descriptions/gid3_aid3_2.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[dependencies]
-
diff --git
a/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/FutureResult.java
b/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/FutureResult.java
deleted file mode 100644
index dbbe1df..0000000
---
a/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/FutureResult.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.aether.util.concurrency;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Wraps a result value as a Future.
- *
- * @param <T> result type
- */
-public class FutureResult<T>
- implements Future<T>
-{
- private final T value;
-
- public FutureResult( T value )
- {
- this.value = value;
- }
-
- @Override
- public boolean cancel( boolean mayInterruptIfRunning )
- {
- return false;
- }
-
- @Override
- public boolean isCancelled()
- {
- return false;
- }
-
- @Override
- public boolean isDone()
- {
- return true;
- }
-
- @Override
- public T get()
- {
- return value;
- }
-
- @Override
- public T get( long timeout, TimeUnit unit )
- {
- return value;
- }
-}
