Skip to content

Conversation

@rjernst
Copy link
Member

@rjernst rjernst commented May 25, 2017

When transitive dependencies are disable for a dependency, gradle adds a
wildcard exclusion to the generated pom. However, some external tools
like ivy have bugs with wildcards. This commit adds back the explicit
generation of transitive excludes, and removes the gradle generated
exclusions element from the pom.

closes #24490

When transitive dependencies are disable for a dependency, gradle adds a
wildcard exclusion to the generated pom. However, some external tools
like ivy have bugs with wildcards. This commit adds back the explicit
generation of transitive excludes, and removes the gradle generated
exclusions element from the pom.

closes elastic#24490
@uschindler
Copy link
Contributor

Is this basically a revert of the previous commit, also removing the automatically added wildcard exclusion? To me looks fine.

* </ul>
*/
private static Closure fixupDependencies(Project project) {
// TODO: revisit this when upgrading to Gradle 2.14+, see Javadoc comment above
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this was picked up from the revert, but since we're here and require 3.3+, I think we should remove it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, removed.

Copy link
Member

@jasontedor jasontedor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@rjernst
Copy link
Member Author

rjernst commented May 25, 2017

Is this basically a revert of the previous commit, also removing the automatically added wildcard exclusion?

Yes it is exactly that.

@rjernst rjernst merged commit 8dbf8a2 into elastic:master May 25, 2017
@rjernst rjernst added v5.4.1 and removed v5.4.2 labels May 25, 2017
@rjernst rjernst deleted the gradle_no_wildcards branch May 25, 2017 19:22
rjernst added a commit that referenced this pull request May 25, 2017
)

When transitive dependencies are disable for a dependency, gradle adds a
wildcard exclusion to the generated pom. However, some external tools
like ivy have bugs with wildcards. This commit adds back the explicit
generation of transitive excludes, and removes the gradle generated
exclusions element from the pom.

closes #24490
rjernst added a commit that referenced this pull request May 25, 2017
)

When transitive dependencies are disable for a dependency, gradle adds a
wildcard exclusion to the generated pom. However, some external tools
like ivy have bugs with wildcards. This commit adds back the explicit
generation of transitive excludes, and removes the gradle generated
exclusions element from the pom.

closes #24490
jasontedor added a commit to mashudong/elasticsearch that referenced this pull request May 28, 2017
* master: (38 commits)
  Fix Lucene version expectation
  Verify Lucene version constants
  Avoid double decrement on current query counter
  Remove the need for _UNRELEASED suffix in versions (elastic#24798)
  Adjust available and free bytes to be non-negative on huge FSes
  Begin replacing static index tests with full restart tests (elastic#24846)
  Fix plugin docs for using custom config dir
  Update context-suggest.asciidoc
  Move BWC version to 5.5 after backport
  Support Multiple Collapse Inner Hits
  Scripting: Rename CompiledType to FactoryType in ScriptContext (elastic#24897)
  Scripting: Make contexts available to ScriptEngine construction (elastic#24896)
  Mute index and relocate concurrently
  Build: Add back explicit exclusions and remove gradle exclusions (elastic#24879)
  Scripting: Move context definitions to instance type classes (elastic#24883)
  Build: Fix hadoop integ test error on windows (elastic#24885)
  Put mapping and index template requests do not need content type detection for 5.3.0+ (elastic#24835)
  Add the ability to store objects with a ScrollContext (elastic#24777)
  add docs example for Ingest scripts manipulating document metadata (elastic#24875)
  Fix error message if an incompatible node connects (elastic#24884)
  ...
@mark-vieira mark-vieira added the Team:Delivery Meta label for Delivery team label Nov 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team v5.4.1 v5.5.0 v6.0.0-alpha2

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Resolving of Elasticsearch Transport Client with Apache Ivy/Ant fails (since 5.4.0)

5 participants