Simplify build plugin license handling #77009
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
breskeby
commented
Aug 30, 2021
•
breskeby
commented
- Use file property and conventions to avoid afterEvaluate hook
- Simplify root build script
- One little step closer to configuration cache compliance
breskeby
added
:Delivery/Build
breskeby
force-pushed
the
simplify-license-handling
branch
from
9a0b98b to
2cb0e0a
Compare
breskeby
force-pushed
the
simplify-license-handling
branch
2 times, most recently
from
5a0e54a to
91b634f
Compare
breskeby
force-pushed
the
simplify-license-handling
branch
from
a574901 to
d2d35d3
Compare
|
Pinging @elastic/es-delivery (Team:Delivery) |
pugnascotia
reviewed
Oct 5, 2021
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.nio.file.StandardCopyOption; |
There was a problem hiding this comment.
I don't understand why have lots of new import but no other code changes in this file?
pugnascotia
reviewed
Oct 5, 2021
| @@ -176,6 +177,9 @@ protected void assertNoDeprecationWarning(BuildResult result) { | |||
|
|
|||
| protected void assertBuildFileExists(BuildResult result, String projectName, String path) { | |||
| Path absPath = getBuildDir(projectName).toPath().resolve(path); | |||
| for (File file : absPath.getParent().toFile().listFiles()) { | |||
| System.out.println("file = " + file); | |||
There was a problem hiding this comment.
Is this some leftover debugging code?
There was a problem hiding this comment.
good catch. removed.
mark-vieira
approved these changes
Oct 6, 2021
| @@ -20,8 +19,8 @@ | |||
| import java.util.concurrent.Callable; | |||
|
|
|||
| public class LicensingPlugin implements Plugin<Project> { | |||
| final static String ELASTIC_LICENSE_URL_PREFIX = "https://raw.githubusercontent.com/elastic/elasticsearch/"; | |||
| final static String ELASTIC_LICENSE_URL_POSTFIX = "/licenses/ELASTIC-LICENSE-2.0.txt"; | |||
| static final String ELASTIC_LICENSE_URL_PREFIX = "https://raw.githubusercontent.com/elastic/elasticsearch/"; | |||
There was a problem hiding this comment.
Bless you. There's nothing worse that unconventionally ordered field modifiers. It's like nails on a chalkboard. 😄
...conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/LicensingPlugin.java
Show resolved
Hide resolved
...conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/LicensingPlugin.java
Show resolved
Hide resolved
...internal/src/integTest/groovy/org/elasticsearch/gradle/internal/PublishPluginFuncTest.groovy
Show resolved
Hide resolved
- Use file property and conventions to avoid afterEvaluate hook - Simplify root build script
- elasticsearch base plugin is supposed to only configure defaults for _EVERY_ es subproject - simplifies root build script - ensures each subproject has a potential license attached - configures project default coordinates
breskeby
force-pushed
the
simplify-license-handling
branch
from
4761af6 to
60be146
Compare
💔 Backport failed
You can use sqren/backport to manually backport by running |
breskeby
added a commit
to breskeby/elasticsearch
that referenced
this pull request
Oct 7, 2021
- Use file property and conventions to avoid afterEvaluate hook - Simplify root build script - One little step closer to configuration cache compliance
breskeby
added a commit
that referenced
this pull request
Oct 7, 2021
wjp719
added a commit
to wjp719/elasticsearch
that referenced
this pull request
Oct 7, 2021
…' into feature/data_stream_support_routing * wjp/feature/data_stream_support_routing: (44 commits) Revert "Adjust /_cat/templates not to request all metadata (elastic#78812)" Allow indices lookup to be built lazily (elastic#78745) [DOCS] Document default security in alpha2 (elastic#78227) Add cluster applier stats (elastic#77552) Fix failing URLDecodeProcessorTests::testProcessor test (elastic#78690) Upgrade to lucene snapshot ba75dc5e6bf (elastic#78817) Adjust /_cat/templates not to request all metadata (elastic#78812) Simplify build plugin license handling (elastic#77009) Fix SearchableSnapshotsBlobStoreCacheIntegTests.testBlobStoreCache (elastic#78616) Improve Docker image caching and testing (elastic#78552) Load knn vectors format with mmapfs (elastic#78724) Fix date math zone test to use negative minutes (elastic#78796) Changing name of shards field in node/stats api to shard_stats (elastic#78531) [DOCS] Fix system index refs in restore tutorial (elastic#78582) Add previously removed settings back for 8.0 (elastic#78784) TSDB: Fix template name in test Add a system property to forcibly format everything (elastic#78768) Revert "Adding config so that some tests will break if over-the-wire encryption fails (elastic#78409)" (elastic#78787) Must date math test failure Adding config so that some tests will break if over-the-wire encryption fails (elastic#78409) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.