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

plc4x: major dependency updates #252

Merged
merged 3 commits into from
Sep 2, 2021
Merged

plc4x: major dependency updates #252

merged 3 commits into from
Sep 2, 2021

Conversation

sruehl
Copy link
Contributor

@sruehl sruehl commented May 25, 2021

This is an aggregated update branch to protect us from the upcoming @dependabot bombardment.

We should validate and merge this as soon as possible and then in the future merge the @dependabot in a timely manner

@sruehl sruehl force-pushed the dependency_updates branch 2 times, most recently from ced2166 to 72c501e Compare May 26, 2021 11:12
# Conflicts:
#	plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
#	plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XEndpoint.java
#	plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Plc4XPollingConsumer.java
#	plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XEndpointTest.java
#	plc4j/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/Plc4XPollingConsumerTest.java
@chrisdutz chrisdutz merged commit 69dfa8a into develop Sep 2, 2021
@chrisdutz chrisdutz deleted the dependency_updates branch September 2, 2021 13:56
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.

None yet

2 participants