You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2020/03/11 08:25:43 UTC
[plc4x] branch develop updated: - Bumped Netty to version
4.1.47.Final - Testwise added generation of feature.xml and kar archive to
the s7 driver
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 86fe9b4 - Bumped Netty to version 4.1.47.Final - Testwise added generation of feature.xml and kar archive to the s7 driver
86fe9b4 is described below
commit 86fe9b4120664a137db12d696c2df5c5eae6dd0c
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Mar 11 09:25:35 2020 +0100
- Bumped Netty to version 4.1.47.Final
- Testwise added generation of feature.xml and kar archive to the s7 driver
---
plc4j/drivers/s7/pom.xml | 30 ++++++++++++++++++++++
plc4j/pom.xml | 1 +
.../transport/serial/SerialPollingSelector.java | 4 +--
pom.xml | 2 +-
4 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/plc4j/drivers/s7/pom.xml b/plc4j/drivers/s7/pom.xml
index c6ce6f3..32725e0 100644
--- a/plc4j/drivers/s7/pom.xml
+++ b/plc4j/drivers/s7/pom.xml
@@ -51,6 +51,36 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>4.2.8</version>
+ <executions>
+ <execution>
+ <id>generate-feature-xml</id>
+ <phase>compile</phase>
+ <goals>
+ <!-- Generate the feature.xml -->
+ <goal>features-generate-descriptor</goal>
+ <!-- Check the feature.xml -->
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-kar</id>
+ <phase>package</phase>
+ <goals>
+ <!--
+ Build a kar archive (Jar containing the feature.xml
+ as well as the module content and it's dependencies.
+ -->
+ <goal>kar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
diff --git a/plc4j/pom.xml b/plc4j/pom.xml
index 1c0556b..762f9d8 100644
--- a/plc4j/pom.xml
+++ b/plc4j/pom.xml
@@ -273,6 +273,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/plc4j/transports/serial/src/main/java/org/apache/plc4x/java/transport/serial/SerialPollingSelector.java b/plc4j/transports/serial/src/main/java/org/apache/plc4x/java/transport/serial/SerialPollingSelector.java
index 26f1af1..fdb5ce2 100644
--- a/plc4j/transports/serial/src/main/java/org/apache/plc4x/java/transport/serial/SerialPollingSelector.java
+++ b/plc4j/transports/serial/src/main/java/org/apache/plc4x/java/transport/serial/SerialPollingSelector.java
@@ -117,7 +117,7 @@ class SerialPollingSelector extends AbstractSelector {
@Override
public int select() {
- throw new NotImplementedException("");
+ return select(0);
}
@Override
@@ -132,7 +132,7 @@ class SerialPollingSelector extends AbstractSelector {
this.events.add(event);
// Add the OP to the SelectionKey
((SerialSelectionKey) event.key).addReadyOp(event.event);
- // Close the future so that the select is fired imediatly
+ // Close the future so that the select is fired immediately
if (!selectPromise.isDone()) {
selectPromise.setSuccess(null);
} else {
diff --git a/pom.xml b/pom.xml
index 255fb2a..0ac9725 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
<lucene.version>8.3.0</lucene.version>
<metrics-core.version>3.1.2</metrics-core.version>
<mockito.version>2.24.5</mockito.version>
- <netty.version>4.1.39.Final</netty.version>
+ <netty.version>4.1.47.Final</netty.version>
<owasp-dependency-check.version>5.0.0-M1</owasp-dependency-check.version>
<pcap4j.version>1.8.2</pcap4j.version>
<scala.version>2.12.6</scala.version>