Tweak OSGi feature set.

Signed-off-by: Łukasz Dywicki <luke@code-house.org>
ConnectorIO · May 2, 2024 · ae5cdfb · ae5cdfb
1 parent 6541cc2
commit ae5cdfb
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/features/org.connectorio.plc4x.extras.feature.osgi/src/main/feature/feature.xml b/features/org.connectorio.plc4x.extras.feature.osgi/src/main/feature/feature.xml
@@ -41,7 +41,7 @@
     <feature prerequisite="true">wrap</feature>
     <feature>plc4j-commons-lang</feature>
 
-    <bundle>wrap:mvn:org.apache.plc4x/plc4j-api/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-api&amp;overwrite=merge&amp;Import-Package=!java,org.slf4j;version=1.7,*</bundle>
+    <bundle>wrap:mvn:org.apache.plc4x/plc4j-api/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-api&amp;overwrite=merge&amp;Import-Package=!java.*,org.slf4j;version=1.7,*</bundle>
   </feature>
 
   <feature name="plc4j-spi" description="Apache PLC4X SPI" version="${plc4x.version}">
@@ -51,8 +51,8 @@
     <feature>plc4j-shared-deps</feature>
     <bundle>mvn:commons-codec/commons-codec/1.15</bundle>
 
-    <bundle>wrap:mvn:org.apache.plc4x/plc4j-spi/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-spi&amp;overwrite=merge&amp;Import-Package=!java,com.fasterxml.jackson.*;resolution:="optional",*</bundle>
-    <bundle>wrap:mvn:org.apache.plc4x/plc4j-osgi/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-osgi&amp;overwrite=merge&amp;Import-Package=!java,*</bundle>
+    <bundle>wrap:mvn:org.apache.plc4x/plc4j-spi/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-spi&amp;overwrite=merge&amp;Import-Package=!java.*,com.fasterxml.jackson.*;resolution:="optional",*</bundle>
+    <bundle>wrap:mvn:org.apache.plc4x/plc4j-osgi/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-osgi&amp;overwrite=merge&amp;Import-Package=!java.*,*</bundle>
 
     <bundle>mvn:io.vavr/vavr/0.10.4</bundle>
     <!--    <bundle>mvn:io.vavr/vavr-match/0.10.4</bundle>-->
@@ -104,21 +104,21 @@
   <feature name="plc4j-transport-tcp" version="${plc4x.version}">
     <feature prerequisite="true">wrap</feature>
     <feature>plc4j-spi</feature>
-    <bundle>wrap:mvn:org.apache.plc4x/plc4j-transport-tcp/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-transport-tcp&amp;SPI-Provider=*&amp;overwrite=merge&amp;Import-Package=!java,org.slf4j;version=1.7,*</bundle>
+    <bundle>wrap:mvn:org.apache.plc4x/plc4j-transport-tcp/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-transport-tcp&amp;SPI-Provider=*&amp;overwrite=merge&amp;Import-Package=!java.*,org.slf4j;version=1.7,*</bundle>
   </feature>
 
   <feature name="plc4j-transport-serial" version="${plc4x.version}">
     <feature prerequisite="true">wrap</feature>
     <feature>plc4j-netty-serial</feature>
     <feature>plc4j-spi</feature>
     <bundle>mvn:com.fazecast/jSerialComm/2.10.2</bundle>
-    <bundle>wrap:mvn:org.apache.plc4x/plc4j-transport-serial/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-transport-serial&amp;SPI-Provider=*&amp;overwrite=merge&amp;Import-Package=!java,org.slf4j;version=1.7,*</bundle>
+    <bundle>wrap:mvn:org.apache.plc4x/plc4j-transport-serial/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-transport-serial&amp;SPI-Provider=*&amp;overwrite=merge&amp;Import-Package=!java.*,org.slf4j;version=1.7,*</bundle>
   </feature>
 
   <feature name="plc4j-transport-can" version="${plc4x.version}">
     <feature prerequisite="true">wrap</feature>
     <feature>plc4j-spi</feature>
-    <bundle>wrap:mvn:org.apache.plc4x/plc4j-transport-can/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-transport-can&amp;SPI-Provider=*&amp;overwrite=merge&amp;Import-Package=!java,org.slf4j;version=1.7,*</bundle>
+    <bundle>wrap:mvn:org.apache.plc4x/plc4j-transport-can/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-transport-can&amp;SPI-Provider=*&amp;overwrite=merge&amp;Import-Package=!java.*,org.slf4j;version=1.7,*</bundle>
   </feature>
 
   <feature name="javacan" version="${javacan.version}">
@@ -162,7 +162,7 @@
     <feature prerequisite="true">wrap</feature>
     <feature>plc4j-javacan</feature>
     <feature>plc4j-transport-can</feature>
-    <bundle>wrap:mvn:org.apache.plc4x/plc4j-transport-socketcan/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-transport-socketcan&amp;SPI-Provider=*&amp;overwrite=merge&amp;Import-Package=!java,org.slf4j;version=1.7,*</bundle>
+    <bundle>wrap:mvn:org.apache.plc4x/plc4j-transport-socketcan/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-transport-socketcan&amp;SPI-Provider=*&amp;overwrite=merge&amp;Import-Package=!java.*,org.slf4j;version=1.7,*</bundle>
   </feature>
 
   <feature name="plc4j-ads-driver" description="Apache PLC4X - ADS driver" version="${plc4x.version}">
