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 2019/09/17 13:41:16 UTC
[plc4x] 01/02: - Made sure META-INF doesn't contain DSA and SF
files in shaded uber-jars
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
commit 71aaaccf727fbf5dd8254886ea955d5b055eaa53
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue Sep 17 15:40:18 2019 +0200
- Made sure META-INF doesn't contain DSA and SF files in shaded uber-jars
---
pom.xml | 14 ++++++++++++++
.../src/main/resources/protocols/bacnetip/bacnetip.mspec | 7 ++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1ed3961..61f8996 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1225,6 +1225,20 @@
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
+ <filters>
+ <filter>
+ <!--
+ These files contain signatures for classes, omit them as in
+ shaded archives this has cause quite some problems in the past.
+ -->
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
</configuration>
</plugin>
diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
index 5bbb9bc..8f517af 100644
--- a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
+++ b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec
@@ -86,7 +86,7 @@
[simple uint 6 'invokeId']
[optional uint 8 'sequenceNumber' 'segmentedMessage']
[optional uint 8 'proposedWindowSize' 'segmentedMessage']
- [simple BACnetUnconfirmedServiceRequest 'serviceRequest']
+ [simple BACnetConfirmedServiceRequest 'serviceRequest']
]
['0x1' APDUUnconfirmedRequest
[reserved uint 4 '0']
@@ -142,6 +142,11 @@
['0x00' BACnetConfirmedServiceRequestAcknowledgeAlarm
]
['0x01' BACnetConfirmedServiceRequestConfirmedCOVNotification
+ subscriber-process-identifier (Unsigned32)
+ initiating-device-identifier (BACnetObjectIdentifier)
+ monitored-object-identifier (BACnetObjectIdentifier)
+ time-remaining (Unsigned)
+ list-of-values (SEQUENCE OF BACnetPropertyValue)
]
['0x1F' BACnetConfirmedServiceRequestConfirmedCOVNotificationMultiple
]