-
Notifications
You must be signed in to change notification settings - Fork 73
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
Include JDKs in Dists #1510
Merged
Merged
Include JDKs in Dists #1510
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
547373d
Starting code to include jdks
CRogers 2fe8216
Test that jdk inclusion works
CRogers c77fc6c
Correct location for jdk
CRogers 99d5cca
Maven central
CRogers 01d938d
startup log
CRogers 31ea4c0
Correct env vars
CRogers 1902a5d
Add generated changelog entries
svc-changelog 7fe3a3a
Remove silly remote only test
CRogers a516537
Merge branch 'callumr/include-jdk' of github.com:palantir/sls-packagi…
CRogers 1727248
Ensure we are lazy enough
CRogers d182d6a
Improved test
CRogers 4a6a5b7
format
CRogers ca1f298
comment
CRogers a7b6481
less provider wrapping
CRogers e2329a3
don't allow users to clear the java home env vars
CRogers e82137d
let's try to keep a consistent order
CRogers 1a256d9
LinkedHashMap to maintain order - tricksy ordering issues
CRogers 0a34581
Bump up minimum gradle version.
CRogers ae709cd
Bump GCV
CRogers 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
type: feature | ||
feature: | ||
description: Add `jdks` property to `distribution` extension to help include JDKs | ||
into dists. | ||
links: | ||
- https://github.com/palantir/sls-packaging/pull/1510 |
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
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
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 |
---|---|---|
|
@@ -179,7 +179,6 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec { | |
} | ||
|
||
repositories { | ||
jcenter() | ||
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. Deprecation warning with new higher version of gradle |
||
mavenCentral() | ||
} | ||
|
||
|
@@ -219,7 +218,6 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec { | |
} | ||
|
||
repositories { | ||
jcenter() | ||
mavenCentral() | ||
} | ||
|
||
|
@@ -599,7 +597,6 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec { | |
} | ||
|
||
repositories { | ||
jcenter() | ||
mavenCentral() | ||
} | ||
distribution { | ||
|
@@ -633,7 +630,6 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec { | |
} | ||
|
||
repositories { | ||
jcenter() | ||
mavenCentral() | ||
} | ||
version '0.0.1' | ||
|
@@ -678,7 +674,6 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec { | |
} | ||
|
||
repositories { | ||
jcenter() | ||
mavenCentral() | ||
} | ||
version '0.0.1' | ||
|
@@ -797,7 +792,6 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec { | |
args "hello" | ||
} | ||
repositories { | ||
jcenter() | ||
mavenCentral() | ||
} | ||
dependencies { | ||
|
@@ -813,7 +807,6 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec { | |
id 'java-library' | ||
} | ||
repositories { | ||
jcenter() | ||
mavenCentral() | ||
} | ||
dependencies { | ||
|
@@ -932,7 +925,6 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec { | |
enableManifestClasspath true | ||
} | ||
repositories { | ||
jcenter() | ||
mavenCentral() | ||
} | ||
dependencies { | ||
|
@@ -948,7 +940,6 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec { | |
id 'java-library' | ||
} | ||
repositories { | ||
jcenter() | ||
mavenCentral() | ||
} | ||
dependencies { | ||
|
@@ -1031,7 +1022,6 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec { | |
} | ||
|
||
repositories { | ||
jcenter() | ||
mavenCentral() | ||
} | ||
|
||
|
@@ -1066,7 +1056,6 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec { | |
} | ||
|
||
repositories { | ||
jcenter() | ||
mavenCentral() | ||
} | ||
|
||
|
@@ -1101,7 +1090,6 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec { | |
} | ||
|
||
repositories { | ||
jcenter() | ||
mavenCentral() | ||
} | ||
|
||
|
@@ -1385,7 +1373,6 @@ class JavaServiceDistributionPluginTests extends GradleIntegrationSpec { | |
project.group = 'service-group' | ||
|
||
repositories { | ||
jcenter() | ||
mavenCentral() | ||
} | ||
|
||
|
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.
Provider#zip
is introduced in 6.6. However, it seems that gradle introduced plugin bytecode rewriting sometime between 6.1 and 6.6. This means 6.6 now falls over on the jackson 2.15.2 dep from baseline, so we need to go all the way to 7.6There 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.
don't we need 7.6.2?
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.
7.6 for Java 19: https://docs.gradle.org/current/userguide/compatibility.html
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.
https://docs.gradle.org/7.6.2/release-notes.html and gradle/gradle#24390
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.
happy to merge if 7.6 doesn't break and have a lower min version
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.
Huh, I wonder why it works...