Skip to content

Commit

Permalink
Merge branch 'master' into zigbee_utc_time
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdjackson
cdjackson committed Feb 5, 2023
2 parents 65b9a18 + e649840 commit 9b3a60e
Show file tree
Hide file tree
Showing 23 changed files with 94 additions and 57 deletions.
2 changes: 1 addition & 1 deletion com.zsmartsystems.zigbee.autocode/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<build>
Expand Down
8 changes: 4 additions & 4 deletions com.zsmartsystems.zigbee.console.ember/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<dependencies>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.console</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.dongle.ember</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
22 changes: 11 additions & 11 deletions com.zsmartsystems.zigbee.console.main/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,69 +9,69 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<dependencies>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.serial</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.dongle.cc2531</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.dongle.xbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.dongle.conbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.dongle.ember</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.dongle.telegesis</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.console</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.console.ember</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.console.telegesis</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
8 changes: 4 additions & 4 deletions com.zsmartsystems.zigbee.console.telegesis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<dependencies>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.console</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.dongle.telegesis</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions com.zsmartsystems.zigbee.console/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<dependencies>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions com.zsmartsystems.zigbee.dongle.cc2531/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<dependencies>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions com.zsmartsystems.zigbee.dongle.conbee/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<dependencies>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion com.zsmartsystems.zigbee.dongle.ember.autocode/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<build>
Expand Down
6 changes: 3 additions & 3 deletions com.zsmartsystems.zigbee.dongle.ember/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<dependencies>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...ber/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ public void close() {
try {
parserThread.interrupt();
parserThread.join();
logger.debug("AshFrameHandler parsed thread terminated.");
logger.debug("AshFrameHandler parser thread terminated.");
} catch (InterruptedException e) {
logger.debug("AshFrameHandler interrupted in packet parser thread shutdown join.");
}
Expand Down
4 changes: 2 additions & 2 deletions com.zsmartsystems.zigbee.dongle.telegesis.autocode/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.dongle.telegesis.autocode</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -15,7 +15,7 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<build>
Expand Down
6 changes: 3 additions & 3 deletions com.zsmartsystems.zigbee.dongle.telegesis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<dependencies>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions com.zsmartsystems.zigbee.dongle.xbee.autocode/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.dongle.xbee.autocode</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -15,7 +15,7 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<build>
Expand Down
4 changes: 2 additions & 2 deletions com.zsmartsystems.zigbee.dongle.xbee/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<dependencies>

<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions com.zsmartsystems.zigbee.serial/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<properties>
Expand All @@ -21,7 +21,7 @@
<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
14 changes: 7 additions & 7 deletions com.zsmartsystems.zigbee.test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,39 @@
<parent>
<groupId>com.zsmartsystems</groupId>
<artifactId>zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.dongle.cc2531</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.dongle.ember</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.dongle.telegesis</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.dongle.xbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.zsmartsystems.zigbee</groupId>
<artifactId>com.zsmartsystems.zigbee.dongle.conbee</artifactId>
<version>1.4.10-SNAPSHOT</version>
<version>1.4.11-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
Loading

0 comments on commit 9b3a60e

Please sign in to comment.