Skip to content
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

Merged
merged 17 commits into from
Dec 14, 2023
3 changes: 1 addition & 2 deletions .github/set_up_cromwell_action/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,4 @@ runs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11

java-version: 17
5 changes: 3 additions & 2 deletions .github/workflows/chart_update_on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: [email protected]
Comment on lines -26 to -28
Copy link
Collaborator Author

Choose a reason for hiding this comment

The 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:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/docker_build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ jobs:
repository: broadinstitute/cromwell
token: ${{ secrets.BROADBOT_GITHUB_TOKEN }}
path: cromwell
- uses: olafurpg/setup-scala@v10
- uses: actions/setup-java@v4
with:
java-version: [email protected]
distribution: 'temurin'
java-version: '17'
# The following invocation should be as similar as possible to the one in chart_update_on_merge.yml
# To state the obvious: This test should not publish anything. It should simply verify that the build completes.
- name: Build Cromwell Docker
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ jobs:
- uses: actions/checkout@v2

# fetch SBT package
- uses: olafurpg/setup-scala@v10
- uses: actions/setup-java@v4
with:
java-version: [email protected]
distribution: 'temurin'
java-version: '17'

# set up SBT cache
- uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .sdkmanrc
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
Expand Up @@ -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
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

SecurityManager is deprecated in 17. I honestly don't know what its role is here, but it certainly seems like the logic is just fine with the possibility of it being null.

private val group = Thread.currentThread.getThreadGroup
private val threadNumber = new AtomicInteger(1)
private val namePrefix = "daemonpool-thread-"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
): WatchKey = throw new UnsupportedOperationException

override def iterator(): java.util.Iterator[Path] =
if (unixPath.isEmpty || unixPath.isRoot) {
if (unixPath.izEmpty || unixPath.isRoot) {

Check warning on line 179 in cloud-nio/cloud-nio-spi/src/main/scala/cloud/nio/spi/CloudNioPath.scala

View check run for this annotation

Codecov / codecov/patch

cloud-nio/cloud-nio-spi/src/main/scala/cloud/nio/spi/CloudNioPath.scala#L179

Added line #L179 was not covered by tests
java.util.Collections.emptyIterator()
} else {
unixPath.split().to(LazyList).map(part => newPath(UnixPath.getPath(part)).asInstanceOf[Path]).iterator.asJava
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

def isAbsolute: Boolean = UnixPath.isAbsolute(path)

def isEmpty: Boolean = path.isEmpty
Copy link
Collaborator Author

Choose a reason for hiding this comment

The 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 override. Adding the override results in a second error saying it overrides nothing!

def izEmpty: Boolean = path.isEmpty

Check warning on line 70 in cloud-nio/cloud-nio-spi/src/main/scala/cloud/nio/spi/UnixPath.scala

View check run for this annotation

Codecov / codecov/patch

cloud-nio/cloud-nio-spi/src/main/scala/cloud/nio/spi/UnixPath.scala#L70

Added line #L70 was not covered by tests

def hasTrailingSeparator: Boolean = UnixPath.hasTrailingSeparator(path)

Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/FiveMinuteIntro.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* A Java 11 runtime environment
* You can see what you have by running `$ java -version` on a terminal.
* If not, consider installing via conda or brew [as explained here](../Releases.md).
* We recommend [SDKMAN](https://sdkman.io/install) to install the latest 11 build of [Temurin](https://adoptium.net/temurin/releases/?version=11)
* We recommend [SDKMAN](https://sdkman.io/install) to install the latest 17 build of [Temurin](https://adoptium.net/temurin/releases/?version=17)
* `sdk install java 11.0.16-tem` as of the time of this writing
* You might need to update the `export JAVA_HOME` in your bash profile to point to your JAVA install location.
* A sense of adventure!
Expand Down
3 changes: 1 addition & 2 deletions project/Publishing.scala
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,7 @@ object Publishing {
val additionalResolvers = List(
broadArtifactoryResolver,
broadArtifactoryResolverSnap,
Resolver.sonatypeRepo("releases")
Copy link
Collaborator Author

Choose a reason for hiding this comment

The 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
Expand Down
2 changes: 1 addition & 1 deletion publish/docker-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ mkdir -p /etc/apt/keyrings
wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc
echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
apt update
apt install -y temurin-11-jdk
apt install -y temurin-17-jdk

# Install jq 1.6 to ensure --rawfile is supported
curl -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 -o /usr/bin/jq
Expand Down
Loading