You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by er...@apache.org on 2020/05/12 08:09:11 UTC
[plc4x] 03/03: Merge remote-tracking branch 'origin/develop' into
develop
This is an automated email from the ASF dual-hosted git repository.
erobinet pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 00c2ad89ab11fd451269993975afbbc6f52f61c1
Merge: aca63e7 fac24fe
Author: Etienne Robinet <et...@gmail.com>
AuthorDate: Tue May 12 10:02:49 2020 +0200
Merge remote-tracking branch 'origin/develop' into develop
RELEASE_NOTES | 2 ++
plc4j/drivers/firmata/pom.xml | 12 ++++++++++++
plc4j/drivers/knxnetip/pom.xml | 12 ++++++++++++
plc4j/drivers/modbus/pom.xml | 12 ++++++++++++
4 files changed, 38 insertions(+)
diff --cc plc4j/drivers/firmata/pom.xml
index 375de9c,375de9c..c4b6d50
--- a/plc4j/drivers/firmata/pom.xml
+++ b/plc4j/drivers/firmata/pom.xml
@@@ -50,6 -50,6 +50,18 @@@
</executions>
</plugin>
<plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
++ <configuration>
++ <instructions>
++ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
++ <Bundle-Activator>org.apache.plc4x.java.osgi.DriverActivator</Bundle-Activator>
++ <Export-Service>org.apache.plc4x.java.api.PlcDriver,org.apache.plc4x.java.firmata.readwrite.FirmataDriver</Export-Service>
++ </instructions>
++ </configuration>
++ </plugin>
++ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
diff --cc plc4j/drivers/knxnetip/pom.xml
index 1302fa1,1302fa1..53fec49
--- a/plc4j/drivers/knxnetip/pom.xml
+++ b/plc4j/drivers/knxnetip/pom.xml
@@@ -50,6 -50,6 +50,18 @@@
</executions>
</plugin>
<plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
++ <configuration>
++ <instructions>
++ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
++ <Bundle-Activator>org.apache.plc4x.java.osgi.DriverActivator</Bundle-Activator>
++ <Export-Service>org.apache.plc4x.java.api.PlcDriver,org.apache.plc4x.java.knxnetip.KnxNetIpDriver</Export-Service>
++ </instructions>
++ </configuration>
++ </plugin>
++ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
diff --cc plc4j/drivers/modbus/pom.xml
index ceecc37,ceecc37..7f85b59
--- a/plc4j/drivers/modbus/pom.xml
+++ b/plc4j/drivers/modbus/pom.xml
@@@ -51,6 -51,6 +51,18 @@@
</executions>
</plugin>
<plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
++ <configuration>
++ <instructions>
++ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
++ <Bundle-Activator>org.apache.plc4x.java.osgi.DriverActivator</Bundle-Activator>
++ <Export-Service>org.apache.plc4x.java.api.PlcDriver,org.apache.plc4x.java.modbus.ModbusDriver</Export-Service>
++ </instructions>
++ </configuration>
++ </plugin>
++ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>