PatchesAndForks/rome
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix OSGi bundling configuration

Browse source 
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.
This commit is contained in:
mishako 2016-02-27 00:17:19 +01:00
parent 10d6b126a3
commit c94292698a
2 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pom.xml
View file

@ -143,35 +143,6 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>
</plugin> </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> </plugins>
</reporting> </reporting>

29
rome/pom.xml
View file

@ -128,6 +128,35 @@
<content>${project.build.directory}/site</content> <content>${project.build.directory}/site</content>
</configuration> </configuration>
</plugin> </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> </plugins>
</build> </build>