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

Move VM options to jvm.config #18

Merged
merged 1 commit into from
Sep 5, 2023

Conversation

willmostly
Copy link
Contributor

This allows the build to succeed using mvn install instead of requiring ./mvnw install

@cla-bot cla-bot bot added the cla-signed label Aug 25, 2023
Copy link
Member

@vishalya vishalya left a comment

Choose a reason for hiding this comment

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

LGTM, minor comment.

.mvn/jvm.config Outdated
@@ -0,0 +1 @@
--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED
Copy link
Member

Choose a reason for hiding this comment

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

if you could get rid of that eye sore end of line.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

haha, done 🖖

Copy link
Member

@vishalya vishalya left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@mosabua mosabua left a comment

Choose a reason for hiding this comment

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

We should take the related setting in the pom out as part of this PR as well

@@ -281,8 +281,7 @@ if [ -n "$wrapperSha256Sum" ]; then
fi

#This option is required by the javalite db-migrator-maven-plugin, which does not support adding VM options in its config
REQUIRED_BUILD_OPTIONS='--add-opens=java.base/java.net=ALL-UNNAMED'
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $REQUIRED_BUILD_OPTIONS $MAVEN_OPTS"
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
Copy link
Member

Choose a reason for hiding this comment

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

do NOT modify the generated mvnw wrapper script .. this will be wiped whenever we upgrade the wrapper

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this changes it back to the generated version

Copy link
Contributor Author

Choose a reason for hiding this comment

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

except for the comment - let me regenerate the wrapper

Copy link
Member

Choose a reason for hiding this comment

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

oh .. good

@mosabua
Copy link
Member

mosabua commented Aug 29, 2023

This fails to build locally for me .. you want output @willmostly ?

@mosabua
Copy link
Member

mosabua commented Aug 31, 2023

Is this ready now @willmostly ? I don't think you pushed the regenerated wrapper..

Copy link
Member

@mosabua mosabua left a comment

Choose a reason for hiding this comment

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

Looks good now. Thank you for updating and cofirming.

@mosabua mosabua merged commit 8e8b1c3 into trinodb:main Sep 5, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

4 participants