Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Revert "Revert "Merge branch 'release'""

This reverts commit 67b8bb8f18f854f45a2f5ec52cc9c8a25981e2f2.

This restores the merge attempt from earlier.

    • -16
    • +22
    ./DefaultCapabilitiesResolution.java
  1. … 66 more files in changeset.
Revert "Merge branch 'release'"

This reverts commit c7fdc455dcb9a8016af0ae9bc8b4c43fde1e2d06, reversing

changes made to 9f70d52b74dbc8c71381781b6c155474031b3cf8.

The changes need a wrapper as there are API changes. Reverting for now.

    • -22
    • +16
    ./DefaultCapabilitiesResolution.java
  1. … 66 more files in changeset.
Support variant selection in capability conflict resolution (#10973)

A conflict can also occur between two variants of the same component.

This gives access to the variant name in the selection rule and

evicts nodes that represent the not-selected variant.

    • -16
    • +22
    ./DefaultCapabilitiesResolution.java
  1. … 13 more files in changeset.
Support variant selection in capability conflict resolution

A conflict can also occur between two variants of the same component.

This gives access to the variant name in the selection rule and

evicts nodes that represent the not-selected variant.

    • -16
    • +22
    ./DefaultCapabilitiesResolution.java
  1. … 13 more files in changeset.
Support variant selection in capability conflict resolution

A conflict can also occur between two variants of the same component.

This gives access to the variant name in the selection rule and

evicts nodes that represent the not-selected variant.

    • -16
    • +22
    ./DefaultCapabilitiesResolution.java
  1. … 12 more files in changeset.
Add `failOnNonReproducibleResolution`

This method is a short-hand notation to disable both use

of dynamic and changing versions.

  1. … 8 more files in changeset.
Add `failOnNonReproducibleResolution`

This method is a short-hand notation to disable both use

of dynamic and changing versions.

  1. … 8 more files in changeset.
Add support for failing on changing versions

This commit adds the `failOnChangingVersions()` method on

the resolution strategy, which will make the build fail as

soon as a changing version is detected.

This is useful to prevent, for example, snapshots from

appearing in a dependency graph.

  1. … 5 more files in changeset.
Add support for failing on changing versions

This commit adds the `failOnChangingVersions()` method on

the resolution strategy, which will make the build fail as

soon as a changing version is detected.

This is useful to prevent, for example, snapshots from

appearing in a dependency graph.

  1. … 5 more files in changeset.
Introduce `failOnDynamicVersion`

This commit introduces a new dependency graph validation mode,

which will make sure that if dynamic versions are found in the

graph, then either they are superceded by another version (they

don't participate in selection) or the build should fail.

This means that, for example, if a version selector uses a

version range `[1.0, 2.0[`, the build will fail because in a

subsequent build the resolution may change.

However, if there are two selectors participating, say

`[1.0, 2.0[` and `1.5`, then we choose `1.5` because this version

is within the range. Even if newer versions are released, we

would _not_ change the resolution result.

  1. … 8 more files in changeset.
Introduce `failOnDynamicVersion`

This commit introduces a new dependency graph validation mode,

which will make sure that if dynamic versions are found in the

graph, then either they are superceded by another version (they

don't participate in selection) or the build should fail.

This means that, for example, if a version selector uses a

version range `[1.0, 2.0[`, the build will fail because in a

subsequent build the resolution may change.

However, if there are two selectors participating, say

`[1.0, 2.0[` and `1.5`, then we choose `1.5` because this version

is within the range. Even if newer versions are released, we

would _not_ change the resolution result.

  1. … 8 more files in changeset.
Add support for deactivateDependencyLocking to disable locking on configurations

Signed-off-by: Roberto Perez Alcolea <rperezalcolea@netflix.com>

  1. … 12 more files in changeset.
Remove parameter support in ComponentSelectionRules

Previous parameters are available on `ComponentSelection` instead.

    • -41
    • +0
    ./ComponentSelectionRulesActionValidator.java
    • -19
    • +13
    ./DefaultComponentSelectionRules.java
  1. … 9 more files in changeset.
Remove parameter support in ComponentSelectionRules

Previous parameters are available on `ComponentSelection` instead.

    • -41
    • +0
    ./ComponentSelectionRulesActionValidator.java
    • -19
    • +13
    ./DefaultComponentSelectionRules.java
  1. … 9 more files in changeset.
Remove parameter support in ComponentSelectionRules

Previous parameters are available on `ComponentSelection` instead.

    • -41
    • +0
    ./ComponentSelectionRulesActionValidator.java
    • -19
    • +13
    ./DefaultComponentSelectionRules.java
  1. … 7 more files in changeset.
Remove parameter support in ComponentSelectionRules

Previous parameters are available on `ComponentSelection` instead.

    • -41
    • +0
    ./ComponentSelectionRulesActionValidator.java
    • -19
    • +13
    ./DefaultComponentSelectionRules.java
  1. … 7 more files in changeset.
Remove parameter support in ComponentSelectionRules

Previous parameters are available on `ComponentSelection` instead.

    • -41
    • +0
    ./ComponentSelectionRulesActionValidator.java
    • -19
    • +13
    ./DefaultComponentSelectionRules.java
  1. … 10 more files in changeset.
Remove parameter support in ComponentSelectionRules

Previous parameters are available on `ComponentSelection` instead.

    • -41
    • +0
    ./ComponentSelectionRulesActionValidator.java
    • -19
    • +13
    ./DefaultComponentSelectionRules.java
  1. … 10 more files in changeset.
Remove parameter support in ComponentSelectionRules

Previous parameters are available on `ComponentSelection` instead.

    • -41
    • +0
    ./ComponentSelectionRulesActionValidator.java
    • -19
    • +13
    ./DefaultComponentSelectionRules.java
  1. … 7 more files in changeset.
Merge remote-tracking branch 'origin/master' into lorinc/use-diamond

  1. … 5 more files in changeset.
Split method for readability and fix indent

    • -21
    • +33
    ./DefaultCapabilitiesResolution.java
  1. … 1 more file in changeset.
Apply `Anonymous type can be replaced with lambda` inspection the whole project

  1. … 666 more files in changeset.
Apply `Explicit type can be replaced with <>` inspection the whole project

  1. … 906 more files in changeset.
Add customizable capability conflict resolution

This commit disables the automatic capability conflict

resolution based on the highest version of a capability

and replaces it with a customizable resolution strategy.

This allows better control on how capability conflicts

are handled: before this change, capabilities could be

automatically upgraded just because they had a higher

version, which is not always acceptable.

The new API gives finer control by providing a DSL on

the resolution strategy which allows:

- explicitly setting "highest wins" strategy for a given

capability

- or choosing explicitly between a list of modules in conflict

for a given capability

It is possible to use a generic _all_ call to configure the

strategy independently of the capability.

Closes #9888

    • -0
    • +23
    ./CapabilitiesResolutionInternal.java
    • -0
    • +212
    ./DefaultCapabilitiesResolution.java
  1. … 17 more files in changeset.
Add customizable capability conflict resolution

This commit disables the automatic capability conflict

resolution based on the highest version of a capability

and replaces it with a customizable resolution strategy.

This allows better control on how capability conflicts

are handled: before this change, capabilities could be

automatically upgraded just because they had a higher

version, which is not always acceptable.

The new API gives finer control by providing a DSL on

the resolution strategy which allows:

- explicitly setting "highest wins" strategy for a given

capability

- or choosing explicitly between a list of modules in conflict

for a given capability

It is possible to use a generic _all_ call to configure the

strategy independently of the capability.

Closes #9888

    • -0
    • +23
    ./CapabilitiesResolutionInternal.java
    • -0
    • +212
    ./DefaultCapabilitiesResolution.java
  1. … 17 more files in changeset.
Add customizable capability conflict resolution

This commit disables the automatic capability conflict

resolution based on the highest version of a capability

and replaces it with a customizable resolution strategy.

This allows better control on how capability conflicts

are handled: before this change, capabilities could be

automatically upgraded just because they had a higher

version, which is not always acceptable.

The new API gives finer control by providing a DSL on

the resolution strategy which allows:

- explicitly setting "highest wins" strategy for a given

capability

- or choosing explicitly between a list of modules in conflict

for a given capability

It is possible to use a generic _all_ call to configure the

strategy independently of the capability.

Closes #9888

    • -0
    • +23
    ./CapabilitiesResolutionInternal.java
    • -0
    • +212
    ./DefaultCapabilitiesResolution.java
  1. … 17 more files in changeset.
Use method reference, where applicable

  1. … 169 more files in changeset.
Use method reference, where applicable

  1. … 167 more files in changeset.
Replace anonymous classes with lambdas

  1. … 711 more files in changeset.
Replace anonymous classes with lambdas

  1. … 695 more files in changeset.