This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a change to branch rel/0.3
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from b0a46fa - Manually removed the "-SNAPSHOT" suffix from modules not
part of the normal build in preparation of the upcoming release.
add 26bbf9d [maven-release-plugin] prepare for next development iteration
add 92084ec Fixed failing Test.
add 333656e - Updated the pom versions of modules excluded from the build.
add 2696c89 - Fixed an invalid dependency
add 0d03828 - Added DFDL Schema for S7 Protocol.
add 8076766 - Added two more DFDL schemas for ISO-TP and ISO-on-TCP
add 46d5d93 S7: fix of array acquirement, fix of String aquirement, added
additional scraper yml
add 704f989 Merge pull request #43 from timbo2k/s7_array_stuff
add 980c069 S7: changed byteLength and blockNumber from short to int
add 7031908 Merge pull request #44 from timbo2k/too_short_range_for_offset
add 972188f - Resolved merge conflicts..
add 248068e - Fixed some tests now failling due to the tape change of
blockNumber and byteOffset
add aebdb7e - Added some more documentation on things we noticed when
preparing the last release branch
add 3bf21b0 - Made the TcpSocketChannelFactory wrap any exception into a
Plc4xException in order to fix issues with some tests which would fail for
people with DNS providers with capture-all responses.
add 4f94262 - Added "name" tags to the projects poms that were missing
them ... now the output of the reactor sumary looks nice again.
add 9db9e6b - Found another place where tests fail on systems with DNS
providers that return default IPs
add 232bef5 - Disabled one test we simply can't check reliably in case of
DNS providers returning default IP addresses for unknown domain names
add 316fdbd - Replaced the hostname we expect not to exist with one a
little more obvious.
add 297b090 - Defined a new Annotation "RequirePcapNg" you can annotate
Junit5 tests with to automatically disable tests, if the libpcap requirement is
not met (Especially on Windows)
add d8588bf README - Updated the integration module list - Updated the
requirements - Added information on installing libpcap/WinPcap - Added a
section on building with C++
add 1fca054 - Added a new RequirePcap for general libpcap requiring tests
add 0a9c0c1 - Bumped the artifact version to a newer one due to CVEs
add 83747fb - Excluded the plexus-utils dependency.
add e853c79 - Fixed some SonarQube findings
add 6fb54d7 - Cleaned up the dependency versions
add 1a09a0a - Hopefully fixed the Scraper test that was failing on some
systems.
add 9313aa8 - Changed the way we do the Vulnerability checks for our
referenced libraries. - Improved the documentation in our README
add 29b0cef - Commented in the commented out line back.
add 5c896fe - Changed the dependencyManagement to use version-properties
for every dependency.
add c32afe3 - Added a annotation to prevent Mockito unnecessary-stubbing
exceptions
add 3b736d7 - Further attempts to get the ScraperTaskTest running on all
platforms
add 717cdd4 - Moved the JAR related plugin configuration to the
java-module profile to reduce the number of warnings in the build
add ad84572 - Updated the JQAssistant version and removed a now obsolete
setting from the Jenkinsfile
add 9570de7 - Converted the test-data from pcapng files to pcap files as
on some systems there were issues reading them.
add f71b59f - Converted the test-data from pcapng files to pcap files as
on some systems there were issues reading them.
add 8ff9546 - Removed an unneeded utility class.
add a05c0f4 - Bumped the karaf plugin to a newer version - Bumped the
maven sonar plugin to a newer version - Merged the wireshark-utils with the
test-utils - Added JUnit5 annotations for detecting an active internet
connection - Added JUnit5 annotations for detecting an capture-all DNS service
add 556518a - Reassigned the features generate-descriptor and verify goal
executions of the karaf plugin to the package phase of the build.
add 4b1bf59 - Removed some unused imports.
add cecf75e - Added a first Daffodil testcase for the cotp protocol
add 7a93015 - Managed to get the Daffodil testcase working.
add be30559 - Got the testsuite working for the protocols module (Was
missing a "src/main/java" directory, which activates the "java-module" profile)
add 54f4269 - Added tests to fully test the tpkt protocol.
add 7c843a2 - Simplified the way test-suites are defined
new 58cd74a Merge branch 'develop' into rel/0.3
new ef3ec76 Fixed all versions after merging master to prepare RC.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
DEVELOPMENT.md | 2 +-
Jenkinsfile | 2 -
README | 41 +-
.../README.md => Sometimes-Failling-Tests.md | 18 +-
examples/dummy-driver/pom.xml | 8 +-
examples/hello-cloud-azure/pom.xml | 6 +-
examples/hello-cloud-google/pom.xml | 7 +-
examples/hello-connectivity-kafka/pom.xml | 10 +-
examples/hello-connectivity-mqtt/pom.xml | 8 +-
examples/hello-integration-edgent/pom.xml | 6 +-
examples/hello-opm/pom.xml | 10 +-
examples/hello-storage-elasticsearch/pom.xml | 14 +-
examples/hello-world-plc4x/pom.xml | 8 +-
examples/pom.xml | 2 +-
integrations/apache-brooklyn/pom.xml | 2 +-
integrations/apache-calcite/pom.xml | 10 +-
integrations/apache-camel/pom.xml | 8 +-
integrations/apache-edgent/pom.xml | 10 +-
integrations/apache-kafka/pom.xml | 4 +-
.../apache-karaf/karaf-ads-feature/pom.xml | 6 +-
.../apache-karaf/karaf-demo-server/pom.xml | 14 +-
.../apache-karaf/karaf-ethernet-ip-feature/pom.xml | 6 +-
.../apache-karaf/karaf-modbus-feature/pom.xml | 6 +-
integrations/apache-karaf/karaf-s7-feature/pom.xml | 6 +-
.../apache-karaf/karaf-simulated-feature/pom.xml | 6 +-
integrations/apache-karaf/pom.xml | 11 +-
integrations/apache-mynewt/pom.xml | 2 +-
integrations/apache-nifi/nifi-plc4x-nar/pom.xml | 18 +-
.../apache-nifi/nifi-plc4x-processors/pom.xml | 6 +-
integrations/apache-nifi/pom.xml | 2 +-
integrations/pom.xml | 2 +-
plc4c/pom.xml | 2 +-
plc4cpp/README.md | 3 +-
plc4j/api/pom.xml | 5 +-
plc4j/drivers/ads/pom.xml | 21 +-
.../apache/plc4x/java/ads/AdsPlcDriverTest.java | 36 +-
plc4j/drivers/ethernet-ip/pom.xml | 10 +-
.../src/test/resources/read-attribute.pcap | Bin 0 -> 258 bytes
.../src/test/resources/read-attribute.pcapng | Bin 664 -> 0 bytes
plc4j/drivers/modbus/pom.xml | 15 +-
.../plc4x/java/modbus/ModbusPlcDriverTest.java | 4 +-
plc4j/drivers/pom.xml | 2 +-
plc4j/drivers/s7/pom.xml | 24 +-
.../java/org/apache/plc4x/java/s7/S7PlcDriver.java | 2 +
.../org/apache/plc4x/java/s7/S7PlcDriverTest.java | 2 +
.../java/s7/connection/S7PlcConnectionIT.java | 14 +-
.../java/s7/connection/S7PlcTestConnection.java | 2 +-
.../java/s7/connection/s7-read-large-response.pcap | Bin 0 -> 652 bytes
.../s7/connection/s7-read-large-response.pcapng | Bin 1040 -> 0 bytes
.../java/s7/connection/s7-read-var-request.pcap | Bin 0 -> 125 bytes
.../java/s7/connection/s7-read-var-request.pcapng | Bin 400 -> 0 bytes
.../java/s7/connection/s7-read-var-response.pcap | Bin 0 -> 120 bytes
.../java/s7/connection/s7-read-var-response.pcapng | Bin 392 -> 0 bytes
.../java/s7/connection/s7-write-var-request.pcap | Bin 0 -> 130 bytes
.../java/s7/connection/s7-write-var-request.pcapng | Bin 404 -> 0 bytes
.../java/s7/connection/s7-write-var-response.pcap | Bin 0 -> 116 bytes
.../s7/connection/s7-write-var-response.pcapng | Bin 388 -> 0 bytes
plc4j/drivers/simulated/pom.xml | 8 +-
plc4j/pom.xml | 2 +-
plc4j/protocols/ads/pom.xml | 10 +-
plc4j/protocols/benchmarks/pom.xml | 6 +-
plc4j/protocols/delta-v/pom.xml | 10 +-
plc4j/protocols/driver-bases/base/pom.xml | 6 +-
plc4j/protocols/driver-bases/pom.xml | 2 +-
plc4j/protocols/driver-bases/raw-socket/pom.xml | 6 +-
plc4j/protocols/driver-bases/serial/pom.xml | 7 +-
plc4j/protocols/driver-bases/tcp/pom.xml | 6 +-
.../base/connection/TcpSocketChannelFactory.java | 2 +
plc4j/protocols/driver-bases/test/pom.xml | 6 +-
plc4j/protocols/ethernet-ip/pom.xml | 6 +-
plc4j/protocols/iso-on-tcp/pom.xml | 8 +-
plc4j/protocols/iso-tp/pom.xml | 10 +-
plc4j/protocols/modbus/pom.xml | 8 +-
plc4j/protocols/pom.xml | 2 +-
plc4j/protocols/s7/pom.xml | 11 +-
.../org/apache/plc4x/java/s7/model/S7Field.java | 54 +-
.../model/params/items/S7AnyVarParameterItem.java | 12 +-
.../s7/netty/model/types/DataTransportSize.java | 2 +-
.../java/s7/netty/model/types/MemoryArea.java | 2 +-
.../java/s7/netty/model/types/MessageType.java | 2 +-
.../java/s7/netty/model/types/ParameterType.java | 2 +-
.../s7/netty/model/types/SpecificationType.java | 2 +-
.../netty/model/types/VariableAddressingMode.java | 2 +-
.../strategies/DefaultS7MessageProcessor.java | 12 +-
.../java/org/apache/plc4x/java/issues/PLC4X56.java | 42 +-
.../org/apache/plc4x/java/s7/PcapGenerator.java | 6 +-
.../apache/plc4x/java/s7/model/S7FieldTests.java | 8 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 8 +-
.../s7/netty/model/messages/S7MessageTests.java | 9 +-
.../strategies/DefaultS7MessageProcessorTest.java | 10 +-
plc4j/utils/connection-pool/pom.xml | 4 +-
plc4j/utils/opm/pom.xml | 11 +-
plc4j/utils/pom.xml | 3 +-
plc4j/utils/raw-sockets/pom.xml | 10 +-
.../java/utils/rawsockets/RawIpSocketTest.java | 2 +
plc4j/utils/scraper/pom.xml | 21 +-
.../apache/plc4x/java/scraper/ScraperTaskTest.java | 3 +
.../org/apache/plc4x/java/scraper/ScraperTest.java | 3 +
.../src/test/resources/example_with_strings.yml | 14 +-
plc4j/utils/test-utils/pom.xml | 22 +-
.../plc4x/test/RequireInternetConnection.java} | 14 +-
.../test/RequireInternetConnectionCondition.java | 45 ++
.../plc4x/test/RequireNonCaptureAllDns.java} | 14 +-
.../test/RequireNonCaptureAllDnsCondition.java} | 21 +-
.../java/org/apache/plc4x/test/RequirePcap.java} | 14 +-
.../apache/plc4x/test/RequirePcapCondition.java | 57 ++
.../java/org/apache/plc4x/test/RequirePcapNg.java} | 14 +-
.../apache/plc4x/test/RequirePcapNgCondition.java | 69 +++
plc4j/utils/wireshark-utils/pom.xml | 42 --
.../org/apache/plc4x/java/utils/PcapngUtils.java | 106 ----
plc4s/pom.xml | 2 +-
pom.xml | 447 +++++++++++++---
{plc4cpp/api => protocols}/pom.xml | 34 +-
.../src/main/dfdl/daffodil-built-in-catalog.xml | 12 +-
.../apache/plc4x/protocols/cotp-protocol.dfdl.xsd | 213 ++++++++
.../apache/plc4x/protocols/s7-protocol.dfdl.xsd | 587 +++++++++++++++++++++
.../apache/plc4x/protocols/tpkt-protocol.dfdl.xsd | 87 +++
.../LINKS.md => protocols/src/main/java/.keepMe | 3 -
.../plc4x/protocols/AbstractProtocolTest.java | 56 ++
.../apache/plc4x/protocols/TpktProtocolTest.java | 14 +-
.../org/apache/plc4x/protocols/tpkt-protocol.tdml | 112 ++++
src/site/asciidoc/developers/release.adoc | 37 ++
src/site/asciidoc/protocols/s7/s7comm.adoc | 2 +-
123 files changed, 2181 insertions(+), 606 deletions(-)
copy integrations/apache-kafka/README.md => Sometimes-Failling-Tests.md (58%)
create mode 100644
plc4j/drivers/ethernet-ip/src/test/resources/read-attribute.pcap
delete mode 100644
plc4j/drivers/ethernet-ip/src/test/resources/read-attribute.pcapng
create mode 100644
plc4j/drivers/s7/src/test/resources/org/apache/plc4x/java/s7/connection/s7-read-large-response.pcap
delete mode 100644
plc4j/drivers/s7/src/test/resources/org/apache/plc4x/java/s7/connection/s7-read-large-response.pcapng
create mode 100644
plc4j/drivers/s7/src/test/resources/org/apache/plc4x/java/s7/connection/s7-read-var-request.pcap
delete mode 100644
plc4j/drivers/s7/src/test/resources/org/apache/plc4x/java/s7/connection/s7-read-var-request.pcapng
create mode 100644
plc4j/drivers/s7/src/test/resources/org/apache/plc4x/java/s7/connection/s7-read-var-response.pcap
delete mode 100644
plc4j/drivers/s7/src/test/resources/org/apache/plc4x/java/s7/connection/s7-read-var-response.pcapng
create mode 100644
plc4j/drivers/s7/src/test/resources/org/apache/plc4x/java/s7/connection/s7-write-var-request.pcap
delete mode 100644
plc4j/drivers/s7/src/test/resources/org/apache/plc4x/java/s7/connection/s7-write-var-request.pcapng
create mode 100644
plc4j/drivers/s7/src/test/resources/org/apache/plc4x/java/s7/connection/s7-write-var-response.pcap
delete mode 100644
plc4j/drivers/s7/src/test/resources/org/apache/plc4x/java/s7/connection/s7-write-var-response.pcapng
copy plc4j/utils/{opm/src/main/java/org/apache/plc4x/java/opm/PlcEntity.java
=>
test-utils/src/main/java/org/apache/plc4x/test/RequireInternetConnection.java}
(76%)
create mode 100644
plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequireInternetConnectionCondition.java
copy plc4j/utils/{opm/src/main/java/org/apache/plc4x/java/opm/PlcEntity.java
=> test-utils/src/main/java/org/apache/plc4x/test/RequireNonCaptureAllDns.java}
(77%)
copy
plc4j/{drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestFieldItem.java
=>
utils/test-utils/src/main/java/org/apache/plc4x/test/RequireNonCaptureAllDnsCondition.java}
(50%)
copy plc4j/utils/{opm/src/main/java/org/apache/plc4x/java/opm/PlcEntity.java
=> test-utils/src/main/java/org/apache/plc4x/test/RequirePcap.java} (78%)
create mode 100644
plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapCondition.java
copy plc4j/utils/{opm/src/main/java/org/apache/plc4x/java/opm/PlcEntity.java
=> test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNg.java} (78%)
create mode 100644
plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNgCondition.java
delete mode 100644 plc4j/utils/wireshark-utils/pom.xml
delete mode 100644
plc4j/utils/wireshark-utils/src/main/java/org/apache/plc4x/java/utils/PcapngUtils.java
copy {plc4cpp/api => protocols}/pom.xml (61%)
copy plc4j/protocols/ads/LINKS.md =>
protocols/src/main/dfdl/daffodil-built-in-catalog.xml (64%)
create mode 100644
protocols/src/main/dfdl/org/apache/plc4x/protocols/cotp-protocol.dfdl.xsd
create mode 100644
protocols/src/main/dfdl/org/apache/plc4x/protocols/s7-protocol.dfdl.xsd
create mode 100644
protocols/src/main/dfdl/org/apache/plc4x/protocols/tpkt-protocol.dfdl.xsd
copy plc4j/protocols/ads/LINKS.md => protocols/src/main/java/.keepMe (86%)
create mode 100644
protocols/src/test/java/org/apache/plc4x/protocols/AbstractProtocolTest.java
copy plc4j/api/src/test/java/org/apache/plc4x/java/mock/MockPlcConnection.java
=> protocols/src/test/java/org/apache/plc4x/protocols/TpktProtocolTest.java
(74%)
create mode 100644
protocols/src/test/resources/org/apache/plc4x/protocols/tpkt-protocol.tdml
