From 638f09798c49cf7218fd99b2bf764409c687eb49 Mon Sep 17 00:00:00 2001
From: bigmarvin <marvin.wu1986@gmail.com>
Date: Wed, 4 Aug 2021 13:45:02 +0800
Subject: [PATCH] [issues/678] update pom.xml accordingly

1. make the artifacts of name simpleclient_tracer_* packed as bundles
2. make the resolution of imported packages optional by default

Signed-off-by: bigmarvin <marvin.wu1986@gmail.com>
---
 pom.xml                                             | 13 ++++++++++++-
 .../simpleclient_tracer_common/pom.xml              |  1 +
 .../simpleclient_tracer_otel/pom.xml                |  1 +
 .../simpleclient_tracer_otel_agent/pom.xml          |  1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2b4a05bde..06a716397 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,6 +153,11 @@
                     <artifactId>maven-enforcer-plugin</artifactId>
                     <version>1.4.1</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>2.4.0</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -193,8 +198,14 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.4.0</version>
                 <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            *;resolution:=optional
+                        </Import-Package>
+                    </instructions>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/simpleclient_tracer/simpleclient_tracer_common/pom.xml b/simpleclient_tracer/simpleclient_tracer_common/pom.xml
index 0f2042ca4..72fc7eb04 100644
--- a/simpleclient_tracer/simpleclient_tracer_common/pom.xml
+++ b/simpleclient_tracer/simpleclient_tracer_common/pom.xml
@@ -10,6 +10,7 @@
 
   <artifactId>simpleclient_tracer_common</artifactId>
   <name>Prometheus Java Span Context Supplier - Common</name>
+  <packaging>bundle</packaging>
 
   <dependencies>
   </dependencies>
diff --git a/simpleclient_tracer/simpleclient_tracer_otel/pom.xml b/simpleclient_tracer/simpleclient_tracer_otel/pom.xml
index 11d36bbf9..1ea7ce6bb 100644
--- a/simpleclient_tracer/simpleclient_tracer_otel/pom.xml
+++ b/simpleclient_tracer/simpleclient_tracer_otel/pom.xml
@@ -10,6 +10,7 @@
 
   <artifactId>simpleclient_tracer_otel</artifactId>
   <name>Prometheus Java Span Context Supplier - OpenTelemetry</name>
+  <packaging>bundle</packaging>
 
   <dependencies>
     <dependency>
diff --git a/simpleclient_tracer/simpleclient_tracer_otel_agent/pom.xml b/simpleclient_tracer/simpleclient_tracer_otel_agent/pom.xml
index 67272ebff..f310667c2 100644
--- a/simpleclient_tracer/simpleclient_tracer_otel_agent/pom.xml
+++ b/simpleclient_tracer/simpleclient_tracer_otel_agent/pom.xml
@@ -10,6 +10,7 @@
 
   <artifactId>simpleclient_tracer_otel_agent</artifactId>
   <name>Prometheus Java Span Context Supplier - OpenTelemetry Agent</name>
+  <packaging>bundle</packaging>
 
   <dependencies>
     <dependency>