Author: ecki
Date: Sun Jan 18 02:11:32 2015
New Revision: 1652697
URL: http://svn.apache.org/r1652697
Log:
Added commons.osgi.excludeDependencies for bundle-plugin.
Modified:
commons/proper/commons-parent/trunk/pom.xml
commons/proper/commons-parent/trunk/src/changes/changes.xml
Modified: commons/proper/commons-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=1652697&r1=1652696&r2=1652697&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Sun Jan 18 02:11:32 2015
@@ -41,8 +41,11 @@ Version 37:
- merged maven-3 profile into main body (Maven 2 is no longer supported)
- added Animal Sniffer plugin in profile "animal-sniffer". This is active by
default.
The current version of the plugin (1.13) requires Java 7 to report API
violations.
- The default version is set to 1.11 which works with Java 5 unless Maven is
running under Java 7+
+ The default version is set to 1.11 which works with Java 5 unless
jdk7-plugin-fix-version is detected.
- renamed the profile jdk7-findbugs to jdk7-plugin-fix-version
+- OSGI bundle-plugin allows commons.osgi.excludeDependencies to be configured
+ (default is true for compatibility with older versions, it excludes all
dependencies and makes
+ the plugin skip most of its work around attributing packages correctly)
-->
@@ -522,7 +525,7 @@ Version 37:
<archive>
<forced>true</forced>
</archive>
- <excludeDependencies>true</excludeDependencies>
+
<excludeDependencies>${commons.osgi.excludeDependencies}</excludeDependencies>
<manifestLocation>${project.build.directory}/osgi</manifestLocation>
<instructions>
<!-- stops the "uses" clauses being added to "Export-Package"
manifest entry -->
@@ -1443,6 +1446,7 @@ Version 37:
<commons.osgi.import>*</commons.osgi.import>
<commons.osgi.dynamicImport />
<commons.osgi.private />
+ <commons.osgi.excludeDependencies>true</commons.osgi.excludeDependencies>
<!-- location of any manifest file used by maven-jar-plugin -->
<commons.manifestfile>${project.build.directory}/osgi/MANIFEST.MF</commons.manifestfile>
Modified: commons/proper/commons-parent/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/src/changes/changes.xml?rev=1652697&r1=1652696&r2=1652697&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/src/changes/changes.xml (original)
+++ commons/proper/commons-parent/trunk/src/changes/changes.xml Sun Jan 18
02:11:32 2015
@@ -68,9 +68,10 @@ The <action> type attribute can be add,u
<action type="update">merged maven-3 profile into main body (Maven
2 is no longer supported)</action>
<action type="update">Added Animal Sniffer profile (active by
default)</action>
<action type="update">renamed the profile jdk7-findbugs to
jdk7-plugin-fix-version</action>
+ <action type="add">Allow to configure dependency excludes of
bundle-plugin with commons.osgi.excludeDependencies</action>
</release>
- <release version="36" date="2014-12-21" description="Update plugins,
fix release-notes profile.">
+ <release version="36" date="2014-12-21" description="Update plugins,
fix release-notes profile.">
<!-- List each change individually so the changes HTML report is
easier to read -->
<action type="update">Update maven-jxr-plugin 2.4 to 2.5</action>
<action type="update">Update maven-surefire-plugin(s) 2.17 to
2.18</action>
