From 9ca1b855a9775e6d3e4d7c4f6b032e9bd3d0009c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0irok=C3=BD?= <siroky.petr@gmail.com>
Date: Wed, 27 Apr 2016 13:06:45 +0200
Subject: [PATCH] [DROOLS-1129] consistent OSGi Bundle-SymbolicName for all
 jars (#188)

---
 optaplanner-benchmark/pom.xml                                | 5 ++++-
 optaplanner-core/pom.xml                                     | 5 ++++-
 .../optaplanner-persistence-common/pom.xml                   | 5 ++++-
 optaplanner-persistence/optaplanner-persistence-jpa/pom.xml  | 3 ++-
 .../optaplanner-persistence-xstream/pom.xml                  | 5 ++++-
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/optaplanner-benchmark/pom.xml b/optaplanner-benchmark/pom.xml
index 8471c0ed95..3e552f1b4d 100644
--- a/optaplanner-benchmark/pom.xml
+++ b/optaplanner-benchmark/pom.xml
@@ -21,6 +21,10 @@
     This module contains the benchmarker toolkit.
   </description>
 
+  <properties>
+    <osgi.Bundle-SymbolicName>org.optaplanner.benchmark</osgi.Bundle-SymbolicName>
+  </properties>
+
   <dependencies>
     <!-- Internal dependencies -->
     <dependency>
@@ -103,7 +107,6 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-SymbolicName>org.optaplanner.benchmark</Bundle-SymbolicName>
             <Export-Package>
               org.optaplanner.benchmark.*
             </Export-Package>
diff --git a/optaplanner-core/pom.xml b/optaplanner-core/pom.xml
index 7df6683d0e..14e1d4ec56 100644
--- a/optaplanner-core/pom.xml
+++ b/optaplanner-core/pom.xml
@@ -21,6 +21,10 @@
     This module contains the planning engine itself.
   </description>
 
+  <properties>
+    <osgi.Bundle-SymbolicName>org.optaplanner.core</osgi.Bundle-SymbolicName>
+  </properties>
+
   <dependencies>
     <!-- Internal dependencies -->
     <dependency>
@@ -92,7 +96,6 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
-            <Bundle-SymbolicName>org.optaplanner.core</Bundle-SymbolicName>
             <Export-Package>
               org.optaplanner.core.*
             </Export-Package>
diff --git a/optaplanner-persistence/optaplanner-persistence-common/pom.xml b/optaplanner-persistence/optaplanner-persistence-common/pom.xml
index f89235bdfb..ef2adf71a9 100644
--- a/optaplanner-persistence/optaplanner-persistence-common/pom.xml
+++ b/optaplanner-persistence/optaplanner-persistence-common/pom.xml
@@ -21,6 +21,10 @@
     This module contains the common persistence integration.
   </description>
 
+  <properties>
+    <osgi.Bundle-SymbolicName>org.optaplanner.persistence.common</osgi.Bundle-SymbolicName>
+  </properties>
+
   <dependencies>
     <!-- Internal dependencies -->
     <dependency>
@@ -67,7 +71,6 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-SymbolicName>org.optaplanner.persistence.common</Bundle-SymbolicName>
             <Export-Package>
               org.optaplanner.persistence.common.*
             </Export-Package>
diff --git a/optaplanner-persistence/optaplanner-persistence-jpa/pom.xml b/optaplanner-persistence/optaplanner-persistence-jpa/pom.xml
index 53d29f8fb2..46315c17ba 100644
--- a/optaplanner-persistence/optaplanner-persistence-jpa/pom.xml
+++ b/optaplanner-persistence/optaplanner-persistence-jpa/pom.xml
@@ -96,6 +96,8 @@
   </dependencies>
 
   <properties>
+    <osgi.Bundle-SymbolicName>org.optaplanner.persistence.jpa</osgi.Bundle-SymbolicName>
+
     <maven.btm.maxPoolSize>16</maven.btm.maxPoolSize>
     <maven.hibernate.dialect>org.hibernate.dialect.H2Dialect</maven.hibernate.dialect>
     <maven.datasource.classname>bitronix.tm.resource.jdbc.lrc.LrcXADataSource</maven.datasource.classname>
@@ -128,7 +130,6 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-SymbolicName>org.optaplanner.persistence.jpa</Bundle-SymbolicName>
             <Export-Package>
               org.optaplanner.persistence.jpa.*
             </Export-Package>
diff --git a/optaplanner-persistence/optaplanner-persistence-xstream/pom.xml b/optaplanner-persistence/optaplanner-persistence-xstream/pom.xml
index b2b1dc6a69..ac390f1728 100644
--- a/optaplanner-persistence/optaplanner-persistence-xstream/pom.xml
+++ b/optaplanner-persistence/optaplanner-persistence-xstream/pom.xml
@@ -21,6 +21,10 @@
     This module contains the XStream integration.
   </description>
 
+  <properties>
+    <osgi.Bundle-SymbolicName>org.optaplanner.persistence.xstream</osgi.Bundle-SymbolicName>
+  </properties>
+
   <dependencies>
     <!-- Internal dependencies -->
     <dependency>
@@ -76,7 +80,6 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-SymbolicName>org.optaplanner.persistence.xstream</Bundle-SymbolicName>
             <Export-Package>
               org.optaplanner.persistence.xstream.*
             </Export-Package>