-
Notifications
You must be signed in to change notification settings - Fork 24.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix extractjar task ci #33272
Merged
Merged
Fix extractjar task ci #33272
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
220a023
Separate build plugin test
alpar-t bb63f10
Remove tasks to check license and notice
alpar-t 2bea318
PR review, re-add remove method
alpar-t 1088f53
Merge branch 'master' into fix-extractjar-ci-33201
alpar-t 61895b5
Merge remote-tracking branch 'origin/master' into fix-extractjar-ci-3…
alpar-t File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
76 changes: 76 additions & 0 deletions
76
buildSrc/src/test/java/org/elasticsearch/gradle/BuildPluginIT.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch 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. | ||
*/ | ||
package org.elasticsearch.gradle; | ||
|
||
import org.apache.commons.io.IOUtils; | ||
import org.elasticsearch.gradle.test.GradleIntegrationTestCase; | ||
import org.gradle.testkit.runner.BuildResult; | ||
|
||
import java.io.File; | ||
import java.io.IOException; | ||
import java.io.InputStream; | ||
import java.nio.charset.StandardCharsets; | ||
import java.util.zip.ZipEntry; | ||
import java.util.zip.ZipFile; | ||
|
||
public class BuildPluginIT extends GradleIntegrationTestCase { | ||
|
||
public void testPluginCanBeApplied() { | ||
BuildResult result = getGradleRunner("elasticsearch.build") | ||
.withArguments("hello", "-s") | ||
.build(); | ||
assertTaskSuccessful(result, ":hello"); | ||
assertOutputContains("build plugin can be applied"); | ||
} | ||
|
||
public void testCheckTask() { | ||
BuildResult result = getGradleRunner("elasticsearch.build") | ||
.withArguments("check", "assemble", "-s", "-Dlocal.repo.path=" + getLocalTestRepoPath()) | ||
.build(); | ||
assertTaskSuccessful(result, ":check"); | ||
} | ||
|
||
public void testLicenseAndNotice() throws IOException { | ||
BuildResult result = getGradleRunner("elasticsearch.build") | ||
.withArguments("clean", "assemble", "-s", "-Dlocal.repo.path=" + getLocalTestRepoPath()) | ||
.build(); | ||
|
||
assertTaskSuccessful(result, ":assemble"); | ||
|
||
assertBuildFileExists(result, "elasticsearch.build", "distributions/elasticsearch.build.jar"); | ||
|
||
try (ZipFile zipFile = new ZipFile(new File( | ||
getBuildDir("elasticsearch.build"), "distributions/elasticsearch.build.jar" | ||
))) { | ||
ZipEntry licenseEntry = zipFile.getEntry("META-INF/LICENSE.txt"); | ||
ZipEntry noticeEntry = zipFile.getEntry("META-INF/NOTICE.txt"); | ||
assertNotNull("Jar does not have META-INF/LICENSE.txt", licenseEntry); | ||
assertNotNull("Jar does not have META-INF/NOTICE", noticeEntry); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. NOTICE -> NOTICE.txt |
||
try ( | ||
InputStream licese = zipFile.getInputStream(licenseEntry); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. typo: licese -> license |
||
InputStream notice = zipFile.getInputStream(noticeEntry) | ||
) { | ||
assertEquals("this is a test license file", IOUtils.toString(licese, StandardCharsets.UTF_8.name())); | ||
assertEquals("this is a test notice file", IOUtils.toString(notice, StandardCharsets.UTF_8.name())); | ||
} | ||
} | ||
} | ||
|
||
|
||
} |
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
this is a test license file |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
this is a test notice file |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
plugins { | ||
id 'java' | ||
id 'elasticsearch.build' | ||
} | ||
|
||
ext.licenseFile = file("LICENSE") | ||
ext.noticeFile = file("NOTICE") | ||
|
||
dependencies { | ||
compile "junit:junit:${versions.junit}" | ||
// missing classes in thirdparty audit | ||
compile 'org.hamcrest:hamcrest-core:1.3' | ||
} | ||
|
||
repositories { | ||
mavenCentral() | ||
repositories { | ||
maven { | ||
url System.getProperty("local.repo.path") | ||
} | ||
} | ||
} | ||
|
||
// todo remove offending rules | ||
forbiddenApisMain.enabled = false | ||
forbiddenApisTest.enabled = false | ||
// requires dependency on testing fw | ||
jarHell.enabled = false | ||
// we don't have tests for now | ||
test.enabled = false | ||
|
||
task hello { | ||
doFirst { | ||
println "build plugin can be applied" | ||
} | ||
} |
1 change: 1 addition & 0 deletions
1
buildSrc/src/testKit/elasticsearch.build/licenses/hamcrest-core-1.3.jar.sha1
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
42a25dc3219429f0e5d060061f71acb49bf010a0 |
Empty file.
Empty file.
1 change: 1 addition & 0 deletions
1
buildSrc/src/testKit/elasticsearch.build/licenses/junit-4.12.jar.sha1
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
2973d150c0dc1fefe998f834810d68f278ea58ec |
Empty file.
Empty file.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please revert converting to wildcard imports...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Groovy has a different setting for this, I was under the impression that I already had it configured,
but looks like it was the case only for java.