Skip to content

Commit 714d5bf

Browse files
kevinherronkevinherron
authored
Release 2.0.0 (#86)
1 parent 4a476fe commit 714d5bf

File tree

24 files changed

+146
-87
lines changed

24 files changed

+146
-87
lines changed

‎.github/workflows/maven-release.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
jobs:
88
publish:
99
runs-on: ubuntu-latest
10+
permissions:
11+
contents: read
12+
packages: write
13+
1014
steps:
1115
- uses: actions/checkout@v4
1216

@@ -29,14 +33,3 @@ jobs:
2933
env:
3034
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
3135
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
32-
33-
- name: Set up Java for publishing to GitHub Packages
34-
uses: actions/setup-java@v4
35-
with:
36-
java-version: '17'
37-
distribution: 'temurin'
38-
39-
- name: Publish to GitHub Packages
40-
run: mvn -B deploy
41-
env:
42-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎modbus-serial/pom.xml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
<parent>
88
<groupId>com.digitalpetri.modbus</groupId>
99
<artifactId>modbus-parent</artifactId>
10-
<version>2.0.0-SNAPSHOT</version>
10+
<version>2.0.0</version>
1111
</parent>
1212

1313
<artifactId>modbus-serial</artifactId>
1414

1515
<properties>
16+
<javaModuleName>com.digitalpetri.modbus.serial</javaModuleName>
1617
<maven.compiler.source>17</maven.compiler.source>
1718
<maven.compiler.target>17</maven.compiler.target>
1819
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,13 +48,18 @@
4748
</dependency>
4849
</dependencies>
4950

50-
<build>
51-
<plugins>
52-
<plugin>
53-
<groupId>org.sonatype.plugins</groupId>
54-
<artifactId>nexus-staging-maven-plugin</artifactId>
55-
</plugin>
56-
</plugins>
57-
</build>
58-
51+
<profiles>
52+
<profile>
53+
<id>release</id>
54+
<build>
55+
<plugins>
56+
<plugin>
57+
<groupId>org.sonatype.plugins</groupId>
58+
<artifactId>nexus-staging-maven-plugin</artifactId>
59+
</plugin>
60+
</plugins>
61+
</build>
62+
</profile>
63+
</profiles>
64+
5965
</project>

‎modbus-serial/src/main/java/com/digitalpetri/modbus/SerialPortTransportConfig.java renamed to ‎modbus-serial/src/main/java/com/digitalpetri/modbus/serial/SerialPortTransportConfig.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package com.digitalpetri.modbus;
1+
package com.digitalpetri.modbus.serial;
22

3-
import com.digitalpetri.modbus.client.SerialPortClientTransport;
3+
import com.digitalpetri.modbus.Modbus;
4+
import com.digitalpetri.modbus.serial.client.SerialPortClientTransport;
45
import com.fazecast.jSerialComm.SerialPort;
56
import java.util.concurrent.ExecutorService;
67
import java.util.function.Consumer;

‎modbus-serial/src/main/java/com/digitalpetri/modbus/client/SerialPortClientTransport.java renamed to ‎modbus-serial/src/main/java/com/digitalpetri/modbus/serial/client/SerialPortClientTransport.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package com.digitalpetri.modbus.client;
1+
package com.digitalpetri.modbus.serial.client;
22

33
import com.digitalpetri.modbus.ModbusRtuFrame;
44
import com.digitalpetri.modbus.ModbusRtuResponseFrameParser;
55
import com.digitalpetri.modbus.ModbusRtuResponseFrameParser.Accumulated;
66
import com.digitalpetri.modbus.ModbusRtuResponseFrameParser.ParserState;
7-
import com.digitalpetri.modbus.SerialPortTransportConfig;
7+
import com.digitalpetri.modbus.client.ModbusRtuClientTransport;
88
import com.digitalpetri.modbus.internal.util.ExecutionQueue;
9+
import com.digitalpetri.modbus.serial.SerialPortTransportConfig;
910
import com.fazecast.jSerialComm.SerialPort;
1011
import com.fazecast.jSerialComm.SerialPortDataListener;
1112
import com.fazecast.jSerialComm.SerialPortEvent;

‎modbus-serial/src/main/java/com/digitalpetri/modbus/server/SerialPortServerTransport.java renamed to ‎modbus-serial/src/main/java/com/digitalpetri/modbus/serial/server/SerialPortServerTransport.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
package com.digitalpetri.modbus.server;
1+
package com.digitalpetri.modbus.serial.server;
22

33
import com.digitalpetri.modbus.ModbusRtuFrame;
44
import com.digitalpetri.modbus.ModbusRtuRequestFrameParser;
55
import com.digitalpetri.modbus.ModbusRtuRequestFrameParser.Accumulated;
66
import com.digitalpetri.modbus.ModbusRtuRequestFrameParser.ParserState;
7-
import com.digitalpetri.modbus.SerialPortTransportConfig;
8-
import com.digitalpetri.modbus.SerialPortTransportConfig.Builder;
97
import com.digitalpetri.modbus.exceptions.UnknownUnitIdException;
108
import com.digitalpetri.modbus.internal.util.ExecutionQueue;
9+
import com.digitalpetri.modbus.serial.SerialPortTransportConfig;
10+
import com.digitalpetri.modbus.serial.SerialPortTransportConfig.Builder;
11+
import com.digitalpetri.modbus.server.ModbusRtuServerTransport;
1112
import com.fazecast.jSerialComm.SerialPort;
1213
import com.fazecast.jSerialComm.SerialPortDataListener;
1314
import com.fazecast.jSerialComm.SerialPortEvent;

‎modbus-tcp/pom.xml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
<parent>
88
<groupId>com.digitalpetri.modbus</groupId>
99
<artifactId>modbus-parent</artifactId>
10-
<version>2.0.0-SNAPSHOT</version>
10+
<version>2.0.0</version>
1111
</parent>
1212

1313
<artifactId>modbus-tcp</artifactId>
1414

1515
<properties>
16+
<javaModuleName>com.digitalpetri.modbus.tcp</javaModuleName>
1617
<maven.compiler.source>17</maven.compiler.source>
1718
<maven.compiler.target>17</maven.compiler.target>
1819
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,13 +68,18 @@
6768
</dependency>
6869
</dependencies>
6970

70-
<build>
71-
<plugins>
72-
<plugin>
73-
<groupId>org.sonatype.plugins</groupId>
74-
<artifactId>nexus-staging-maven-plugin</artifactId>
75-
</plugin>
76-
</plugins>
77-
</build>
71+
<profiles>
72+
<profile>
73+
<id>release</id>
74+
<build>
75+
<plugins>
76+
<plugin>
77+
<groupId>org.sonatype.plugins</groupId>
78+
<artifactId>nexus-staging-maven-plugin</artifactId>
79+
</plugin>
80+
</plugins>
81+
</build>
82+
</profile>
83+
</profiles>
7884

7985
</project>

‎modbus-tcp/src/main/java/com/digitalpetri/modbus/ModbusTcpCodec.java renamed to ‎modbus-tcp/src/main/java/com/digitalpetri/modbus/tcp/ModbusTcpCodec.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
package com.digitalpetri.modbus;
1+
package com.digitalpetri.modbus.tcp;
22

3+
import com.digitalpetri.modbus.MbapHeader;
4+
import com.digitalpetri.modbus.ModbusTcpFrame;
35
import io.netty.buffer.ByteBuf;
46
import io.netty.channel.ChannelHandlerContext;
57
import io.netty.handler.codec.ByteToMessageCodec;

‎modbus-tcp/src/main/java/com/digitalpetri/modbus/Netty.java renamed to ‎modbus-tcp/src/main/java/com/digitalpetri/modbus/tcp/Netty.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.digitalpetri.modbus;
1+
package com.digitalpetri.modbus.tcp;
22

33
import io.netty.channel.nio.NioEventLoopGroup;
44
import io.netty.util.HashedWheelTimer;

‎modbus-tcp/src/main/java/com/digitalpetri/modbus/client/NettyClientTransportConfig.java renamed to ‎modbus-tcp/src/main/java/com/digitalpetri/modbus/tcp/client/NettyClientTransportConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.digitalpetri.modbus.client;
1+
package com.digitalpetri.modbus.tcp.client;
22

33
import com.digitalpetri.modbus.Modbus;
4-
import com.digitalpetri.modbus.Netty;
4+
import com.digitalpetri.modbus.tcp.Netty;
55
import io.netty.bootstrap.Bootstrap;
66
import io.netty.channel.ChannelPipeline;
77
import io.netty.channel.EventLoopGroup;

‎modbus-tcp/src/main/java/com/digitalpetri/modbus/client/NettyRtuClientTransport.java renamed to ‎modbus-tcp/src/main/java/com/digitalpetri/modbus/tcp/client/NettyRtuClientTransport.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package com.digitalpetri.modbus.client;
1+
package com.digitalpetri.modbus.tcp.client;
22

33
import com.digitalpetri.fsm.FsmContext;
44
import com.digitalpetri.modbus.ModbusRtuFrame;
55
import com.digitalpetri.modbus.ModbusRtuResponseFrameParser;
66
import com.digitalpetri.modbus.ModbusRtuResponseFrameParser.Accumulated;
77
import com.digitalpetri.modbus.ModbusRtuResponseFrameParser.ParseError;
88
import com.digitalpetri.modbus.ModbusRtuResponseFrameParser.ParserState;
9+
import com.digitalpetri.modbus.client.ModbusRtuClientTransport;
910
import com.digitalpetri.modbus.internal.util.ExecutionQueue;
1011
import com.digitalpetri.netty.fsm.ChannelActions;
1112
import com.digitalpetri.netty.fsm.ChannelFsm;

0 commit comments

Comments
 (0)