@@ -172,7 +172,7 @@
     <feature>plc4j-transport-tcp</feature>
     <feature>plc4j-transport-serial</feature>
 
-    <bundle>wrap:mvn:org.apache.plc4x/plc4j-driver-ads/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-driver-ads&amp;SPI-Provider=*&amp;SPI-Consumer=*&amp;overwrite=merge&amp;Import-Package=!java,org.slf4j;version=1.7,*</bundle>
+    <bundle>wrap:mvn:org.apache.plc4x/plc4j-driver-ads/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-driver-ads&amp;SPI-Provider=*&amp;SPI-Consumer=*&amp;overwrite=merge&amp;Import-Package=!java.*,org.slf4j;version=1.7,*</bundle>
     <bundle>wrap:mvn:com.github.snksoft/crc/1.0.1</bundle>
   </feature>
 
@@ -187,7 +187,7 @@
       <feature>plc4j-transport-socketcan</feature>
     </conditional>
 
-    <bundle>wrap:mvn:org.apache.plc4x/plc4j-driver-can/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-driver-can&amp;SPI-Provider=*&amp;SPI-Consumer=*&amp;overwrite=merge&amp;Import-Package=!java,org.slf4j;version=1.7,*</bundle>
+    <bundle>wrap:mvn:org.apache.plc4x/plc4j-driver-can/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-driver-can&amp;SPI-Provider=*&amp;SPI-Consumer=*&amp;overwrite=merge&amp;Import-Package=!java.*,org.slf4j;version=1.7,*</bundle>
   </feature>
 
   <feature name="plc4j-canopen-driver" description="Apache PLC4X - CANopen driver" version="${plc4x.version}">
@@ -196,7 +196,7 @@
     <feature>plc4j-api</feature>
     <feature>plc4j-can-driver</feature>
 
-    <bundle>wrap:mvn:org.apache.plc4x/plc4j-driver-canopen/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-driver-canopen&amp;SPI-Provider=*&amp;SPI-Consumer=*&amp;overwrite=merge&amp;Import-Package=!java,org.slf4j;version=1.7,*</bundle>
+    <bundle>wrap:mvn:org.apache.plc4x/plc4j-driver-canopen/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-driver-canopen&amp;SPI-Provider=*&amp;SPI-Consumer=*&amp;overwrite=merge&amp;Import-Package=!java.*,org.slf4j;version=1.7,*</bundle>
   </feature>
 
   <feature name="plc4j-eip-driver" description="Apache PLC4X - Ethernet/IP driver" version="${plc4x.version}">
@@ -205,7 +205,7 @@
     <feature>plc4j-api</feature>
     <feature>plc4j-transport-tcp</feature>
 
-    <bundle>wrap:mvn:org.apache.plc4x/plc4j-driver-eip/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-driver-eip&amp;SPI-Provider=*&amp;SPI-Consumer=*&amp;overwrite=merge&amp;Import-Package=!java,org.slf4j;version=1.7,*</bundle>
+    <bundle>wrap:mvn:org.apache.plc4x/plc4j-driver-eip/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-driver-eip&amp;SPI-Provider=*&amp;SPI-Consumer=*&amp;overwrite=merge&amp;Import-Package=!java.*,org.slf4j;version=1.7,*</bundle>
   </feature>
 
   <feature name="plc4j-opcua-driver" description="Apache PLC4X - OPCUA driver" version="${plc4x.version}">
@@ -219,7 +219,7 @@
     <bundle dependency="true">mvn:org.bouncycastle/bcprov-jdk15on/1.70</bundle>
     <bundle dependency="true">mvn:org.bouncycastle/bcpkix-jdk15on/1.70</bundle>
     <bundle dependency="true">mvn:org.bouncycastle/bcutil-jdk15on/1.70</bundle>
-    <bundle>wrap:mvn:org.apache.plc4x/plc4j-driver-opcua/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-driver-opcua&amp;SPI-Provider=*&amp;SPI-Consumer=*&amp;overwrite=merge&amp;Import-Package=!java,org.slf4j;version=1.7,*</bundle>
+    <bundle>wrap:mvn:org.apache.plc4x/plc4j-driver-opcua/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-driver-opcua&amp;SPI-Provider=*&amp;SPI-Consumer=*&amp;overwrite=merge&amp;Import-Package=!java.*,org.slf4j;version=1.7,*</bundle>
   </feature>
 
   <!--
@@ -242,7 +242,7 @@
     <feature>plc4j-api</feature>
     <feature>plc4j-transport-tcp</feature>
     <bundle>mvn:org.json/json/20230618</bundle>
-    <bundle>wrap:mvn:org.apache.plc4x/plc4j-driver-s7/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-driver-s7&amp;SPI-Provider=*&amp;SPI-Consumer=*&amp;overwrite=merge&amp;Import-Package=!java,org.slf4j;version=1.7,*</bundle>
+    <bundle>wrap:mvn:org.apache.plc4x/plc4j-driver-s7/${plc4x.version}$Bundle-SymbolicName=org.apache.plc4x.plc4j-driver-s7&amp;SPI-Provider=*&amp;SPI-Consumer=*&amp;overwrite=merge&amp;Import-Package=!java.*,org.slf4j;version=1.7,*</bundle>
   </feature>
 
 </features>