-
Notifications
You must be signed in to change notification settings - Fork 35
Update Dependencies #146
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
base: main
Are you sure you want to change the base?
Update Dependencies #146
Conversation
|
Adding this to the "Next Release" miletone. Steering Committee discussed and this is valuable. It catches up on library updates There are some risks, like testing this whole thing, but those risks are manageable. |
|
Steering Committee also discussed this issue being a higher priority than Gradle (#146) since this gets us security updates sooner. |
|
@kayyagari @kpalang @mgaffigan - I may be a bit over my head here.... I thought this was going to be a simple cherry pick of a handful of commits, but our build processes have deviated a bit and I need to pull in some people a bit more familiar with the process than me. |
|
@gibson9583, see/pull 6a2459f Note also the changes to |
|
Updating the GH pipeline to Java 17 has it building successfully in CI. Still some test failures. |
|
@mgaffigan - thanks. Also pushed a commit to revert the change to DefaultMetaData |
Signed-off-by: Chris Gibson <cgibson@outlook.com>
Signed-off-by: Chris Gibson <cgibson@outlook.com>
Signed-off-by: Chris Gibson <cgibson@outlook.com>
Signed-off-by: Chris Gibson <cgibson@outlook.com>
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net> Signed-off-by: Chris Gibson <cgibson@outlook.com>
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net> Signed-off-by: Chris Gibson <cgibson@outlook.com>
Signed-off-by: gibson9583 <cgibson@outlook.com> Signed-off-by: Chris Gibson <cgibson@outlook.com>
165ab87 to
8db4aca
Compare
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.
Compile failures:
- [javadoc] error: invalid flag: -add-modules
New test-compile warnings:
- [javac] warning: [options] --add-opens has no effect at compile time
- [junit] OpenJDK 64-Bit Server VM warning: Sharing is only supported for boot loader classes because bootstrap classpath has been appended
- [junit] WARNING: package sun.misc not in java.base
Test failures:
- [junit] TEST com.mirth.connect.donkey.server.channel.ChannelTest FAILED
- [junit] TEST com.mirth.connect.donkey.server.data.jdbc.JdbcDaoTest FAILED
- [junit] Test com.mirth.connect.client.core.ConnectServiceUtilTest FAILED
- [junit] Test com.mirth.connect.model.PublicServerSettingsTest FAILED
-
[junit] Test com.mirth.connect.util.JavaScriptSharedUtilTest FAILED(#184 opened - unrelated to this PR)
General concerns:
- gitignore needs updated or build needs updated to avoid un-ignored untracked files after build (307 generated)
-
If we're going to spend time testing a release, we should verify the versions of deps we're going to are best(Getting this merged doesn't stop us from future updates). - A lot of these changes are formatting or whitespace. Not strictly a problem, but the PR can be substantially minimized.
Signed-off-by: gibson9583 <cgibson@outlook.com>
|
Seems like a stupid suggestion and I haven't been following the previous conversation around this topic. But. What if we see what versions BL bumped and do the change manually on our side? We could also do appropriate unit-tests in the process. |
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
Not sure re: this one. I can't see the output from CI test failure. Running TEST-com.mirth.connect.util.JavaScriptSharedUtilTest.xml |
Since this is also a move to Java 17, the version upgrades are tied to some of the other changes. I think it's in a fairly good state - unresolved issues notwithstanding. |
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
4d29958 to
11aa84b
Compare
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
11aa84b to
1647b0f
Compare
|
Looks like this was introduced in #90. I didn't notice the test failure since all of the checks passed. The files Mitch shared on this ticket indicate it was related to pretty print functionality. |
mgaffigan
left a comment
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.
Let's go! Seems to be a step in the right direction. Moves the build process to Java 17. Seems to open and run as usual in Ballista.
tonygermano
left a comment
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.
17 commits and a lot of unrelated changes makes this somewhat messy and difficult to review (I am aware that much of it was probably externally generated.) It's difficult to tell which changes are necessary for the dependency updates and which are not. There are a lot of which I marked in my review as potentially being unnecessary changes. There are many more that are additional comments and whitespace changes which I did not mark, but probably don't belong in this PR (not that I have anything against comments, but they just bloat this already large PR.)
I think while we are changing the minimum required java version, we should do it correctly and close out #18. I think this only entails modifying the ant javac tasks to include a release="17" attribute. It may be wise to store the release version in a build property as it will likely get updated from 17 to 21 in the not distant future now that version 25 is out.
See https://ant.apache.org/manual/Tasks/javac.html and https://stackoverflow.com/a/43103038
| <copy todir="${connectors.http}/lib" failonerror="false"> | ||
| <fileset dir="${lib.extensions}/http" /> | ||
| </copy> | ||
| <jar destfile="${connectors.http}/http-shared.jar" basedir="${classes}"> |
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.
There are a lot of similar removals here. Technically the directories appear to not exist (I haven't checked all of them,) so there is likely no harm in removing them, but I'm sure the intent is for all of the plugin sections to be the same, whether they have additional libraries or not.
Are these changes we want to keep?
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.
I agree they are unrelated to java 17 - but they add a bunch of warnings to the build output, making it hard to identify actual issues caused by Java 17.
I think these are beneficial changes, since there is not seemingly an ant option to avoid the warning otherwise.
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.
@tonygermano, do you view this as a blocker?
| String responseData = response.getMessage(); | ||
|
|
||
| String expectedResponseString = "<dicom>\n" + "<tag00000900 len=\"2\" tag=\"00000900\" vr=\"IS\">0</tag00000900>\n" + "</dicom>\n" + ""; | ||
| String expectedResponseString = "<dicom><tag00000900 len=\"2\" tag=\"00000900\" vr=\"IS\">0</tag00000900></dicom>"; |
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.
Do we know which change caused the newline character removal from the expected response?
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.
I do not.
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.
@tonygermano, do you view this as a blocker?
server/test/com/mirth/connect/model/PublicServerSettingsTest.java
Outdated
Show resolved
Hide resolved
| statement.execute("CREATE TABLE D_MESSAGE_SEQUENCES (LOCAL_CHANNEL_ID BIGINT NOT NULL PRIMARY KEY)"); | ||
| } | ||
|
|
||
| result = statement.executeQuery("SELECT MAX(id) FROM d_m" + localChannelId); |
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.
connection is not database dependent, but these new queries are.
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.
Agree. Reverted. I'm also not clear why this was required in the first place.
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
Agree. The BL comments are not clear on motivation. I think everything in the PR is based on building with Java 17. The PR could indeed be smaller, but some of these changes were submitted previously as fractional PR's - and were not merged.
The comments were added to avoid increasing the number of warnings in the build. Absent those changes, moving to 17 increases the number. The whitespace changes I commented on too, but the original whitespace is mental. If you look at the file wrong, it will be reformatted and the whitespace will change. It was not worth my time to revert, since it is still a beneficial change if a bit unrelated. I'd be more willing to pull those into separate PR's if small PR's were to merge quickly.
Specifying release gives the following errors: |
This seems like the most efficient way to handle updating these jars. Pulling from a known quantity rather than reviewing ourselves