fix: Made kura.nn dependency to linux.position optional

Signed-off-by: Nicola Timeus <nicola.timeus@eurotech.com>

Author: nicolatimeus

kura/org.eclipse.kura.linux.position/META-INF/MANIFEST.MF

@@ -21,10 +21,11 @@ Import-Package: de.taimos.gpsd4java.api;version="[1.0,2.0)",
  org.eclipse.kura.usb;version="[1.0,2.0)",
  org.osgi.framework,
  org.osgi.service.component;version="1.2.0",
+ org.osgi.service.condition;version="[1.0,2.0)",
  org.osgi.service.event;version="1.3.0",
  org.osgi.service.io;version="1.0.0",
  org.osgi.util.measurement;version="1.0.1",
  org.osgi.util.position;version="1.0.1",
  org.slf4j;version="1.6.4"
 Export-Package: org.eclipse.kura.linux.position.options;version="1.0.0";x-internal:=true,
- org.eclipse.kura.linux.position.provider;version="1.0.0";x-internal:=true
+ org.eclipse.kura.linux.position.provider;version="1.1.0";x-internal:=true

kura/org.eclipse.kura.linux.position/build.properties

@@ -17,10 +17,7 @@ bin.includes = .,\
                about.html,\
                about_files/
 source.. = src/main/java/
-additional.bundles = org.eclipse.kura.api,\
-                     slf4j.api,\
-                     org.eclipse.osgi,\
-                     org.eclipse.osgi.util,\
-                     org.eclipse.equinox.io
+additional.bundles = org.osgi.service.component.annotations,\
+                     org.osgi.service.metatype.annotations
 src.includes = about.html,\
                about_files/

kura/org.eclipse.kura.linux.position/pom.xml

@@ -32,4 +32,13 @@
 		<kura.basedir>${project.basedir}/..</kura.basedir>
 		<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../test/org.eclipse.kura.linux.position.test/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 	</properties>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>

kura/org.eclipse.kura.nm/META-INF/MANIFEST.MF

@@ -29,8 +29,8 @@ Import-Package: jakarta.xml.bind;version="4.0.0",
  org.eclipse.kura.linux.net.dns;version="[1.1,2.0)",
  org.eclipse.kura.linux.net.iptables;version="[1.0,2.0)",
  org.eclipse.kura.linux.net.util;version="[1.0,2.0)",
- org.eclipse.kura.linux.position.options;version="[1.0,2.0)",
- org.eclipse.kura.linux.position.provider;version="[1.0,1.1)",
+ org.eclipse.kura.linux.position.options;version="[1.0,2.0)";resolution:=optional,
+ org.eclipse.kura.linux.position.provider;version="[1.1,2.0)";resolution:=optional,
  org.eclipse.kura.net;version="[2.4,3.0)",
  org.eclipse.kura.net.configuration;version="[1.1,2.0)",
  org.eclipse.kura.net.dhcp;version="[1.2,2.0)",
@@ -49,6 +49,7 @@ Import-Package: jakarta.xml.bind;version="4.0.0",
  org.eclipse.kura.usb;version="[1.0,2.0)",
  org.osgi.framework;version="1.5.0",
  org.osgi.service.component;version="1.2.0",
+ org.osgi.service.condition;version="[1.0.0,2.0.0)",
  org.osgi.service.event;version="1.3.0",
  org.osgi.service.io;version="1.0.0",
  org.osgi.service.useradmin;version="1.0.0",

kura/org.eclipse.kura.nm/build.properties

@@ -34,3 +34,5 @@ bin.includes = .,\
                lib/jnr-x86asm-1.0.2.jar
 src.includes = about.html,\
                about_files
+additional.bundles = org.osgi.service.component.annotations,\
+                     org.osgi.service.metatype.annotations

kura/org.eclipse.kura.nm/pom.xml

@@ -123,6 +123,10 @@
                     </execution>
                 </executions>
             </plugin>
+           	<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-maven-plugin</artifactId>
+			</plugin>
         </plugins>
     </build>
 </project>

kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/position/MMPositionProvider.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Eurotech and/or its affiliates and others
+ * Copyright (c) 2024, 2025 Eurotech and/or its affiliates and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -24,6 +24,7 @@
 
 import org.eclipse.kura.linux.position.options.PositionServiceOptions;
 import org.eclipse.kura.linux.position.provider.GpsDeviceAvailabilityListener;
+import org.eclipse.kura.linux.position.provider.LinuxPositionProviderConstants;
 import org.eclipse.kura.linux.position.provider.LockStatusListener;
 import org.eclipse.kura.linux.position.provider.PositionProvider;
 import org.eclipse.kura.linux.position.provider.PositionProviderType;
@@ -35,10 +36,18 @@
 import org.freedesktop.dbus.types.UInt32;
 import org.freedesktop.dbus.types.Variant;
 import org.freedesktop.modemmanager1.modem.Location;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.condition.Condition;
 import org.osgi.util.position.Position;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Component(name = "ModemManagerPositionProvider", //
+        property = "service.pid=org.eclipse.kura.nm.position.MMPositionProvider", //
+        reference = @Reference(name = "LinuxPositionProviderCondition", service = Condition.class, //
+                target = "(" + Condition.CONDITION_ID + "=" + LinuxPositionProviderConstants.CONDITION_ID + ")" //
+        ))
 public class MMPositionProvider implements PositionProvider {
 
     private static final Logger logger = LoggerFactory.getLogger(MMPositionProvider.class);