[WIP] Upgrade Karaf from 4.4.6 to 4.4.7 #17515
Open
+316
−322
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
holgerfriedrich
requested review from
a team,
hmerk,
cweitkamp,
kaikreuzer,
mherwege,
marcelrv,
ssalonen,
antroids,
BjoernLange,
wborn,
paulianttila and
peuter
as code owners
holgerfriedrich
added
awaiting external dependency
holgerfriedrich
force-pushed
the
k447
branch
3 times, most recently
from
237c2d7 to
b4060b5
Compare
holgerfriedrich
force-pushed
the
k447
branch
from
b4060b5 to
15af594
Compare
holgerfriedrich
force-pushed
the
k447
branch
from
15af594 to
c39224b
Compare
holgerfriedrich
requested review from
jochen314,
ccutrer,
david-pace and
GerdZanker
as code owners
ccutrer
approved these changes
Nov 24, 2024
holgerfriedrich
force-pushed
the
k447
branch
2 times, most recently
from
610ab0c to
4c56e22
Compare
holgerfriedrich
force-pushed
the
k447
branch
from
4c56e22 to
6067c74
Compare
holgerfriedrich
force-pushed
the
k447
branch
from
6067c74 to
a34620d
Compare
holgerfriedrich
force-pushed
the
k447
branch
3 times, most recently
from
4d19097 to
6c053c7
Compare
david-pace
requested changes
Jan 18, 2025
| @@ -278,7 +278,7 @@ void sendRequestInvalidSyntaxInResponse() | |||
| ExecutionException e = assertThrows(ExecutionException.class, | |||
| () -> httpClient.sendRequest(request, SubscribeResult.class, sr -> false, null)); | |||
| assertEquals( | |||
| "Received invalid content in response, expected type org.openhab.binding.boschshc.internal.devices.bridge.dto.SubscribeResult: com.google.gson.stream.MalformedJsonException: Unterminated string at line 1 column 44 path $.@type", | |||
| "Received invalid content in response, expected type org.openhab.binding.boschshc.internal.devices.bridge.dto.SubscribeResult: com.google.gson.stream.MalformedJsonException: Unterminated string at line 1 column 44 path $.@type\nSee https://github.com/google/gson/blob/main/Troubleshooting.md#malformed-json", | |||
There was a problem hiding this comment.
Looking at this assertion again, I realize that only the first part comes from our openHAB code. We should not test messages from external libraries since this makes our tests unstable. Therefore I would propose to test only that the exception message starts with our message:
assertThat(e.getMessage(), startsWith(
"Received invalid content in response, expected type org.openhab.binding.boschshc.internal.devices.bridge.dto.SubscribeResult:"));This check uses Hamcrest assertions as recommended in the unit test guidelines. The corresponding imports are:
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.StringStartsWith.startsWith;
* Sync runtime dependencies with Karaf 4.4.7, most notably: * PaxWeb 8.0.30 * Jetty 9.4.57.v20241219 * BouncyCastle 1.78.1 * CXF 3.6.4 * Jackson 2.18.2 * JNA 5.16.0 * JAXB 2.3.9 * commons-io 2.17.0 * commons-lang3 3.17.0 * commons-logging 1.3.4 * ASM 9.7.1 * PaxLogging 2.2.8 * Resolve itest runbundles Signed-off-by: Holger Friedrich <[email protected]>
* gson 2.11.0 * guava 3.33.1 * ecj 3.39.0 * Fix newly introduced compilation and test issues in bindings Signed-off-by: Holger Friedrich <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Still WIP. Depends on Karaf 4.4.7 release.
Relates to openhab/openhab-core#4406.
I updated a few commons libs in the addons as well to keep it in sync with core. Hope this does not break something.