Skip to content

Commit

Permalink
Bump version.camel from 4.6.0 to 4.7.0
Browse files Browse the repository at this point in the history
Bumps `version.camel` from 4.6.0 to 4.7.0.

Updates `org.apache.camel:camel-management-api` from 4.6.0 to 4.7.0

Updates `org.apache.camel:camel-core` from 4.6.0 to 4.7.0

Updates `org.apache.camel:camel-management` from 4.6.0 to 4.7.0

Updates `org.apache.camel:camel-debug` from 4.6.0 to 4.7.0

Updates `org.apache.camel:camel-yaml-dsl` from 4.6.0 to 4.7.0

Updates `org.apache.camel:camel-xml-io-dsl` from 4.6.0 to 4.7.0

---
updated-dependencies:
- dependency-name: org.apache.camel:camel-management-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.camel:camel-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.apache.camel:camel-management
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.apache.camel:camel-debug
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.apache.camel:camel-yaml-dsl
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.apache.camel:camel-xml-io-dsl
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Updated EventMessage to match new methods in interface and adjust test,
there is one more parent exchange property variable by default

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
dependabot[bot] authored and apupier committed Jul 24, 2024
1 parent 9ba8605 commit 31292a9
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<sonar.organization>camel-tooling</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>

<version.camel>4.6.0</version.camel>
<version.camel>4.7.0</version.camel>
<!-- must be aligned with the one from Camel -->
<version.jaxb>4.0.0</version.jaxb>
<version.junit.pioneer>2.2.0</version.junit.pioneer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,5 +167,21 @@ public void setExceptionAsXml(String exceptionAsXml) {
public void setExceptionAsJSon(String exceptionAsJSon) {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public boolean isRemoteEndpoint() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public String getEndpointServiceUrl() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public String getEndpointServiceProtocol() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}
@Override
public Map<String, String> getEndpointServiceMetadata() {
throw new UnsupportedOperationException("This class is used only to read message sent from Camel server through JMX");
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
//@SetSystemProperty(key = "camel.debug.enabled", value = "true")
public abstract class BaseTest {

protected static final int DEFAULT_VARIABLES_NUMBER = 17;
protected static final int DEFAULT_VARIABLES_NUMBER = 18;
protected CamelDebugAdapterServer server;
protected DummyCamelDebugClient clientProxy;
protected CamelContext context;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ class UpdateDebuggerVariableValueTest extends BaseTest {
protected static final String SECOND_LOG_ID = "second-log-id";
private static final int NUMBER_OF_HEADER = 1;
private static final int NUMBER_OF_EXCHANGE_PROPERTY = 1;
private static final int NUMBER_OF_EXCHANGE_PROPERTY_PARENT = 1;
private static final int NUMBER_OF_EXCHANGE_VARIABLE = 1;
private Scope debuggerScope;
private CompletableFuture<Object> asyncSendBody;
Expand Down Expand Up @@ -100,7 +99,7 @@ public void configure() throws Exception {
assertThat(stoppedEventArgument.getThreadId()).isEqualTo(1);
assertThat(stoppedEventArgument.getReason()).isEqualTo(StoppedEventArgumentsReason.BREAKPOINT);
assertThat(asyncSendBody.isDone()).isFalse();
awaitAllVariablesFilled(0, DEFAULT_VARIABLES_NUMBER + NUMBER_OF_HEADER + NUMBER_OF_EXCHANGE_PROPERTY + NUMBER_OF_EXCHANGE_PROPERTY_PARENT + NUMBER_OF_EXCHANGE_VARIABLE);
awaitAllVariablesFilled(0, DEFAULT_VARIABLES_NUMBER + NUMBER_OF_HEADER + NUMBER_OF_EXCHANGE_PROPERTY + NUMBER_OF_EXCHANGE_VARIABLE);

debuggerScope = clientProxy.getAllStacksAndVars().get(0).getScopes().stream().filter(scope -> CamelDebuggerScope.NAME.equals(scope.getName())).findAny().get();
}
Expand Down Expand Up @@ -282,7 +281,7 @@ private EventMessage getMessageStateOnNextStep() {
server.next(nextArgs);

waitBreakpointNotification(2);
awaitAllVariablesFilled(1, DEFAULT_VARIABLES_NUMBER + NUMBER_OF_HEADER + NUMBER_OF_EXCHANGE_PROPERTY + NUMBER_OF_EXCHANGE_PROPERTY_PARENT + NUMBER_OF_EXCHANGE_VARIABLE);
awaitAllVariablesFilled(1, DEFAULT_VARIABLES_NUMBER + NUMBER_OF_HEADER + NUMBER_OF_EXCHANGE_PROPERTY + NUMBER_OF_EXCHANGE_VARIABLE);

// Keep using deprecated method to have it still working with 4.1-
String messagesAsXml = server.getConnectionManager().getBacklogDebugger().dumpTracedMessagesAsXml(SECOND_LOG_ID, true);
Expand Down

0 comments on commit 31292a9

Please sign in to comment.