Skip to content

Commit

Permalink
chore: Merged in changes from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisdutz committed Oct 30, 2023
1 parent a71056a commit 2e7386e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
10 changes: 0 additions & 10 deletions plc4j/drivers/modbus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,6 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<usedDependencies combine.children="append">
<usedDependency>org.apache.plc4x:plc4j-transport-serial</usedDependency>
<usedDependency>org.apache.plc4x:plc4j-transport-raw-socket</usedDependency>
</usedDependencies>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
11 changes: 11 additions & 0 deletions plc4net/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,17 @@
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-protocols-knxnetip</artifactId>
<version>0.12.0-SNAPSHOT</version>
<classifier>tests</classifier>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>update-generated-code</id>
Expand Down

0 comments on commit 2e7386e

Please sign in to comment.