Clone Tools
  • last updated a few seconds ago
Constraints: committers
Constraints: files
Constraints: dates
Rework exclude rule merging

As a follow-up to #9197, this commit properly fixes the

exclude rule merging algorithm, by completely rewriting

it. The new merging algorithm works by implementing the

minimal set of algebra operations that make sense to

minimize computation durations. In order to do this,

this commit introduces a number of exclude specs

(found in their own package) and factories to create

actual implementation of those specs.

Specs represent the different kind of excludes we can


- excluding a group

- excluding a module (no group defined)

- excluding a group+module

- excluding an artifact of a group+module

- pattern-matching excludes

- unions of excludes

- intersections of excludes

With all those minimal bricks, factories are responsible

of generating consistent specs. The dumbest factory

will just generate new instances for everything. This

is the default factory.

Minimally, this factory has to be backed by an optimizing

factory, which will take care of handling special cases:

- union or intersection of a single spec

- union or intersection of 2 specs

- when one of them is null

- when both are equal

Then we have a factory which performs the minimal algebra

to minimize specs:

- unions of unions

- intersections of intersections

- union of a union and individual specs

- insection of an intersection and individual spec

- ...

This factory can be as smart as it can, but one must be

careful that it's worth it: some previously implemented

optimizations (like (A+B).A = A turned out to be costly

to detect, and didn't make it the final cut.

Yet another factory is there to reduce the memory footprint

and, as a side effect, make things faster by interning

the specs: equivalent specs are interned and indexed, which

allows us to optimize unions and intersections of specs.

Last but not least, a caching factory is there to avoid

recomputing the same intersections and unions of specs

when we have already done the job. This is efficient if

the underlying (delegate) specs are easily compared,

which is the case thanks to the interning factory.

All in all, the delegation chain allows us to make

the algorithm fast and hopefully reliable, while

making it easier to debug.

  1. … 90 more files in changeset.
Make `JvmPackageName` stateless, since it was only used for validation

    • -36
    • +4
  1. … 3 more files in changeset.
Make `JvmPackageName` stateless, since it was only used for validation

    • -36
    • +4
  1. … 3 more files in changeset.
Move all infrastructure to the new exclude merging package

The old package is still here and will be removed in a subsequent commit.

  1. … 18 more files in changeset.
Extend `JvmPackageNameTest` with package names that include `$` and `_`

    • -2
    • +2
Clean up some test constraints

  1. … 2 more files in changeset.
Clean up some test constraints

  1. … 2 more files in changeset.
Fix some more Java6 target compatibility instances

Fix some more Java6 target compatibility instances

Rename several classes to fix spelling

Signed-off-by: Bo Zhang <>

    • -0
    • +26
    • -0
    • +26
    • -0
    • +24
    • -24
    • +0
  1. … 2 more files in changeset.
spelling: resolver

Signed-off-by: Josh Soref <>

spelling: parameterized

Signed-off-by: Josh Soref <>

  1. … 11 more files in changeset.
spelling: nonexistent

Signed-off-by: Josh Soref <>

  1. … 11 more files in changeset.
Delete test for broken behavior that started to work on JDK 11

Provide an explicit `acceptor` and `rejector` to API for choosing dependency version

This will permit a single `ResolvedVersionConstraint` to have both a `prefer`

and a `require` version.

  1. … 14 more files in changeset.
Add type-safe overload for Manifest.from(mergePath, configurationAction)

Signed-off-by: Paul Merlin <>

  1. … 4 more files in changeset.
Separate `ITaskFactory` from `NamedEntityInstantiator<Task>` so that the instantiator is applied as a decoration over the factory.

  1. … 37 more files in changeset.
Remove deprecated Class.newInstance() (#6496)

`Class.newInstance()` was deprecated in Java 9.

  1. … 32 more files in changeset.
Update to ASM7 mode for Java 11 compatibility

  1. … 16 more files in changeset.
Honor dependency attributes when they override configuration attributes

This commit fixes artifact selection so that when we resolve artifacts, we also use

the attributes defined on the dependency itself, if ever. Before, when we were resolving

artifacts, only the consumer configuration attributes were used.

  1. … 23 more files in changeset.
Provide ResolvedVersionConstraint when resolving component id

The 'resolved' version constraint is critical to resolving the component id

for a given selector. In order to honour all constraints in the resolution

process, this `ResolvedVersionConstraint` will be composed of more than

just the constraints for a single selector.

With this change, the `ResolvedVersionConstraint` is constructed

prior to resolving the id, rather than being constructed as part of that


  1. … 14 more files in changeset.
Rename id accessors for consistency

Use `ComponentIdentifier getId()`

Use `ModuleVersionIdentifier getModuleVersionId()`

  1. … 67 more files in changeset.
Polish: metaData -> metadata

  1. … 13 more files in changeset.
Remove unit test uses of DependencyMetadata.requested

  1. … 14 more files in changeset.
Removed unused `ModuleId` param from `DependencyToComponentIdResolver.resolve()`

  1. … 14 more files in changeset.
Avoid computing `ModuleIdentifier` multiple times for the same module

This commit pre-computes a `ModuleIdentifier` from a dependency and passes it around several places where it

is used. This saves a bunch of lookups in the module identifier cache, which tend to be pretty expensive.

Dependency substitution is also passed the original module identifier, in case no substitution is done. This

prevents an additional lookup.

  1. … 23 more files in changeset.
Remove usage of Task.execute from tests

  1. … 29 more files in changeset.
Update to ASM6 alpha

This commit bumps the ASM library used in Gradle from 5.1 to 6.0_ALPHA. While being an alpha version, this ASM version is the only

one compatible with the Java 9 class format. This allows us to remove the `Java9ClassReader`, and also makes it possible to re-enable

some tests which were failing due to mocking bugs under JDK 9.

  1. … 25 more files in changeset.
Create a `ResolvedArtifact` wrapper for each external artifact once per build invocation, rather than once per dependency graph per build invocation.

  1. … 15 more files in changeset.
Moved some in-heap caching of `ResolvedArtifact` from cache per dependency graph to cache per build invocation. In this change the caching is applied only to local artifacts. With this change, only a single `ResolvedArtifact` wrapper is created and retained per build invocation for each project artifact, instead of creating and retaining a wrapper per artifact per resolved dependency graph.

  1. … 9 more files in changeset.