-
Notifications
You must be signed in to change notification settings - Fork 359
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
WX-1409 Java 17 #7342
WX-1409 Java 17 #7342
Changes from all commits
7852506
7ec3370
6261dba
5482aad
7a8c5b3
48266e2
e6e1ebd
99f4e75
df1d240
582e830
492fb74
1e18750
67ceab2
090c868
2e83fe9
8c8f97a
7ae9f3f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,9 +23,10 @@ jobs: | |
repository: broadinstitute/cromwell | ||
token: ${{ secrets.BROADBOT_GITHUB_TOKEN }} # Has to be set at checkout AND later when pushing to work | ||
path: cromwell | ||
- uses: olafurpg/setup-scala@v10 | ||
- uses: actions/setup-java@v4 | ||
with: | ||
java-version: adopt@1.11 | ||
Comment on lines
-26
to
-28
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. This action is unmaintained and does not support our Java 17 distribution. |
||
distribution: 'temurin' | ||
java-version: '17' | ||
- name: Clone Cromwhelm | ||
uses: actions/checkout@v2 | ||
with: | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# Enable auto-env through the sdkman_auto_env config | ||
# Add key=value pairs of SDKs to use below | ||
java=11.0.11.hs-adpt | ||
java=17.0.9-tem |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,8 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger | |
* > main thread). | ||
*/ | ||
object DaemonizedDefaultThreadFactory extends ThreadFactory { | ||
private val s = System.getSecurityManager | ||
private val group = if (s != null) s.getThreadGroup else Thread.currentThread.getThreadGroup | ||
Comment on lines
-17
to
-18
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.
|
||
private val group = Thread.currentThread.getThreadGroup | ||
private val threadNumber = new AtomicInteger(1) | ||
private val namePrefix = "daemonpool-thread-" | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -67,7 +67,7 @@ | |
|
||
def isAbsolute: Boolean = UnixPath.isAbsolute(path) | ||
|
||
def isEmpty: Boolean = path.isEmpty | ||
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. This is a name collision new in 17. The initial compile error is that it needs an |
||
def izEmpty: Boolean = path.isEmpty | ||
|
||
def hasTrailingSeparator: Boolean = UnixPath.hasTrailingSeparator(path) | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -689,7 +689,7 @@ This limit may be configured via the configuration value: | |
|
||
```hocon | ||
yaml { | ||
max-depth = 1000 | ||
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. Depth of 1000 causes a stack overflow in 17. I've never even heard of anyone using YAML inputs in real life, and I'm pretty confident 100 will be enough if I'm wrong. |
||
max-depth = 100 | ||
} | ||
``` | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -63,7 +63,7 @@ object Publishing { | |
val additionalDockerInstr: Seq[Instruction] = (dockerCustomSettings ?? Nil).value | ||
|
||
new Dockerfile { | ||
from("us.gcr.io/broad-dsp-gcr-public/base/jre:11-debian") | ||
from("us.gcr.io/broad-dsp-gcr-public/base/jre:17-debian") | ||
expose(8000) | ||
add(artifact, artifactTargetPath) | ||
runRaw(s"ln -s $artifactTargetPath /app/$projectName.jar") | ||
|
@@ -163,8 +163,7 @@ object Publishing { | |
val additionalResolvers = List( | ||
broadArtifactoryResolver, | ||
broadArtifactoryResolverSnap, | ||
Resolver.sonatypeRepo("releases") | ||
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. This was a deprecation |
||
) | ||
) ++ Resolver.sonatypeOssRepos("releases") | ||
|
||
private val artifactoryCredentialsFile = | ||
file("target/ci/resources/artifactory_credentials.properties").getAbsoluteFile | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,8 +7,8 @@ | |
</option> | ||
<option name="tasks" value="renderCiResources" /> | ||
<option name="useSbtShell" value="false" /> | ||
<option name="vmparams" value="-Xms512M -Xmx1024M -Xss1M -XX:+CMSClassUnloadingEnabled" /> | ||
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. This option was dropped in 17 |
||
<option name="vmparams" value="-Xms512M -Xmx1024M -Xss1M" /> | ||
<option name="workingDir" value="$PROJECT_DIR$" /> | ||
<method v="2" /> | ||
</configuration> | ||
</component> | ||
</component> |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
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.
IntelliJ believes that a
description
is required, so I put the comment into one.