From c94292698a44eb08739e53702babaa7a938a4c31 Mon Sep 17 00:00:00 2001
From: mishako <mishako@users.noreply.github.com>
Date: Sat, 27 Feb 2016 00:17:19 +0100
Subject: [PATCH] Fix OSGi bundling configuration

It got mixed up during the mega-merge when we merged multiple
repositories into one. The mega-merge branch did not include the latest
commit from master. As a result, rebase applied that commit to the
wrong pom.xml file.
---
 pom.xml      | 29 -----------------------------
 rome/pom.xml | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9bf38db..69b0fb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,35 +143,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Export-Package>
-                            com.rometools.rome.feed,
-                            com.rometools.rome.feed.atom,
-                            com.rometools.rome.feed.impl,
-                            com.rometools.rome.feed.module,
-                            com.rometools.rome.feed.rss,
-                            com.rometools.rome.feed.synd,
-                            com.rometools.rome.io,
-                        </Export-Package>
-                        <Import-Package>
-                            org.jdom2,
-                            org.jdom2.filter,
-                            org.jdom2.input,
-                            org.jdom2.input.sax,
-                            org.jdom2.output,
-                            org.slf4j,
-                            org.w3c.dom,
-                            org.xml.sax
-                        </Import-Package>
-                        <_exportcontents>com.rometools.utils</_exportcontents>
-                        <Embed-Dependency>rome-utils</Embed-Dependency>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </reporting>
 
diff --git a/rome/pom.xml b/rome/pom.xml
index 863dcb7..65cb87b 100644
--- a/rome/pom.xml
+++ b/rome/pom.xml
@@ -128,6 +128,35 @@
                     <content>${project.build.directory}/site</content>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            com.rometools.rome.feed,
+                            com.rometools.rome.feed.atom,
+                            com.rometools.rome.feed.impl,
+                            com.rometools.rome.feed.module,
+                            com.rometools.rome.feed.rss,
+                            com.rometools.rome.feed.synd,
+                            com.rometools.rome.io,
+                        </Export-Package>
+                        <Import-Package>
+                            org.jdom2,
+                            org.jdom2.filter,
+                            org.jdom2.input,
+                            org.jdom2.input.sax,
+                            org.jdom2.output,
+                            org.slf4j,
+                            org.w3c.dom,
+                            org.xml.sax
+                        </Import-Package>
+                        <_exportcontents>com.rometools.utils</_exportcontents>
+                        <Embed-Dependency>rome-utils</Embed-Dependency>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>