Skip to content

Conversation

@dreis2211
Copy link
Contributor

@dreis2211 dreis2211 commented Mar 5, 2021

Hi,

this is hopefully one of the last steps for the JDK 16 ticket #24402 (apart from the known issues like missing Gradle support). I say hopefully, because the Concourse stuff is impossible to test for me and I need your help with this.

As you probably want this in 2.4.x as well, I based this on the 2.4.x mainline. Hope that's okay.

Let me know what you think.
Cheers,
Christoph

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Mar 5, 2021
./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository
if [[ -d /opt/openjdk-secondary ]]; then
secondary_java_version=$( ./$(dirname $0)/get-secondary-java-version.sh )
./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository -PtoolchainVersion=${secondary_java_version} -Porg.gradle.java.installations.auto-detect=false -Porg.gradle.java.installations.auto-download=false -Porg.gradle.java.installations.paths=/opt/openjdk-secondary/
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm basically disabling auto-downloads and auto-detection here and specify the location for the toolchain to look for installed JDKs.
I hope this works on Concourse the same way as on my local machine.

Copy link
Member

@wilkinsona wilkinsona left a comment

Choose a reason for hiding this comment

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

Thanks very much, @dreis2211. This is looking really good. I've left a few comments but they're quite subjective/stylistic. Please let me know what you think.

pushd git-repo > /dev/null
./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository
if [[ -d /opt/openjdk-secondary ]]; then
secondary_java_version=$( ./$(dirname $0)/get-secondary-java-version.sh )
Copy link
Member

Choose a reason for hiding this comment

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

It'd be nice if we could pass in the toolchain java version rather than figuring it out using the script (clever though it is). I'm not 100% sure that's possible though due to how pipeline.yml is structured. I can experiment a bit when we come to merging this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wasn't sure either and that was the only way I could more or less play through (at least in my head). It would be great if I can leave this to you after I've tackled the other remarks.

wilkinsona pushed a commit that referenced this pull request Mar 5, 2021
wilkinsona added a commit that referenced this pull request Mar 5, 2021
@wilkinsona wilkinsona closed this in ff5a6d9 Mar 5, 2021
@wilkinsona wilkinsona removed the status: waiting-for-triage An issue we've not yet triaged label Mar 5, 2021
@wilkinsona wilkinsona added this to the 2.4.4 milestone Mar 5, 2021
@wilkinsona
Copy link
Member

Thanks again, @dreis2211. I've pushed the changes with a few tweaks and updated the 2.4.x and 2.5.x pipelines. Let's see what Concourse makes of it :).

@dreis2211
Copy link
Contributor Author

@wilkinsona The good news - the pipeline works. The bad news - there seems to be an error that my local tests didn't show. I'll take a look

@wilkinsona
Copy link
Member

Thanks. It's looking pretty good I think. The launch script tests try to use the Gradle plugin which hasn't been built. I think we should just disable them for now when using a Java 16 toolchain.

@dreis2211
Copy link
Contributor Author

Yeah - that was my idea as well because it's only temporary anyhow (until Gradle 7 is out). Already working on a follow-up PR. Unfortunately, I had stuff in my local Gradle caches still and hence they ran locally. Sorry for that.

@wilkinsona wilkinsona mentioned this pull request Mar 8, 2021
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants