Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/iec-60870-…
Browse files Browse the repository at this point in the history
…5-104
  • Loading branch information
chrisdutz committed Sep 1, 2023
2 parents 77de2a1 + 9ef986d commit 85aa897
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion plc4j/examples/hello-connectivity-mqtt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>com.hivemq</groupId>
<artifactId>hivemq-mqtt-client</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>io.reactivex.rxjava2</groupId>
Expand Down
2 changes: 1 addition & 1 deletion plc4j/integrations/apache-calcite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.24.1</version>
<version>3.24.2</version>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<!-- The currently available version is 2.0.5 and anything above 1.4.3 is no longer compatible with our code -->
<bit-io.version>1.4.3</bit-io.version>
<bouncycastle.version>1.70</bouncycastle.version>
<byte-buddy.version>1.14.6</byte-buddy.version>
<byte-buddy.version>1.14.7</byte-buddy.version>
<!-- Be sure to keep this version set to the version of the cmake-maven-plugin -->
<cmake-version>3.22.1</cmake-version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
Expand Down Expand Up @@ -136,7 +136,7 @@
<woodstox-core.version>6.5.1</woodstox-core.version>
<!-- When updating this to the latest version, we're getting errors in the opcua server tests -->
<jaxb.version>4.0.2</jaxb.version>
<jetty-util.version>12.0.0</jetty-util.version>
<jetty-util.version>12.0.1</jetty-util.version>
<jna.version>5.13.0</jna.version>
<joda-time.version>2.12.5</joda-time.version>
<jserialcom.version>2.10.3</jserialcom.version>
Expand Down Expand Up @@ -636,7 +636,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.1</version>
<version>2.2</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down

0 comments on commit 85aa897

Please sign in to comment.