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

Updates to latest docker images, aligning maven version #125

Merged
merged 1 commit into from
Aug 3, 2024

Conversation

codefromthecrypt
Copy link
Member

@codefromthecrypt codefromthecrypt commented Aug 3, 2024

This uses latest java images, and aligns with the following tools provided by them:

  • maven:3.9.8
  • maven-help-plugin:3.4.1
  • maven-dependency-plugin:3.7.1

To align, we run "mvn wrapper:wrapper -Dtype=bin" to update maven and manually change any pom or script references to share the above plugin versions.

Besides text replacement for current java versions, this also had to switch docker-compose to docker compose as the former is no longer in the base image.

This intentionally doesn't touch anything else, or maven plugins that aren't cached in the java image.

Signed-off-by: Adrian Cole <adrian.cole@elastic.co>
@codefromthecrypt codefromthecrypt marked this pull request as ready for review August 3, 2024 07:44
Copy link
Member Author

@codefromthecrypt codefromthecrypt left a comment

Choose a reason for hiding this comment

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

notes

@@ -58,7 +58,7 @@ fi

if ! test -f ${artifact_id}.jar && [ ${is_release} = "true" ]; then
mvn_get="mvn -q --batch-mode -Denforcer.fail=false \
org.apache.maven.plugins:maven-dependency-plugin:3.6.1:get \
org.apache.maven.plugins:maven-dependency-plugin:3.7.1:get \
Copy link
Member Author

Choose a reason for hiding this comment

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

here we make sure we use the same version cached in the java images

@@ -45,8 +45,8 @@
<go-offline-maven-plugin.version>1.2.8</go-offline-maven-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<!-- Use same version as https://github.com/openzipkin/docker-java -->
<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
<maven-help-plugin.version>3.4.0</maven-help-plugin.version>
<maven-dependency-plugin.version>3.7.1</maven-dependency-plugin.version>
Copy link
Member Author

Choose a reason for hiding this comment

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

here also, we make sure we use the same version cached in the java images

@@ -8,38 +8,38 @@ else
exit 1
fi

JAVA_VERSION=${JAVA_VERSION:-21.0.3_p9}
JAVA_VERSION=${JAVA_VERSION:-21.0.4_p7}
Copy link
Member Author

Choose a reason for hiding this comment

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

all images here are newly published, except the jdk 1.6 which has no update in recent years

@codefromthecrypt
Copy link
Member Author

ps this same change needs to happen on zipkin, -aws and -gcp, but testing it here first. (works or you would see failed tests)

@codefromthecrypt codefromthecrypt merged commit b247c0a into master Aug 3, 2024
10 checks passed
@codefromthecrypt codefromthecrypt deleted the docker branch August 3, 2024 07:50
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.

1 participant