Modified:
websites/staging/felix/trunk/content/components/bundle-plugin/xref/org/apache/felix/bundleplugin/BundlePlugin.html
==============================================================================
---
websites/staging/felix/trunk/content/components/bundle-plugin/xref/org/apache/felix/bundleplugin/BundlePlugin.html
(original)
+++
websites/staging/felix/trunk/content/components/bundle-plugin/xref/org/apache/felix/bundleplugin/BundlePlugin.html
Mon Aug 19 08:39:57 2019
@@ -606,1570 +606,1572 @@
<a class="jxr_linenumber" name="L598" href="#L598">598</a>
builder.setProperties( sanitize( properties ) );
<a class="jxr_linenumber" name="L599" href="#L599">599</a> <strong
class="jxr_keyword">if</strong> ( classpath != <strong
class="jxr_keyword">null</strong> )
<a class="jxr_linenumber" name="L600" href="#L600">600</a> {
-<a class="jxr_linenumber" name="L601" href="#L601">601</a> Jar[]
jars = <strong class="jxr_keyword">new</strong> Jar[ classpath.length ];
+<a class="jxr_linenumber" name="L601" href="#L601">601</a>
List<Jar> jars = <strong class="jxr_keyword">new</strong>
ArrayList<>();
<a class="jxr_linenumber" name="L602" href="#L602">602</a> <strong
class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i =
0; i < classpath.length; i++ ) {
-<a class="jxr_linenumber" name="L603" href="#L603">603</a>
jars[i] = <strong class="jxr_keyword">new</strong> Jar( classpath[i].id,
classpath[i].file );
-<a class="jxr_linenumber" name="L604" href="#L604">604</a> }
-<a class="jxr_linenumber" name="L605" href="#L605">605</a>
builder.setClasspath( jars );
-<a class="jxr_linenumber" name="L606" href="#L606">606</a> }
-<a class="jxr_linenumber" name="L607" href="#L607">607</a>
-<a class="jxr_linenumber" name="L608" href="#L608">608</a> <strong
class="jxr_keyword">return</strong> builder;
-<a class="jxr_linenumber" name="L609" href="#L609">609</a> }
-<a class="jxr_linenumber" name="L610" href="#L610">610</a>
-<a class="jxr_linenumber" name="L611" href="#L611">611</a>
-<a class="jxr_linenumber" name="L612" href="#L612">612</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">static</strong> Properties sanitize( Properties properties )
-<a class="jxr_linenumber" name="L613" href="#L613">613</a> {
-<a class="jxr_linenumber" name="L614" href="#L614">614</a> <em
class="jxr_comment">// convert any non-String keys/values to Strings</em>
-<a class="jxr_linenumber" name="L615" href="#L615">615</a> Properties
sanitizedEntries = <strong class="jxr_keyword">new</strong> Properties();
-<a class="jxr_linenumber" name="L616" href="#L616">616</a> <strong
class="jxr_keyword">for</strong> (
Iterator<Map.Entry<Object,Object>> itr =
properties.entrySet().iterator(); itr.hasNext(); )
-<a class="jxr_linenumber" name="L617" href="#L617">617</a> {
-<a class="jxr_linenumber" name="L618" href="#L618">618</a>
Map.Entry<Object,Object> entry = itr.next();
-<a class="jxr_linenumber" name="L619" href="#L619">619</a> <strong
class="jxr_keyword">if</strong> ( !(entry.getKey() instanceof String) )
-<a class="jxr_linenumber" name="L620" href="#L620">620</a> {
-<a class="jxr_linenumber" name="L621" href="#L621">621</a>
String key = sanitize(entry.getKey());
-<a class="jxr_linenumber" name="L622" href="#L622">622</a>
<strong class="jxr_keyword">if</strong> ( !properties.containsKey( key ) )
-<a class="jxr_linenumber" name="L623" href="#L623">623</a> {
-<a class="jxr_linenumber" name="L624" href="#L624">624</a>
sanitizedEntries.setProperty( key, sanitize( entry.getValue() ) );
-<a class="jxr_linenumber" name="L625" href="#L625">625</a> }
-<a class="jxr_linenumber" name="L626" href="#L626">626</a>
itr.remove();
-<a class="jxr_linenumber" name="L627" href="#L627">627</a> }
-<a class="jxr_linenumber" name="L628" href="#L628">628</a> <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (
!(entry.getValue() instanceof String) )
-<a class="jxr_linenumber" name="L629" href="#L629">629</a> {
-<a class="jxr_linenumber" name="L630" href="#L630">630</a>
entry.setValue( sanitize( entry.getValue() ) );
-<a class="jxr_linenumber" name="L631" href="#L631">631</a> }
-<a class="jxr_linenumber" name="L632" href="#L632">632</a> }
-<a class="jxr_linenumber" name="L633" href="#L633">633</a>
properties.putAll( sanitizedEntries );
-<a class="jxr_linenumber" name="L634" href="#L634">634</a> <strong
class="jxr_keyword">return</strong> properties;
-<a class="jxr_linenumber" name="L635" href="#L635">635</a> }
-<a class="jxr_linenumber" name="L636" href="#L636">636</a>
-<a class="jxr_linenumber" name="L637" href="#L637">637</a>
-<a class="jxr_linenumber" name="L638" href="#L638">638</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">static</strong> String sanitize( Object value )
-<a class="jxr_linenumber" name="L639" href="#L639">639</a> {
-<a class="jxr_linenumber" name="L640" href="#L640">640</a> <strong
class="jxr_keyword">if</strong> ( value instanceof String )
-<a class="jxr_linenumber" name="L641" href="#L641">641</a> {
-<a class="jxr_linenumber" name="L642" href="#L642">642</a> <strong
class="jxr_keyword">return</strong> ( String ) value;
-<a class="jxr_linenumber" name="L643" href="#L643">643</a> }
-<a class="jxr_linenumber" name="L644" href="#L644">644</a> <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (
value instanceof Iterable )
-<a class="jxr_linenumber" name="L645" href="#L645">645</a> {
-<a class="jxr_linenumber" name="L646" href="#L646">646</a> String
delim = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L647" href="#L647">647</a>
StringBuilder buf = <strong class="jxr_keyword">new</strong> StringBuilder();
-<a class="jxr_linenumber" name="L648" href="#L648">648</a> <strong
class="jxr_keyword">for</strong> ( Object i : ( Iterable<?> ) value )
-<a class="jxr_linenumber" name="L649" href="#L649">649</a> {
-<a class="jxr_linenumber" name="L650" href="#L650">650</a>
buf.append( delim ).append( i );
-<a class="jxr_linenumber" name="L651" href="#L651">651</a>
delim = <span class="jxr_string">", "</span>;
-<a class="jxr_linenumber" name="L652" href="#L652">652</a> }
-<a class="jxr_linenumber" name="L653" href="#L653">653</a> <strong
class="jxr_keyword">return</strong> buf.toString();
-<a class="jxr_linenumber" name="L654" href="#L654">654</a> }
-<a class="jxr_linenumber" name="L655" href="#L655">655</a> <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (
value.getClass().isArray() )
-<a class="jxr_linenumber" name="L656" href="#L656">656</a> {
-<a class="jxr_linenumber" name="L657" href="#L657">657</a> String
delim = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L658" href="#L658">658</a>
StringBuilder buf = <strong class="jxr_keyword">new</strong> StringBuilder();
-<a class="jxr_linenumber" name="L659" href="#L659">659</a> <strong
class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i =
0, len = Array.getLength( value ); i < len; i++ )
-<a class="jxr_linenumber" name="L660" href="#L660">660</a> {
-<a class="jxr_linenumber" name="L661" href="#L661">661</a>
buf.append( delim ).append( Array.get( value, i ) );
-<a class="jxr_linenumber" name="L662" href="#L662">662</a>
delim = <span class="jxr_string">", "</span>;
-<a class="jxr_linenumber" name="L663" href="#L663">663</a> }
-<a class="jxr_linenumber" name="L664" href="#L664">664</a> <strong
class="jxr_keyword">return</strong> buf.toString();
-<a class="jxr_linenumber" name="L665" href="#L665">665</a> }
-<a class="jxr_linenumber" name="L666" href="#L666">666</a> <strong
class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L667" href="#L667">667</a> {
-<a class="jxr_linenumber" name="L668" href="#L668">668</a> <strong
class="jxr_keyword">return</strong> String.valueOf( value );
-<a class="jxr_linenumber" name="L669" href="#L669">669</a> }
-<a class="jxr_linenumber" name="L670" href="#L670">670</a> }
-<a class="jxr_linenumber" name="L671" href="#L671">671</a>
-<a class="jxr_linenumber" name="L672" href="#L672">672</a>
-<a class="jxr_linenumber" name="L673" href="#L673">673</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">void</strong> addMavenInstructions(MavenProject
currentProject, Builder builder) <strong class="jxr_keyword">throws</strong>
Exception
-<a class="jxr_linenumber" name="L674" href="#L674">674</a> {
-<a class="jxr_linenumber" name="L675" href="#L675">675</a> <strong
class="jxr_keyword">if</strong> ( currentProject.getBasedir() != <strong
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L676" href="#L676">676</a> {
-<a class="jxr_linenumber" name="L677" href="#L677">677</a> <em
class="jxr_comment">// update BND instructions to add included Maven
resources</em>
-<a class="jxr_linenumber" name="L678" href="#L678">678</a>
includeMavenResources(currentProject, builder, getLog());
-<a class="jxr_linenumber" name="L679" href="#L679">679</a>
-<a class="jxr_linenumber" name="L680" href="#L680">680</a> <em
class="jxr_comment">// Fixup error messages</em>
-<a class="jxr_linenumber" name="L681" href="#L681">681</a>
includeJava9Fixups(currentProject, builder);
-<a class="jxr_linenumber" name="L682" href="#L682">682</a>
-<a class="jxr_linenumber" name="L683" href="#L683">683</a> <em
class="jxr_comment">// calculate default export/private settings based on
sources</em>
-<a class="jxr_linenumber" name="L684" href="#L684">684</a>
addLocalPackages(outputDirectory, builder);
-<a class="jxr_linenumber" name="L685" href="#L685">685</a>
-<a class="jxr_linenumber" name="L686" href="#L686">686</a> <em
class="jxr_comment">// tell BND where the current project source resides</em>
-<a class="jxr_linenumber" name="L687" href="#L687">687</a>
addMavenSourcePath(currentProject, builder, getLog());
-<a class="jxr_linenumber" name="L688" href="#L688">688</a> }
-<a class="jxr_linenumber" name="L689" href="#L689">689</a>
-<a class="jxr_linenumber" name="L690" href="#L690">690</a> <em
class="jxr_comment">// update BND instructions to embed selected Maven
dependencies</em>
-<a class="jxr_linenumber" name="L691" href="#L691">691</a>
Collection<Artifact> embeddableArtifacts = getEmbeddableArtifacts(
currentProject, builder );
-<a class="jxr_linenumber" name="L692" href="#L692">692</a> <a
href="../../../../org/apache/felix/bundleplugin/DependencyEmbedder.html">DependencyEmbedder</a>
dependencyEmbedder = <strong class="jxr_keyword">new</strong> <a
href="../../../../org/apache/felix/bundleplugin/DependencyEmbedder.html">DependencyEmbedder</a>(getLog(),
embeddableArtifacts);
-<a class="jxr_linenumber" name="L693" href="#L693">693</a>
dependencyEmbedder.processHeaders(builder);
-<a class="jxr_linenumber" name="L694" href="#L694">694</a>
-<a class="jxr_linenumber" name="L695" href="#L695">695</a>
Collection<Artifact> embeddedArtifacts =
dependencyEmbedder.getEmbeddedArtifacts();
-<a class="jxr_linenumber" name="L696" href="#L696">696</a> <strong
class="jxr_keyword">if</strong> ( !embeddedArtifacts.isEmpty() &&
createDependencyReducedPom )
-<a class="jxr_linenumber" name="L697" href="#L697">697</a> {
-<a class="jxr_linenumber" name="L698" href="#L698">698</a>
Set<String> embeddedIds = <strong class="jxr_keyword">new</strong>
HashSet<String>();
-<a class="jxr_linenumber" name="L699" href="#L699">699</a> <strong
class="jxr_keyword">for</strong> ( Artifact artifact : embeddedArtifacts )
-<a class="jxr_linenumber" name="L700" href="#L700">700</a> {
-<a class="jxr_linenumber" name="L701" href="#L701">701</a>
embeddedIds.add( getId( artifact ) );
-<a class="jxr_linenumber" name="L702" href="#L702">702</a> }
-<a class="jxr_linenumber" name="L703" href="#L703">703</a>
createDependencyReducedPom( embeddedIds );
-<a class="jxr_linenumber" name="L704" href="#L704">704</a>
-<a class="jxr_linenumber" name="L705" href="#L705">705</a> }
+<a class="jxr_linenumber" name="L603" href="#L603">603</a>
<strong class="jxr_keyword">if</strong> ( classpath[i].file.exists() ) {
+<a class="jxr_linenumber" name="L604" href="#L604">604</a>
jars.add( <strong class="jxr_keyword">new</strong> Jar( classpath[i].id,
classpath[i].file ) );
+<a class="jxr_linenumber" name="L605" href="#L605">605</a> }
+<a class="jxr_linenumber" name="L606" href="#L606">606</a> }
+<a class="jxr_linenumber" name="L607" href="#L607">607</a>
builder.setClasspath( jars );
+<a class="jxr_linenumber" name="L608" href="#L608">608</a> }
+<a class="jxr_linenumber" name="L609" href="#L609">609</a>
+<a class="jxr_linenumber" name="L610" href="#L610">610</a> <strong
class="jxr_keyword">return</strong> builder;
+<a class="jxr_linenumber" name="L611" href="#L611">611</a> }
+<a class="jxr_linenumber" name="L612" href="#L612">612</a>
+<a class="jxr_linenumber" name="L613" href="#L613">613</a>
+<a class="jxr_linenumber" name="L614" href="#L614">614</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">static</strong> Properties sanitize( Properties properties )
+<a class="jxr_linenumber" name="L615" href="#L615">615</a> {
+<a class="jxr_linenumber" name="L616" href="#L616">616</a> <em
class="jxr_comment">// convert any non-String keys/values to Strings</em>
+<a class="jxr_linenumber" name="L617" href="#L617">617</a> Properties
sanitizedEntries = <strong class="jxr_keyword">new</strong> Properties();
+<a class="jxr_linenumber" name="L618" href="#L618">618</a> <strong
class="jxr_keyword">for</strong> (
Iterator<Map.Entry<Object,Object>> itr =
properties.entrySet().iterator(); itr.hasNext(); )
+<a class="jxr_linenumber" name="L619" href="#L619">619</a> {
+<a class="jxr_linenumber" name="L620" href="#L620">620</a>
Map.Entry<Object,Object> entry = itr.next();
+<a class="jxr_linenumber" name="L621" href="#L621">621</a> <strong
class="jxr_keyword">if</strong> ( !(entry.getKey() instanceof String) )
+<a class="jxr_linenumber" name="L622" href="#L622">622</a> {
+<a class="jxr_linenumber" name="L623" href="#L623">623</a>
String key = sanitize(entry.getKey());
+<a class="jxr_linenumber" name="L624" href="#L624">624</a>
<strong class="jxr_keyword">if</strong> ( !properties.containsKey( key ) )
+<a class="jxr_linenumber" name="L625" href="#L625">625</a> {
+<a class="jxr_linenumber" name="L626" href="#L626">626</a>
sanitizedEntries.setProperty( key, sanitize( entry.getValue() ) );
+<a class="jxr_linenumber" name="L627" href="#L627">627</a> }
+<a class="jxr_linenumber" name="L628" href="#L628">628</a>
itr.remove();
+<a class="jxr_linenumber" name="L629" href="#L629">629</a> }
+<a class="jxr_linenumber" name="L630" href="#L630">630</a> <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (
!(entry.getValue() instanceof String) )
+<a class="jxr_linenumber" name="L631" href="#L631">631</a> {
+<a class="jxr_linenumber" name="L632" href="#L632">632</a>
entry.setValue( sanitize( entry.getValue() ) );
+<a class="jxr_linenumber" name="L633" href="#L633">633</a> }
+<a class="jxr_linenumber" name="L634" href="#L634">634</a> }
+<a class="jxr_linenumber" name="L635" href="#L635">635</a>
properties.putAll( sanitizedEntries );
+<a class="jxr_linenumber" name="L636" href="#L636">636</a> <strong
class="jxr_keyword">return</strong> properties;
+<a class="jxr_linenumber" name="L637" href="#L637">637</a> }
+<a class="jxr_linenumber" name="L638" href="#L638">638</a>
+<a class="jxr_linenumber" name="L639" href="#L639">639</a>
+<a class="jxr_linenumber" name="L640" href="#L640">640</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">static</strong> String sanitize( Object value )
+<a class="jxr_linenumber" name="L641" href="#L641">641</a> {
+<a class="jxr_linenumber" name="L642" href="#L642">642</a> <strong
class="jxr_keyword">if</strong> ( value instanceof String )
+<a class="jxr_linenumber" name="L643" href="#L643">643</a> {
+<a class="jxr_linenumber" name="L644" href="#L644">644</a> <strong
class="jxr_keyword">return</strong> ( String ) value;
+<a class="jxr_linenumber" name="L645" href="#L645">645</a> }
+<a class="jxr_linenumber" name="L646" href="#L646">646</a> <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (
value instanceof Iterable )
+<a class="jxr_linenumber" name="L647" href="#L647">647</a> {
+<a class="jxr_linenumber" name="L648" href="#L648">648</a> String
delim = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L649" href="#L649">649</a>
StringBuilder buf = <strong class="jxr_keyword">new</strong> StringBuilder();
+<a class="jxr_linenumber" name="L650" href="#L650">650</a> <strong
class="jxr_keyword">for</strong> ( Object i : ( Iterable<?> ) value )
+<a class="jxr_linenumber" name="L651" href="#L651">651</a> {
+<a class="jxr_linenumber" name="L652" href="#L652">652</a>
buf.append( delim ).append( i );
+<a class="jxr_linenumber" name="L653" href="#L653">653</a>
delim = <span class="jxr_string">", "</span>;
+<a class="jxr_linenumber" name="L654" href="#L654">654</a> }
+<a class="jxr_linenumber" name="L655" href="#L655">655</a> <strong
class="jxr_keyword">return</strong> buf.toString();
+<a class="jxr_linenumber" name="L656" href="#L656">656</a> }
+<a class="jxr_linenumber" name="L657" href="#L657">657</a> <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (
value.getClass().isArray() )
+<a class="jxr_linenumber" name="L658" href="#L658">658</a> {
+<a class="jxr_linenumber" name="L659" href="#L659">659</a> String
delim = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L660" href="#L660">660</a>
StringBuilder buf = <strong class="jxr_keyword">new</strong> StringBuilder();
+<a class="jxr_linenumber" name="L661" href="#L661">661</a> <strong
class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i =
0, len = Array.getLength( value ); i < len; i++ )
+<a class="jxr_linenumber" name="L662" href="#L662">662</a> {
+<a class="jxr_linenumber" name="L663" href="#L663">663</a>
buf.append( delim ).append( Array.get( value, i ) );
+<a class="jxr_linenumber" name="L664" href="#L664">664</a>
delim = <span class="jxr_string">", "</span>;
+<a class="jxr_linenumber" name="L665" href="#L665">665</a> }
+<a class="jxr_linenumber" name="L666" href="#L666">666</a> <strong
class="jxr_keyword">return</strong> buf.toString();
+<a class="jxr_linenumber" name="L667" href="#L667">667</a> }
+<a class="jxr_linenumber" name="L668" href="#L668">668</a> <strong
class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L669" href="#L669">669</a> {
+<a class="jxr_linenumber" name="L670" href="#L670">670</a> <strong
class="jxr_keyword">return</strong> String.valueOf( value );
+<a class="jxr_linenumber" name="L671" href="#L671">671</a> }
+<a class="jxr_linenumber" name="L672" href="#L672">672</a> }
+<a class="jxr_linenumber" name="L673" href="#L673">673</a>
+<a class="jxr_linenumber" name="L674" href="#L674">674</a>
+<a class="jxr_linenumber" name="L675" href="#L675">675</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">void</strong> addMavenInstructions(MavenProject
currentProject, Builder builder) <strong class="jxr_keyword">throws</strong>
Exception
+<a class="jxr_linenumber" name="L676" href="#L676">676</a> {
+<a class="jxr_linenumber" name="L677" href="#L677">677</a> <strong
class="jxr_keyword">if</strong> ( currentProject.getBasedir() != <strong
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L678" href="#L678">678</a> {
+<a class="jxr_linenumber" name="L679" href="#L679">679</a> <em
class="jxr_comment">// update BND instructions to add included Maven
resources</em>
+<a class="jxr_linenumber" name="L680" href="#L680">680</a>
includeMavenResources(currentProject, builder, getLog());
+<a class="jxr_linenumber" name="L681" href="#L681">681</a>
+<a class="jxr_linenumber" name="L682" href="#L682">682</a> <em
class="jxr_comment">// Fixup error messages</em>
+<a class="jxr_linenumber" name="L683" href="#L683">683</a>
includeJava9Fixups(currentProject, builder);
+<a class="jxr_linenumber" name="L684" href="#L684">684</a>
+<a class="jxr_linenumber" name="L685" href="#L685">685</a> <em
class="jxr_comment">// calculate default export/private settings based on
sources</em>
+<a class="jxr_linenumber" name="L686" href="#L686">686</a>
addLocalPackages(outputDirectory, builder);
+<a class="jxr_linenumber" name="L687" href="#L687">687</a>
+<a class="jxr_linenumber" name="L688" href="#L688">688</a> <em
class="jxr_comment">// tell BND where the current project source resides</em>
+<a class="jxr_linenumber" name="L689" href="#L689">689</a>
addMavenSourcePath(currentProject, builder, getLog());
+<a class="jxr_linenumber" name="L690" href="#L690">690</a> }
+<a class="jxr_linenumber" name="L691" href="#L691">691</a>
+<a class="jxr_linenumber" name="L692" href="#L692">692</a> <em
class="jxr_comment">// update BND instructions to embed selected Maven
dependencies</em>
+<a class="jxr_linenumber" name="L693" href="#L693">693</a>
Collection<Artifact> embeddableArtifacts = getEmbeddableArtifacts(
currentProject, builder );
+<a class="jxr_linenumber" name="L694" href="#L694">694</a> <a
href="../../../../org/apache/felix/bundleplugin/DependencyEmbedder.html">DependencyEmbedder</a>
dependencyEmbedder = <strong class="jxr_keyword">new</strong> <a
href="../../../../org/apache/felix/bundleplugin/DependencyEmbedder.html">DependencyEmbedder</a>(getLog(),
embeddableArtifacts);
+<a class="jxr_linenumber" name="L695" href="#L695">695</a>
dependencyEmbedder.processHeaders(builder);
+<a class="jxr_linenumber" name="L696" href="#L696">696</a>
+<a class="jxr_linenumber" name="L697" href="#L697">697</a>
Collection<Artifact> embeddedArtifacts =
dependencyEmbedder.getEmbeddedArtifacts();
+<a class="jxr_linenumber" name="L698" href="#L698">698</a> <strong
class="jxr_keyword">if</strong> ( !embeddedArtifacts.isEmpty() &&
createDependencyReducedPom )
+<a class="jxr_linenumber" name="L699" href="#L699">699</a> {
+<a class="jxr_linenumber" name="L700" href="#L700">700</a>
Set<String> embeddedIds = <strong class="jxr_keyword">new</strong>
HashSet<String>();
+<a class="jxr_linenumber" name="L701" href="#L701">701</a> <strong
class="jxr_keyword">for</strong> ( Artifact artifact : embeddedArtifacts )
+<a class="jxr_linenumber" name="L702" href="#L702">702</a> {
+<a class="jxr_linenumber" name="L703" href="#L703">703</a>
embeddedIds.add( getId( artifact ) );
+<a class="jxr_linenumber" name="L704" href="#L704">704</a> }
+<a class="jxr_linenumber" name="L705" href="#L705">705</a>
createDependencyReducedPom( embeddedIds );
<a class="jxr_linenumber" name="L706" href="#L706">706</a>
-<a class="jxr_linenumber" name="L707" href="#L707">707</a> <strong
class="jxr_keyword">if</strong> ( dumpInstructions != <strong
class="jxr_keyword">null</strong> || getLog().isDebugEnabled() )
-<a class="jxr_linenumber" name="L708" href="#L708">708</a> {
-<a class="jxr_linenumber" name="L709" href="#L709">709</a>
StringBuilder buf = <strong class="jxr_keyword">new</strong> StringBuilder();
-<a class="jxr_linenumber" name="L710" href="#L710">710</a>
getLog().debug( <span class="jxr_string">"BND Instructions:"</span> + NL +
dumpInstructions( builder.getProperties(), buf ) );
-<a class="jxr_linenumber" name="L711" href="#L711">711</a> <strong
class="jxr_keyword">if</strong> ( dumpInstructions != <strong
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L712" href="#L712">712</a> {
-<a class="jxr_linenumber" name="L713" href="#L713">713</a>
getLog().info( <span class="jxr_string">"Writing BND instructions to "</span> +
dumpInstructions );
-<a class="jxr_linenumber" name="L714" href="#L714">714</a>
dumpInstructions.getParentFile().mkdirs();
-<a class="jxr_linenumber" name="L715" href="#L715">715</a>
FileUtils.fileWrite( dumpInstructions, <span class="jxr_string">"# BND
instructions"</span> + NL + buf );
-<a class="jxr_linenumber" name="L716" href="#L716">716</a> }
-<a class="jxr_linenumber" name="L717" href="#L717">717</a> }
-<a class="jxr_linenumber" name="L718" href="#L718">718</a>
-<a class="jxr_linenumber" name="L719" href="#L719">719</a>
+<a class="jxr_linenumber" name="L707" href="#L707">707</a> }
+<a class="jxr_linenumber" name="L708" href="#L708">708</a>
+<a class="jxr_linenumber" name="L709" href="#L709">709</a> <strong
class="jxr_keyword">if</strong> ( dumpInstructions != <strong
class="jxr_keyword">null</strong> || getLog().isDebugEnabled() )
+<a class="jxr_linenumber" name="L710" href="#L710">710</a> {
+<a class="jxr_linenumber" name="L711" href="#L711">711</a>
StringBuilder buf = <strong class="jxr_keyword">new</strong> StringBuilder();
+<a class="jxr_linenumber" name="L712" href="#L712">712</a>
getLog().debug( <span class="jxr_string">"BND Instructions:"</span> + NL +
dumpInstructions( builder.getProperties(), buf ) );
+<a class="jxr_linenumber" name="L713" href="#L713">713</a> <strong
class="jxr_keyword">if</strong> ( dumpInstructions != <strong
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L714" href="#L714">714</a> {
+<a class="jxr_linenumber" name="L715" href="#L715">715</a>
getLog().info( <span class="jxr_string">"Writing BND instructions to "</span> +
dumpInstructions );
+<a class="jxr_linenumber" name="L716" href="#L716">716</a>
dumpInstructions.getParentFile().mkdirs();
+<a class="jxr_linenumber" name="L717" href="#L717">717</a>
FileUtils.fileWrite( dumpInstructions, <span class="jxr_string">"# BND
instructions"</span> + NL + buf );
+<a class="jxr_linenumber" name="L718" href="#L718">718</a> }
+<a class="jxr_linenumber" name="L719" href="#L719">719</a> }
<a class="jxr_linenumber" name="L720" href="#L720">720</a>
-<a class="jxr_linenumber" name="L721" href="#L721">721</a> <strong
class="jxr_keyword">if</strong> ( dumpClasspath != <strong
class="jxr_keyword">null</strong> || getLog().isDebugEnabled() )
-<a class="jxr_linenumber" name="L722" href="#L722">722</a> {
-<a class="jxr_linenumber" name="L723" href="#L723">723</a>
StringBuilder buf = <strong class="jxr_keyword">new</strong> StringBuilder();
-<a class="jxr_linenumber" name="L724" href="#L724">724</a>
getLog().debug(<span class="jxr_string">"BND Classpath:"</span> + NL +
dumpClasspath(builder.getClasspath(), buf));
-<a class="jxr_linenumber" name="L725" href="#L725">725</a> <strong
class="jxr_keyword">if</strong> ( dumpClasspath != <strong
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L726" href="#L726">726</a> {
-<a class="jxr_linenumber" name="L727" href="#L727">727</a>
getLog().info( <span class="jxr_string">"Writing BND classpath to "</span> +
dumpClasspath );
-<a class="jxr_linenumber" name="L728" href="#L728">728</a>
dumpClasspath.getParentFile().mkdirs();
-<a class="jxr_linenumber" name="L729" href="#L729">729</a>
FileUtils.fileWrite( dumpClasspath, <span class="jxr_string">"# BND
classpath"</span> + NL + buf );
-<a class="jxr_linenumber" name="L730" href="#L730">730</a> }
-<a class="jxr_linenumber" name="L731" href="#L731">731</a> }
-<a class="jxr_linenumber" name="L732" href="#L732">732</a> }
-<a class="jxr_linenumber" name="L733" href="#L733">733</a>
-<a class="jxr_linenumber" name="L734" href="#L734">734</a>
-<a class="jxr_linenumber" name="L735" href="#L735">735</a> <em
class="jxr_comment">// We need to find the direct dependencies that have been
included in the uber JAR so that we can modify the</em>
-<a class="jxr_linenumber" name="L736" href="#L736">736</a> <em
class="jxr_comment">// POM accordingly.</em>
-<a class="jxr_linenumber" name="L737" href="#L737">737</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
createDependencyReducedPom( Set<String> artifactsToRemove )
-<a class="jxr_linenumber" name="L738" href="#L738">738</a> <strong
class="jxr_keyword">throws</strong> IOException, ProjectBuildingException,
DependencyTreeBuilderException {
-<a class="jxr_linenumber" name="L739" href="#L739">739</a> Model model
= project.getOriginalModel();
-<a class="jxr_linenumber" name="L740" href="#L740">740</a>
List<Dependency> dependencies = <strong class="jxr_keyword">new</strong>
ArrayList<Dependency>();
-<a class="jxr_linenumber" name="L741" href="#L741">741</a>
-<a class="jxr_linenumber" name="L742" href="#L742">742</a> <strong
class="jxr_keyword">boolean</strong> modified = false;
+<a class="jxr_linenumber" name="L721" href="#L721">721</a>
+<a class="jxr_linenumber" name="L722" href="#L722">722</a>
+<a class="jxr_linenumber" name="L723" href="#L723">723</a> <strong
class="jxr_keyword">if</strong> ( dumpClasspath != <strong
class="jxr_keyword">null</strong> || getLog().isDebugEnabled() )
+<a class="jxr_linenumber" name="L724" href="#L724">724</a> {
+<a class="jxr_linenumber" name="L725" href="#L725">725</a>
StringBuilder buf = <strong class="jxr_keyword">new</strong> StringBuilder();
+<a class="jxr_linenumber" name="L726" href="#L726">726</a>
getLog().debug(<span class="jxr_string">"BND Classpath:"</span> + NL +
dumpClasspath(builder.getClasspath(), buf));
+<a class="jxr_linenumber" name="L727" href="#L727">727</a> <strong
class="jxr_keyword">if</strong> ( dumpClasspath != <strong
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L728" href="#L728">728</a> {
+<a class="jxr_linenumber" name="L729" href="#L729">729</a>
getLog().info( <span class="jxr_string">"Writing BND classpath to "</span> +
dumpClasspath );
+<a class="jxr_linenumber" name="L730" href="#L730">730</a>
dumpClasspath.getParentFile().mkdirs();
+<a class="jxr_linenumber" name="L731" href="#L731">731</a>
FileUtils.fileWrite( dumpClasspath, <span class="jxr_string">"# BND
classpath"</span> + NL + buf );
+<a class="jxr_linenumber" name="L732" href="#L732">732</a> }
+<a class="jxr_linenumber" name="L733" href="#L733">733</a> }
+<a class="jxr_linenumber" name="L734" href="#L734">734</a> }
+<a class="jxr_linenumber" name="L735" href="#L735">735</a>
+<a class="jxr_linenumber" name="L736" href="#L736">736</a>
+<a class="jxr_linenumber" name="L737" href="#L737">737</a> <em
class="jxr_comment">// We need to find the direct dependencies that have been
included in the uber JAR so that we can modify the</em>
+<a class="jxr_linenumber" name="L738" href="#L738">738</a> <em
class="jxr_comment">// POM accordingly.</em>
+<a class="jxr_linenumber" name="L739" href="#L739">739</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
createDependencyReducedPom( Set<String> artifactsToRemove )
+<a class="jxr_linenumber" name="L740" href="#L740">740</a> <strong
class="jxr_keyword">throws</strong> IOException, ProjectBuildingException,
DependencyTreeBuilderException {
+<a class="jxr_linenumber" name="L741" href="#L741">741</a> Model model
= project.getOriginalModel();
+<a class="jxr_linenumber" name="L742" href="#L742">742</a>
List<Dependency> dependencies = <strong class="jxr_keyword">new</strong>
ArrayList<Dependency>();
<a class="jxr_linenumber" name="L743" href="#L743">743</a>
-<a class="jxr_linenumber" name="L744" href="#L744">744</a>
List<Dependency> transitiveDeps = <strong
class="jxr_keyword">new</strong> ArrayList<Dependency>();
+<a class="jxr_linenumber" name="L744" href="#L744">744</a> <strong
class="jxr_keyword">boolean</strong> modified = false;
<a class="jxr_linenumber" name="L745" href="#L745">745</a>
-<a class="jxr_linenumber" name="L746" href="#L746">746</a> <strong
class="jxr_keyword">for</strong> ( Artifact artifact : project.getArtifacts() )
-<a class="jxr_linenumber" name="L747" href="#L747">747</a> {
-<a class="jxr_linenumber" name="L748" href="#L748">748</a> <strong
class="jxr_keyword">if</strong> ( <span class="jxr_string">"pom"</span>.equals(
artifact.getType() ) )
-<a class="jxr_linenumber" name="L749" href="#L749">749</a> {
-<a class="jxr_linenumber" name="L750" href="#L750">750</a> <em
class="jxr_comment">// don't include pom type dependencies in dependency
reduced pom</em>
-<a class="jxr_linenumber" name="L751" href="#L751">751</a>
<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L752" href="#L752">752</a> }
-<a class="jxr_linenumber" name="L753" href="#L753">753</a>
-<a class="jxr_linenumber" name="L754" href="#L754">754</a> <em
class="jxr_comment">//promote</em>
-<a class="jxr_linenumber" name="L755" href="#L755">755</a>
Dependency dep = <strong class="jxr_keyword">new</strong> Dependency();
-<a class="jxr_linenumber" name="L756" href="#L756">756</a>
dep.setArtifactId( artifact.getArtifactId() );
-<a class="jxr_linenumber" name="L757" href="#L757">757</a> <strong
class="jxr_keyword">if</strong> ( artifact.hasClassifier() )
-<a class="jxr_linenumber" name="L758" href="#L758">758</a> {
-<a class="jxr_linenumber" name="L759" href="#L759">759</a>
dep.setClassifier( artifact.getClassifier() );
-<a class="jxr_linenumber" name="L760" href="#L760">760</a> }
-<a class="jxr_linenumber" name="L761" href="#L761">761</a>
dep.setGroupId( artifact.getGroupId() );
-<a class="jxr_linenumber" name="L762" href="#L762">762</a>
dep.setOptional( artifact.isOptional() );
-<a class="jxr_linenumber" name="L763" href="#L763">763</a>
dep.setScope( artifact.getScope() );
-<a class="jxr_linenumber" name="L764" href="#L764">764</a>
dep.setType( artifact.getType() );
-<a class="jxr_linenumber" name="L765" href="#L765">765</a>
dep.setVersion( artifact.getVersion() );
-<a class="jxr_linenumber" name="L766" href="#L766">766</a>
-<a class="jxr_linenumber" name="L767" href="#L767">767</a> <em
class="jxr_comment">//we'll figure out the exclusions in a bit.</em>
+<a class="jxr_linenumber" name="L746" href="#L746">746</a>
List<Dependency> transitiveDeps = <strong
class="jxr_keyword">new</strong> ArrayList<Dependency>();
+<a class="jxr_linenumber" name="L747" href="#L747">747</a>
+<a class="jxr_linenumber" name="L748" href="#L748">748</a> <strong
class="jxr_keyword">for</strong> ( Artifact artifact : project.getArtifacts() )
+<a class="jxr_linenumber" name="L749" href="#L749">749</a> {
+<a class="jxr_linenumber" name="L750" href="#L750">750</a> <strong
class="jxr_keyword">if</strong> ( <span class="jxr_string">"pom"</span>.equals(
artifact.getType() ) )
+<a class="jxr_linenumber" name="L751" href="#L751">751</a> {
+<a class="jxr_linenumber" name="L752" href="#L752">752</a> <em
class="jxr_comment">// don't include pom type dependencies in dependency
reduced pom</em>
+<a class="jxr_linenumber" name="L753" href="#L753">753</a>
<strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="L754" href="#L754">754</a> }
+<a class="jxr_linenumber" name="L755" href="#L755">755</a>
+<a class="jxr_linenumber" name="L756" href="#L756">756</a> <em
class="jxr_comment">//promote</em>
+<a class="jxr_linenumber" name="L757" href="#L757">757</a>
Dependency dep = <strong class="jxr_keyword">new</strong> Dependency();
+<a class="jxr_linenumber" name="L758" href="#L758">758</a>
dep.setArtifactId( artifact.getArtifactId() );
+<a class="jxr_linenumber" name="L759" href="#L759">759</a> <strong
class="jxr_keyword">if</strong> ( artifact.hasClassifier() )
+<a class="jxr_linenumber" name="L760" href="#L760">760</a> {
+<a class="jxr_linenumber" name="L761" href="#L761">761</a>
dep.setClassifier( artifact.getClassifier() );
+<a class="jxr_linenumber" name="L762" href="#L762">762</a> }
+<a class="jxr_linenumber" name="L763" href="#L763">763</a>
dep.setGroupId( artifact.getGroupId() );
+<a class="jxr_linenumber" name="L764" href="#L764">764</a>
dep.setOptional( artifact.isOptional() );
+<a class="jxr_linenumber" name="L765" href="#L765">765</a>
dep.setScope( artifact.getScope() );
+<a class="jxr_linenumber" name="L766" href="#L766">766</a>
dep.setType( artifact.getType() );
+<a class="jxr_linenumber" name="L767" href="#L767">767</a>
dep.setVersion( artifact.getVersion() );
<a class="jxr_linenumber" name="L768" href="#L768">768</a>
-<a class="jxr_linenumber" name="L769" href="#L769">769</a>
transitiveDeps.add( dep );
-<a class="jxr_linenumber" name="L770" href="#L770">770</a> }
-<a class="jxr_linenumber" name="L771" href="#L771">771</a>
List<Dependency> origDeps = project.getDependencies();
-<a class="jxr_linenumber" name="L772" href="#L772">772</a>
-<a class="jxr_linenumber" name="L773" href="#L773">773</a> <strong
class="jxr_keyword">for</strong> (Dependency d : origDeps)
-<a class="jxr_linenumber" name="L774" href="#L774">774</a> {
-<a class="jxr_linenumber" name="L775" href="#L775">775</a>
dependencies.add(d);
-<a class="jxr_linenumber" name="L776" href="#L776">776</a>
-<a class="jxr_linenumber" name="L777" href="#L777">777</a> String
id = getId(d);
+<a class="jxr_linenumber" name="L769" href="#L769">769</a> <em
class="jxr_comment">//we'll figure out the exclusions in a bit.</em>
+<a class="jxr_linenumber" name="L770" href="#L770">770</a>
+<a class="jxr_linenumber" name="L771" href="#L771">771</a>
transitiveDeps.add( dep );
+<a class="jxr_linenumber" name="L772" href="#L772">772</a> }
+<a class="jxr_linenumber" name="L773" href="#L773">773</a>
List<Dependency> origDeps = project.getDependencies();
+<a class="jxr_linenumber" name="L774" href="#L774">774</a>
+<a class="jxr_linenumber" name="L775" href="#L775">775</a> <strong
class="jxr_keyword">for</strong> (Dependency d : origDeps)
+<a class="jxr_linenumber" name="L776" href="#L776">776</a> {
+<a class="jxr_linenumber" name="L777" href="#L777">777</a>
dependencies.add(d);
<a class="jxr_linenumber" name="L778" href="#L778">778</a>
-<a class="jxr_linenumber" name="L779" href="#L779">779</a> <strong
class="jxr_keyword">if</strong> (artifactsToRemove.contains(id))
-<a class="jxr_linenumber" name="L780" href="#L780">780</a> {
-<a class="jxr_linenumber" name="L781" href="#L781">781</a>
modified = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L782" href="#L782">782</a>
-<a class="jxr_linenumber" name="L783" href="#L783">783</a>
dependencies.remove(d);
-<a class="jxr_linenumber" name="L784" href="#L784">784</a> }
-<a class="jxr_linenumber" name="L785" href="#L785">785</a> }
-<a class="jxr_linenumber" name="L786" href="#L786">786</a>
-<a class="jxr_linenumber" name="L787" href="#L787">787</a> <em
class="jxr_comment">// Check to see if we have a reduction and if so rewrite
the POM.</em>
-<a class="jxr_linenumber" name="L788" href="#L788">788</a> <strong
class="jxr_keyword">if</strong> ( modified )
-<a class="jxr_linenumber" name="L789" href="#L789">789</a> {
-<a class="jxr_linenumber" name="L790" href="#L790">790</a> <strong
class="jxr_keyword">while</strong> ( modified )
-<a class="jxr_linenumber" name="L791" href="#L791">791</a> {
-<a class="jxr_linenumber" name="L792" href="#L792">792</a>
-<a class="jxr_linenumber" name="L793" href="#L793">793</a>
model.setDependencies( dependencies );
+<a class="jxr_linenumber" name="L779" href="#L779">779</a> String
id = getId(d);
+<a class="jxr_linenumber" name="L780" href="#L780">780</a>
+<a class="jxr_linenumber" name="L781" href="#L781">781</a> <strong
class="jxr_keyword">if</strong> (artifactsToRemove.contains(id))
+<a class="jxr_linenumber" name="L782" href="#L782">782</a> {
+<a class="jxr_linenumber" name="L783" href="#L783">783</a>
modified = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L784" href="#L784">784</a>
+<a class="jxr_linenumber" name="L785" href="#L785">785</a>
dependencies.remove(d);
+<a class="jxr_linenumber" name="L786" href="#L786">786</a> }
+<a class="jxr_linenumber" name="L787" href="#L787">787</a> }
+<a class="jxr_linenumber" name="L788" href="#L788">788</a>
+<a class="jxr_linenumber" name="L789" href="#L789">789</a> <em
class="jxr_comment">// Check to see if we have a reduction and if so rewrite
the POM.</em>
+<a class="jxr_linenumber" name="L790" href="#L790">790</a> <strong
class="jxr_keyword">if</strong> ( modified )
+<a class="jxr_linenumber" name="L791" href="#L791">791</a> {
+<a class="jxr_linenumber" name="L792" href="#L792">792</a> <strong
class="jxr_keyword">while</strong> ( modified )
+<a class="jxr_linenumber" name="L793" href="#L793">793</a> {
<a class="jxr_linenumber" name="L794" href="#L794">794</a>
-<a class="jxr_linenumber" name="L795" href="#L795">795</a>
<strong class="jxr_keyword">if</strong> ( dependencyReducedPomLocation ==
<strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L796" href="#L796">796</a> {
-<a class="jxr_linenumber" name="L797" href="#L797">797</a>
<em class="jxr_comment">// MSHADE-123: We can't default to 'target' because it
messes up uses of ${project.basedir}</em>
-<a class="jxr_linenumber" name="L798" href="#L798">798</a>
dependencyReducedPomLocation = <strong class="jxr_keyword">new</strong> File (
project.getBasedir(), <span
class="jxr_string">"dependency-reduced-pom.xml"</span> );
-<a class="jxr_linenumber" name="L799" href="#L799">799</a> }
-<a class="jxr_linenumber" name="L800" href="#L800">800</a>
-<a class="jxr_linenumber" name="L801" href="#L801">801</a>
File f = dependencyReducedPomLocation;
-<a class="jxr_linenumber" name="L802" href="#L802">802</a>
<strong class="jxr_keyword">if</strong> ( f.exists() )
-<a class="jxr_linenumber" name="L803" href="#L803">803</a> {
-<a class="jxr_linenumber" name="L804" href="#L804">804</a>
f.delete();
-<a class="jxr_linenumber" name="L805" href="#L805">805</a> }
-<a class="jxr_linenumber" name="L806" href="#L806">806</a>
-<a class="jxr_linenumber" name="L807" href="#L807">807</a>
Writer w = WriterFactory.newXmlWriter( f );
+<a class="jxr_linenumber" name="L795" href="#L795">795</a>
model.setDependencies( dependencies );
+<a class="jxr_linenumber" name="L796" href="#L796">796</a>
+<a class="jxr_linenumber" name="L797" href="#L797">797</a>
<strong class="jxr_keyword">if</strong> ( dependencyReducedPomLocation ==
<strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L798" href="#L798">798</a> {
+<a class="jxr_linenumber" name="L799" href="#L799">799</a>
<em class="jxr_comment">// MSHADE-123: We can't default to 'target' because it
messes up uses of ${project.basedir}</em>
+<a class="jxr_linenumber" name="L800" href="#L800">800</a>
dependencyReducedPomLocation = <strong class="jxr_keyword">new</strong> File (
project.getBasedir(), <span
class="jxr_string">"dependency-reduced-pom.xml"</span> );
+<a class="jxr_linenumber" name="L801" href="#L801">801</a> }
+<a class="jxr_linenumber" name="L802" href="#L802">802</a>
+<a class="jxr_linenumber" name="L803" href="#L803">803</a>
File f = dependencyReducedPomLocation;
+<a class="jxr_linenumber" name="L804" href="#L804">804</a>
<strong class="jxr_keyword">if</strong> ( f.exists() )
+<a class="jxr_linenumber" name="L805" href="#L805">805</a> {
+<a class="jxr_linenumber" name="L806" href="#L806">806</a>
f.delete();
+<a class="jxr_linenumber" name="L807" href="#L807">807</a> }
<a class="jxr_linenumber" name="L808" href="#L808">808</a>
-<a class="jxr_linenumber" name="L809" href="#L809">809</a>
String origRelativePath = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L810" href="#L810">810</a>
String replaceRelativePath = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L811" href="#L811">811</a>
<strong class="jxr_keyword">if</strong> ( model.getParent() != <strong
class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L812" href="#L812">812</a> {
-<a class="jxr_linenumber" name="L813" href="#L813">813</a>
origRelativePath = model.getParent().getRelativePath();
-<a class="jxr_linenumber" name="L814" href="#L814">814</a>
-<a class="jxr_linenumber" name="L815" href="#L815">815</a> }
-<a class="jxr_linenumber" name="L816" href="#L816">816</a>
replaceRelativePath = origRelativePath;
-<a class="jxr_linenumber" name="L817" href="#L817">817</a>
-<a class="jxr_linenumber" name="L818" href="#L818">818</a>
<strong class="jxr_keyword">if</strong> ( origRelativePath == <strong
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L819" href="#L819">819</a> {
-<a class="jxr_linenumber" name="L820" href="#L820">820</a>
origRelativePath = <span class="jxr_string">"../pom.xml"</span>;
-<a class="jxr_linenumber" name="L821" href="#L821">821</a> }
-<a class="jxr_linenumber" name="L822" href="#L822">822</a>
-<a class="jxr_linenumber" name="L823" href="#L823">823</a>
<strong class="jxr_keyword">if</strong> ( model.getParent() != <strong
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L824" href="#L824">824</a> {
-<a class="jxr_linenumber" name="L825" href="#L825">825</a>
File parentFile = <strong class="jxr_keyword">new</strong> File(
project.getBasedir(), model.getParent().getRelativePath() ).getCanonicalFile();
-<a class="jxr_linenumber" name="L826" href="#L826">826</a>
<strong class="jxr_keyword">if</strong> ( !parentFile.isFile() )
-<a class="jxr_linenumber" name="L827" href="#L827">827</a>
{
-<a class="jxr_linenumber" name="L828" href="#L828">828</a>
parentFile = <strong class="jxr_keyword">new</strong> File( parentFile,
<span class="jxr_string">"pom.xml"</span>);
-<a class="jxr_linenumber" name="L829" href="#L829">829</a>
}
-<a class="jxr_linenumber" name="L830" href="#L830">830</a>
-<a class="jxr_linenumber" name="L831" href="#L831">831</a>
parentFile = parentFile.getCanonicalFile();
+<a class="jxr_linenumber" name="L809" href="#L809">809</a>
Writer w = WriterFactory.newXmlWriter( f );
+<a class="jxr_linenumber" name="L810" href="#L810">810</a>
+<a class="jxr_linenumber" name="L811" href="#L811">811</a>
String origRelativePath = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L812" href="#L812">812</a>
String replaceRelativePath = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L813" href="#L813">813</a>
<strong class="jxr_keyword">if</strong> ( model.getParent() != <strong
class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L814" href="#L814">814</a> {
+<a class="jxr_linenumber" name="L815" href="#L815">815</a>
origRelativePath = model.getParent().getRelativePath();
+<a class="jxr_linenumber" name="L816" href="#L816">816</a>
+<a class="jxr_linenumber" name="L817" href="#L817">817</a> }
+<a class="jxr_linenumber" name="L818" href="#L818">818</a>
replaceRelativePath = origRelativePath;
+<a class="jxr_linenumber" name="L819" href="#L819">819</a>
+<a class="jxr_linenumber" name="L820" href="#L820">820</a>
<strong class="jxr_keyword">if</strong> ( origRelativePath == <strong
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L821" href="#L821">821</a> {
+<a class="jxr_linenumber" name="L822" href="#L822">822</a>
origRelativePath = <span class="jxr_string">"../pom.xml"</span>;
+<a class="jxr_linenumber" name="L823" href="#L823">823</a> }
+<a class="jxr_linenumber" name="L824" href="#L824">824</a>
+<a class="jxr_linenumber" name="L825" href="#L825">825</a>
<strong class="jxr_keyword">if</strong> ( model.getParent() != <strong
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L826" href="#L826">826</a> {
+<a class="jxr_linenumber" name="L827" href="#L827">827</a>
File parentFile = <strong class="jxr_keyword">new</strong> File(
project.getBasedir(), model.getParent().getRelativePath() ).getCanonicalFile();
+<a class="jxr_linenumber" name="L828" href="#L828">828</a>
<strong class="jxr_keyword">if</strong> ( !parentFile.isFile() )
+<a class="jxr_linenumber" name="L829" href="#L829">829</a>
{
+<a class="jxr_linenumber" name="L830" href="#L830">830</a>
parentFile = <strong class="jxr_keyword">new</strong> File( parentFile,
<span class="jxr_string">"pom.xml"</span>);
+<a class="jxr_linenumber" name="L831" href="#L831">831</a>
}
<a class="jxr_linenumber" name="L832" href="#L832">832</a>
-<a class="jxr_linenumber" name="L833" href="#L833">833</a>
String relPath = RelativizePath.convertToRelativePath( parentFile, f );
-<a class="jxr_linenumber" name="L834" href="#L834">834</a>
model.getParent().setRelativePath( relPath );
-<a class="jxr_linenumber" name="L835" href="#L835">835</a> }
-<a class="jxr_linenumber" name="L836" href="#L836">836</a>
-<a class="jxr_linenumber" name="L837" href="#L837">837</a>
<strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L838" href="#L838">838</a> {
-<a class="jxr_linenumber" name="L839" href="#L839">839</a>
PomWriter.write( w, model, <strong class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="L840" href="#L840">840</a> }
-<a class="jxr_linenumber" name="L841" href="#L841">841</a>
<strong class="jxr_keyword">finally</strong>
-<a class="jxr_linenumber" name="L842" href="#L842">842</a> {
-<a class="jxr_linenumber" name="L843" href="#L843">843</a>
<strong class="jxr_keyword">if</strong> ( model.getParent() != <strong
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L844" href="#L844">844</a>
{
-<a class="jxr_linenumber" name="L845" href="#L845">845</a>
model.getParent().setRelativePath( replaceRelativePath );
-<a class="jxr_linenumber" name="L846" href="#L846">846</a>
}
-<a class="jxr_linenumber" name="L847" href="#L847">847</a>
w.close();
-<a class="jxr_linenumber" name="L848" href="#L848">848</a> }
-<a class="jxr_linenumber" name="L849" href="#L849">849</a>
-<a class="jxr_linenumber" name="L850" href="#L850">850</a>
MavenProject p2 = mavenProjectBuilder.build( f, localRepository, <strong
class="jxr_keyword">null</strong> );
-<a class="jxr_linenumber" name="L851" href="#L851">851</a>
modified = updateExcludesInDeps( p2, dependencies, transitiveDeps );
-<a class="jxr_linenumber" name="L852" href="#L852">852</a>
-<a class="jxr_linenumber" name="L853" href="#L853">853</a> }
+<a class="jxr_linenumber" name="L833" href="#L833">833</a>
parentFile = parentFile.getCanonicalFile();
+<a class="jxr_linenumber" name="L834" href="#L834">834</a>
+<a class="jxr_linenumber" name="L835" href="#L835">835</a>
String relPath = RelativizePath.convertToRelativePath( parentFile, f );
+<a class="jxr_linenumber" name="L836" href="#L836">836</a>
model.getParent().setRelativePath( relPath );
+<a class="jxr_linenumber" name="L837" href="#L837">837</a> }
+<a class="jxr_linenumber" name="L838" href="#L838">838</a>
+<a class="jxr_linenumber" name="L839" href="#L839">839</a>
<strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L840" href="#L840">840</a> {
+<a class="jxr_linenumber" name="L841" href="#L841">841</a>
PomWriter.write( w, model, <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L842" href="#L842">842</a> }
+<a class="jxr_linenumber" name="L843" href="#L843">843</a>
<strong class="jxr_keyword">finally</strong>
+<a class="jxr_linenumber" name="L844" href="#L844">844</a> {
+<a class="jxr_linenumber" name="L845" href="#L845">845</a>
<strong class="jxr_keyword">if</strong> ( model.getParent() != <strong
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L846" href="#L846">846</a>
{
+<a class="jxr_linenumber" name="L847" href="#L847">847</a>
model.getParent().setRelativePath( replaceRelativePath );
+<a class="jxr_linenumber" name="L848" href="#L848">848</a>
}
+<a class="jxr_linenumber" name="L849" href="#L849">849</a>
w.close();
+<a class="jxr_linenumber" name="L850" href="#L850">850</a> }
+<a class="jxr_linenumber" name="L851" href="#L851">851</a>
+<a class="jxr_linenumber" name="L852" href="#L852">852</a>
MavenProject p2 = mavenProjectBuilder.build( f, localRepository, <strong
class="jxr_keyword">null</strong> );
+<a class="jxr_linenumber" name="L853" href="#L853">853</a>
modified = updateExcludesInDeps( p2, dependencies, transitiveDeps );
<a class="jxr_linenumber" name="L854" href="#L854">854</a>
-<a class="jxr_linenumber" name="L855" href="#L855">855</a>
project.setFile( dependencyReducedPomLocation );
-<a class="jxr_linenumber" name="L856" href="#L856">856</a> }
-<a class="jxr_linenumber" name="L857" href="#L857">857</a> }
-<a class="jxr_linenumber" name="L858" href="#L858">858</a>
-<a class="jxr_linenumber" name="L859" href="#L859">859</a> <strong
class="jxr_keyword">private</strong> String getId( Artifact artifact )
-<a class="jxr_linenumber" name="L860" href="#L860">860</a> {
-<a class="jxr_linenumber" name="L861" href="#L861">861</a> <strong
class="jxr_keyword">return</strong> getId( artifact.getGroupId(),
artifact.getArtifactId(), artifact.getType(), artifact.getClassifier() );
-<a class="jxr_linenumber" name="L862" href="#L862">862</a> }
-<a class="jxr_linenumber" name="L863" href="#L863">863</a>
-<a class="jxr_linenumber" name="L864" href="#L864">864</a> <strong
class="jxr_keyword">private</strong> String getId( Dependency dependency )
-<a class="jxr_linenumber" name="L865" href="#L865">865</a> {
-<a class="jxr_linenumber" name="L866" href="#L866">866</a> <strong
class="jxr_keyword">return</strong> getId( dependency.getGroupId(),
dependency.getArtifactId(), dependency.getType(),
-<a class="jxr_linenumber" name="L867" href="#L867">867</a>
dependency.getClassifier() );
-<a class="jxr_linenumber" name="L868" href="#L868">868</a> }
-<a class="jxr_linenumber" name="L869" href="#L869">869</a>
-<a class="jxr_linenumber" name="L870" href="#L870">870</a> <strong
class="jxr_keyword">private</strong> String getId( String groupId, String
artifactId, String type, String classifier )
-<a class="jxr_linenumber" name="L871" href="#L871">871</a> {
-<a class="jxr_linenumber" name="L872" href="#L872">872</a> <strong
class="jxr_keyword">return</strong> groupId + <span
class="jxr_string">":"</span> + artifactId + <span
class="jxr_string">":"</span> + type + <span class="jxr_string">":"</span> + (
( classifier != <strong class="jxr_keyword">null</strong> ) ? classifier :
<span class="jxr_string">""</span> );
-<a class="jxr_linenumber" name="L873" href="#L873">873</a> }
-<a class="jxr_linenumber" name="L874" href="#L874">874</a>
-<a class="jxr_linenumber" name="L875" href="#L875">875</a> <strong
class="jxr_keyword">public</strong> <strong
class="jxr_keyword">boolean</strong> updateExcludesInDeps( MavenProject
project, List<Dependency> dependencies, List<Dependency>
transitiveDeps )
-<a class="jxr_linenumber" name="L876" href="#L876">876</a> <strong
class="jxr_keyword">throws</strong> DependencyTreeBuilderException
-<a class="jxr_linenumber" name="L877" href="#L877">877</a> {
-<a class="jxr_linenumber" name="L878" href="#L878">878</a>
org.apache.maven.shared.dependency.tree.DependencyNode node =
dependencyTreeBuilder.buildDependencyTree(project, localRepository,
artifactFactory,
-<a class="jxr_linenumber" name="L879" href="#L879">879</a>
artifactMetadataSource, <strong class="jxr_keyword">null</strong>,
-<a class="jxr_linenumber" name="L880" href="#L880">880</a>
artifactCollector);
-<a class="jxr_linenumber" name="L881" href="#L881">881</a> <strong
class="jxr_keyword">boolean</strong> modified = false;
-<a class="jxr_linenumber" name="L882" href="#L882">882</a> <strong
class="jxr_keyword">for</strong>
(org.apache.maven.shared.dependency.tree.DependencyNode n2 : node.getChildren())
-<a class="jxr_linenumber" name="L883" href="#L883">883</a> {
-<a class="jxr_linenumber" name="L884" href="#L884">884</a> <strong
class="jxr_keyword">for</strong>
(org.apache.maven.shared.dependency.tree.DependencyNode n3 : n2.getChildren())
-<a class="jxr_linenumber" name="L885" href="#L885">885</a> {
-<a class="jxr_linenumber" name="L886" href="#L886">886</a> <em
class="jxr_comment">//anything two levels deep that is marked "included"</em>
-<a class="jxr_linenumber" name="L887" href="#L887">887</a> <em
class="jxr_comment">//is stuff that was excluded by the original poms, make
sure it</em>
-<a class="jxr_linenumber" name="L888" href="#L888">888</a> <em
class="jxr_comment">//remains excluded IF promoting transitives.</em>
-<a class="jxr_linenumber" name="L889" href="#L889">889</a>
<strong class="jxr_keyword">if</strong> (n3.getState() ==
org.apache.maven.shared.dependency.tree.DependencyNode.INCLUDED)
-<a class="jxr_linenumber" name="L890" href="#L890">890</a> {
-<a class="jxr_linenumber" name="L891" href="#L891">891</a>
<em class="jxr_comment">//check if it really isn't in the list of original
dependencies. Maven</em>
-<a class="jxr_linenumber" name="L892" href="#L892">892</a>
<em class="jxr_comment">//prior to 2.0.8 may grab versions from transients
instead of</em>
-<a class="jxr_linenumber" name="L893" href="#L893">893</a>
<em class="jxr_comment">//from the direct deps in which case they would be
marked included</em>
-<a class="jxr_linenumber" name="L894" href="#L894">894</a>
<em class="jxr_comment">//instead of OMITTED_FOR_DUPLICATE</em>
-<a class="jxr_linenumber" name="L895" href="#L895">895</a>
-<a class="jxr_linenumber" name="L896" href="#L896">896</a>
<em class="jxr_comment">//also, if not promoting the transitives, level 2's
would be included</em>
-<a class="jxr_linenumber" name="L897" href="#L897">897</a>
<strong class="jxr_keyword">boolean</strong> found = false;
-<a class="jxr_linenumber" name="L898" href="#L898">898</a>
<strong class="jxr_keyword">for</strong> (Dependency dep : transitiveDeps)
-<a class="jxr_linenumber" name="L899" href="#L899">899</a>
{
-<a class="jxr_linenumber" name="L900" href="#L900">900</a>
<strong class="jxr_keyword">if</strong>
(dep.getArtifactId().equals(n3.getArtifact().getArtifactId()) &&
dep.getGroupId().equals(
-<a class="jxr_linenumber" name="L901" href="#L901">901</a>
n3.getArtifact().getGroupId()))
-<a class="jxr_linenumber" name="L902" href="#L902">902</a>
{
-<a class="jxr_linenumber" name="L903" href="#L903">903</a>
found = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L904" href="#L904">904</a>
}
-<a class="jxr_linenumber" name="L905" href="#L905">905</a>
-<a class="jxr_linenumber" name="L906" href="#L906">906</a>
}
+<a class="jxr_linenumber" name="L855" href="#L855">855</a> }
+<a class="jxr_linenumber" name="L856" href="#L856">856</a>
+<a class="jxr_linenumber" name="L857" href="#L857">857</a>
project.setFile( dependencyReducedPomLocation );
+<a class="jxr_linenumber" name="L858" href="#L858">858</a> }
+<a class="jxr_linenumber" name="L859" href="#L859">859</a> }
+<a class="jxr_linenumber" name="L860" href="#L860">860</a>
+<a class="jxr_linenumber" name="L861" href="#L861">861</a> <strong
class="jxr_keyword">private</strong> String getId( Artifact artifact )
+<a class="jxr_linenumber" name="L862" href="#L862">862</a> {
+<a class="jxr_linenumber" name="L863" href="#L863">863</a> <strong
class="jxr_keyword">return</strong> getId( artifact.getGroupId(),
artifact.getArtifactId(), artifact.getType(), artifact.getClassifier() );
+<a class="jxr_linenumber" name="L864" href="#L864">864</a> }
+<a class="jxr_linenumber" name="L865" href="#L865">865</a>
+<a class="jxr_linenumber" name="L866" href="#L866">866</a> <strong
class="jxr_keyword">private</strong> String getId( Dependency dependency )
+<a class="jxr_linenumber" name="L867" href="#L867">867</a> {
+<a class="jxr_linenumber" name="L868" href="#L868">868</a> <strong
class="jxr_keyword">return</strong> getId( dependency.getGroupId(),
dependency.getArtifactId(), dependency.getType(),
+<a class="jxr_linenumber" name="L869" href="#L869">869</a>
dependency.getClassifier() );
+<a class="jxr_linenumber" name="L870" href="#L870">870</a> }
+<a class="jxr_linenumber" name="L871" href="#L871">871</a>
+<a class="jxr_linenumber" name="L872" href="#L872">872</a> <strong
class="jxr_keyword">private</strong> String getId( String groupId, String
artifactId, String type, String classifier )
+<a class="jxr_linenumber" name="L873" href="#L873">873</a> {
+<a class="jxr_linenumber" name="L874" href="#L874">874</a> <strong
class="jxr_keyword">return</strong> groupId + <span
class="jxr_string">":"</span> + artifactId + <span
class="jxr_string">":"</span> + type + <span class="jxr_string">":"</span> + (
( classifier != <strong class="jxr_keyword">null</strong> ) ? classifier :
<span class="jxr_string">""</span> );
+<a class="jxr_linenumber" name="L875" href="#L875">875</a> }
+<a class="jxr_linenumber" name="L876" href="#L876">876</a>
+<a class="jxr_linenumber" name="L877" href="#L877">877</a> <strong
class="jxr_keyword">public</strong> <strong
class="jxr_keyword">boolean</strong> updateExcludesInDeps( MavenProject
project, List<Dependency> dependencies, List<Dependency>
transitiveDeps )
+<a class="jxr_linenumber" name="L878" href="#L878">878</a> <strong
class="jxr_keyword">throws</strong> DependencyTreeBuilderException
+<a class="jxr_linenumber" name="L879" href="#L879">879</a> {
+<a class="jxr_linenumber" name="L880" href="#L880">880</a>
org.apache.maven.shared.dependency.tree.DependencyNode node =
dependencyTreeBuilder.buildDependencyTree(project, localRepository,
artifactFactory,
+<a class="jxr_linenumber" name="L881" href="#L881">881</a>
artifactMetadataSource, <strong class="jxr_keyword">null</strong>,
+<a class="jxr_linenumber" name="L882" href="#L882">882</a>
artifactCollector);
+<a class="jxr_linenumber" name="L883" href="#L883">883</a> <strong
class="jxr_keyword">boolean</strong> modified = false;
+<a class="jxr_linenumber" name="L884" href="#L884">884</a> <strong
class="jxr_keyword">for</strong>
(org.apache.maven.shared.dependency.tree.DependencyNode n2 : node.getChildren())
+<a class="jxr_linenumber" name="L885" href="#L885">885</a> {
+<a class="jxr_linenumber" name="L886" href="#L886">886</a> <strong
class="jxr_keyword">for</strong>
(org.apache.maven.shared.dependency.tree.DependencyNode n3 : n2.getChildren())
+<a class="jxr_linenumber" name="L887" href="#L887">887</a> {
+<a class="jxr_linenumber" name="L888" href="#L888">888</a> <em
class="jxr_comment">//anything two levels deep that is marked "included"</em>
+<a class="jxr_linenumber" name="L889" href="#L889">889</a> <em
class="jxr_comment">//is stuff that was excluded by the original poms, make
sure it</em>
+<a class="jxr_linenumber" name="L890" href="#L890">890</a> <em
class="jxr_comment">//remains excluded IF promoting transitives.</em>
+<a class="jxr_linenumber" name="L891" href="#L891">891</a>
<strong class="jxr_keyword">if</strong> (n3.getState() ==
org.apache.maven.shared.dependency.tree.DependencyNode.INCLUDED)
+<a class="jxr_linenumber" name="L892" href="#L892">892</a> {
+<a class="jxr_linenumber" name="L893" href="#L893">893</a>
<em class="jxr_comment">//check if it really isn't in the list of original
dependencies. Maven</em>
+<a class="jxr_linenumber" name="L894" href="#L894">894</a>
<em class="jxr_comment">//prior to 2.0.8 may grab versions from transients
instead of</em>
+<a class="jxr_linenumber" name="L895" href="#L895">895</a>
<em class="jxr_comment">//from the direct deps in which case they would be
marked included</em>
+<a class="jxr_linenumber" name="L896" href="#L896">896</a>
<em class="jxr_comment">//instead of OMITTED_FOR_DUPLICATE</em>
+<a class="jxr_linenumber" name="L897" href="#L897">897</a>
+<a class="jxr_linenumber" name="L898" href="#L898">898</a>
<em class="jxr_comment">//also, if not promoting the transitives, level 2's
would be included</em>
+<a class="jxr_linenumber" name="L899" href="#L899">899</a>
<strong class="jxr_keyword">boolean</strong> found = false;
+<a class="jxr_linenumber" name="L900" href="#L900">900</a>
<strong class="jxr_keyword">for</strong> (Dependency dep : transitiveDeps)
+<a class="jxr_linenumber" name="L901" href="#L901">901</a>
{
+<a class="jxr_linenumber" name="L902" href="#L902">902</a>
<strong class="jxr_keyword">if</strong>
(dep.getArtifactId().equals(n3.getArtifact().getArtifactId()) &&
dep.getGroupId().equals(
+<a class="jxr_linenumber" name="L903" href="#L903">903</a>
n3.getArtifact().getGroupId()))
+<a class="jxr_linenumber" name="L904" href="#L904">904</a>
{
+<a class="jxr_linenumber" name="L905" href="#L905">905</a>
found = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L906" href="#L906">906</a>
}
<a class="jxr_linenumber" name="L907" href="#L907">907</a>
-<a class="jxr_linenumber" name="L908" href="#L908">908</a>
<strong class="jxr_keyword">if</strong> (!found)
-<a class="jxr_linenumber" name="L909" href="#L909">909</a>
{
-<a class="jxr_linenumber" name="L910" href="#L910">910</a>
<strong class="jxr_keyword">for</strong> (Dependency dep : dependencies)
-<a class="jxr_linenumber" name="L911" href="#L911">911</a>
{
-<a class="jxr_linenumber" name="L912" href="#L912">912</a>
<strong class="jxr_keyword">if</strong>
(dep.getArtifactId().equals(n2.getArtifact().getArtifactId())
-<a class="jxr_linenumber" name="L913" href="#L913">913</a>
&&
dep.getGroupId().equals(n2.getArtifact().getGroupId()))
-<a class="jxr_linenumber" name="L914" href="#L914">914</a>
{
-<a class="jxr_linenumber" name="L915" href="#L915">915</a>
Exclusion exclusion = <strong class="jxr_keyword">new</strong>
Exclusion();
-<a class="jxr_linenumber" name="L916" href="#L916">916</a>
exclusion.setArtifactId(n3.getArtifact().getArtifactId());
-<a class="jxr_linenumber" name="L917" href="#L917">917</a>
exclusion.setGroupId(n3.getArtifact().getGroupId());
-<a class="jxr_linenumber" name="L918" href="#L918">918</a>
dep.addExclusion(exclusion);
-<a class="jxr_linenumber" name="L919" href="#L919">919</a>
modified = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L920" href="#L920">920</a>
<strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="L921" href="#L921">921</a>
}
-<a class="jxr_linenumber" name="L922" href="#L922">922</a>
}
-<a class="jxr_linenumber" name="L923" href="#L923">923</a>
}
-<a class="jxr_linenumber" name="L924" href="#L924">924</a> }
-<a class="jxr_linenumber" name="L925" href="#L925">925</a> }
-<a class="jxr_linenumber" name="L926" href="#L926">926</a> }
-<a class="jxr_linenumber" name="L927" href="#L927">927</a> <strong
class="jxr_keyword">return</strong> modified;
-<a class="jxr_linenumber" name="L928" href="#L928">928</a> }
-<a class="jxr_linenumber" name="L929" href="#L929">929</a>
-<a class="jxr_linenumber" name="L930" href="#L930">930</a>
-<a class="jxr_linenumber" name="L931" href="#L931">931</a> <strong
class="jxr_keyword">protected</strong> Builder buildOSGiBundle(MavenProject
currentProject, Map<String, String> originalInstructions,
-<a class="jxr_linenumber" name="L932" href="#L932">932</a>
<a
href="../../../../org/apache/felix/bundleplugin/BundlePlugin.html">ClassPathItem</a>[]
classpath) <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L933" href="#L933">933</a> {
-<a class="jxr_linenumber" name="L934" href="#L934">934</a> Builder
builder = getOSGiBuilder( currentProject, originalInstructions, classpath );
-<a class="jxr_linenumber" name="L935" href="#L935">935</a>
-<a class="jxr_linenumber" name="L936" href="#L936">936</a>
addMavenInstructions( currentProject, builder );
+<a class="jxr_linenumber" name="L908" href="#L908">908</a>
}
+<a class="jxr_linenumber" name="L909" href="#L909">909</a>
+<a class="jxr_linenumber" name="L910" href="#L910">910</a>
<strong class="jxr_keyword">if</strong> (!found)
+<a class="jxr_linenumber" name="L911" href="#L911">911</a>
{
+<a class="jxr_linenumber" name="L912" href="#L912">912</a>
<strong class="jxr_keyword">for</strong> (Dependency dep : dependencies)
+<a class="jxr_linenumber" name="L913" href="#L913">913</a>
{
+<a class="jxr_linenumber" name="L914" href="#L914">914</a>
<strong class="jxr_keyword">if</strong>
(dep.getArtifactId().equals(n2.getArtifact().getArtifactId())
+<a class="jxr_linenumber" name="L915" href="#L915">915</a>
&&
dep.getGroupId().equals(n2.getArtifact().getGroupId()))
+<a class="jxr_linenumber" name="L916" href="#L916">916</a>
{
+<a class="jxr_linenumber" name="L917" href="#L917">917</a>
Exclusion exclusion = <strong class="jxr_keyword">new</strong>
Exclusion();
+<a class="jxr_linenumber" name="L918" href="#L918">918</a>
exclusion.setArtifactId(n3.getArtifact().getArtifactId());
+<a class="jxr_linenumber" name="L919" href="#L919">919</a>
exclusion.setGroupId(n3.getArtifact().getGroupId());
+<a class="jxr_linenumber" name="L920" href="#L920">920</a>
dep.addExclusion(exclusion);
+<a class="jxr_linenumber" name="L921" href="#L921">921</a>
modified = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L922" href="#L922">922</a>
<strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="L923" href="#L923">923</a>
}
+<a class="jxr_linenumber" name="L924" href="#L924">924</a>
}
+<a class="jxr_linenumber" name="L925" href="#L925">925</a>
}
+<a class="jxr_linenumber" name="L926" href="#L926">926</a> }
+<a class="jxr_linenumber" name="L927" href="#L927">927</a> }
+<a class="jxr_linenumber" name="L928" href="#L928">928</a> }
+<a class="jxr_linenumber" name="L929" href="#L929">929</a> <strong
class="jxr_keyword">return</strong> modified;
+<a class="jxr_linenumber" name="L930" href="#L930">930</a> }
+<a class="jxr_linenumber" name="L931" href="#L931">931</a>
+<a class="jxr_linenumber" name="L932" href="#L932">932</a>
+<a class="jxr_linenumber" name="L933" href="#L933">933</a> <strong
class="jxr_keyword">protected</strong> Builder buildOSGiBundle(MavenProject
currentProject, Map<String, String> originalInstructions,
+<a class="jxr_linenumber" name="L934" href="#L934">934</a>
<a
href="../../../../org/apache/felix/bundleplugin/BundlePlugin.html">ClassPathItem</a>[]
classpath) <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L935" href="#L935">935</a> {
+<a class="jxr_linenumber" name="L936" href="#L936">936</a> Builder
builder = getOSGiBuilder( currentProject, originalInstructions, classpath );
<a class="jxr_linenumber" name="L937" href="#L937">937</a>
-<a class="jxr_linenumber" name="L938" href="#L938">938</a>
builder.build();
+<a class="jxr_linenumber" name="L938" href="#L938">938</a>
addMavenInstructions( currentProject, builder );
<a class="jxr_linenumber" name="L939" href="#L939">939</a>
-<a class="jxr_linenumber" name="L940" href="#L940">940</a>
mergeMavenManifest(currentProject, builder);
+<a class="jxr_linenumber" name="L940" href="#L940">940</a>
builder.build();
<a class="jxr_linenumber" name="L941" href="#L941">941</a>
-<a class="jxr_linenumber" name="L942" href="#L942">942</a> <strong
class="jxr_keyword">return</strong> builder;
-<a class="jxr_linenumber" name="L943" href="#L943">943</a> }
-<a class="jxr_linenumber" name="L944" href="#L944">944</a>
-<a class="jxr_linenumber" name="L945" href="#L945">945</a>
-<a class="jxr_linenumber" name="L946" href="#L946">946</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">static</strong> StringBuilder dumpInstructions( Properties
properties, StringBuilder buf )
-<a class="jxr_linenumber" name="L947" href="#L947">947</a> {
-<a class="jxr_linenumber" name="L948" href="#L948">948</a> <strong
class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L949" href="#L949">949</a> {
-<a class="jxr_linenumber" name="L950" href="#L950">950</a>
buf.append( <span
class="jxr_string">"#-----------------------------------------------------------------------"</span>
+ NL );
-<a class="jxr_linenumber" name="L951" href="#L951">951</a>
Properties stringProperties = <strong class="jxr_keyword">new</strong>
Properties();
-<a class="jxr_linenumber" name="L952" href="#L952">952</a> <strong
class="jxr_keyword">for</strong> ( Enumeration<String> e =
(Enumeration<String>) properties.propertyNames(); e.hasMoreElements(); )
-<a class="jxr_linenumber" name="L953" href="#L953">953</a> {
-<a class="jxr_linenumber" name="L954" href="#L954">954</a> <em
class="jxr_comment">// we can only store String properties</em>
-<a class="jxr_linenumber" name="L955" href="#L955">955</a>
String key = e.nextElement();
-<a class="jxr_linenumber" name="L956" href="#L956">956</a>
String value = properties.getProperty( key );
-<a class="jxr_linenumber" name="L957" href="#L957">957</a>
<strong class="jxr_keyword">if</strong> ( value != <strong
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L958" href="#L958">958</a> {
-<a class="jxr_linenumber" name="L959" href="#L959">959</a>
stringProperties.setProperty( key, value );
-<a class="jxr_linenumber" name="L960" href="#L960">960</a> }
-<a class="jxr_linenumber" name="L961" href="#L961">961</a> }
-<a class="jxr_linenumber" name="L962" href="#L962">962</a>
ByteArrayOutputStream out = <strong class="jxr_keyword">new</strong>
ByteArrayOutputStream();
-<a class="jxr_linenumber" name="L963" href="#L963">963</a>
stringProperties.store( out, <strong class="jxr_keyword">null</strong> ); <em
class="jxr_comment">// properties encoding is 8859_1</em>
-<a class="jxr_linenumber" name="L964" href="#L964">964</a>
buf.append( out.toString( <span class="jxr_string">"8859_1"</span> ) );
-<a class="jxr_linenumber" name="L965" href="#L965">965</a>
buf.append(<span
class="jxr_string">"#-----------------------------------------------------------------------"</span>).append(NL);
-<a class="jxr_linenumber" name="L966" href="#L966">966</a> }
-<a class="jxr_linenumber" name="L967" href="#L967">967</a> <strong
class="jxr_keyword">catch</strong> ( Throwable e )
-<a class="jxr_linenumber" name="L968" href="#L968">968</a> {
-<a class="jxr_linenumber" name="L969" href="#L969">969</a> <em
class="jxr_comment">// ignore...</em>
-<a class="jxr_linenumber" name="L970" href="#L970">970</a> }
-<a class="jxr_linenumber" name="L971" href="#L971">971</a> <strong
class="jxr_keyword">return</strong> buf;
-<a class="jxr_linenumber" name="L972" href="#L972">972</a> }
-<a class="jxr_linenumber" name="L973" href="#L973">973</a>
-<a class="jxr_linenumber" name="L974" href="#L974">974</a>
-<a class="jxr_linenumber" name="L975" href="#L975">975</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">static</strong> StringBuilder dumpClasspath(
List<Jar> classpath, StringBuilder buf )
-<a class="jxr_linenumber" name="L976" href="#L976">976</a> {
-<a class="jxr_linenumber" name="L977" href="#L977">977</a> <strong
class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L978" href="#L978">978</a> {
-<a class="jxr_linenumber" name="L979" href="#L979">979</a>
buf.append(<span
class="jxr_string">"#-----------------------------------------------------------------------"</span>).append(NL);
-<a class="jxr_linenumber" name="L980" href="#L980">980</a>
buf.append(<span class="jxr_string">"-classpath:\\"</span>).append(NL);
-<a class="jxr_linenumber" name="L981" href="#L981">981</a> <strong
class="jxr_keyword">for</strong> ( Iterator<Jar> i =
classpath.iterator(); i.hasNext(); )
-<a class="jxr_linenumber" name="L982" href="#L982">982</a> {
-<a class="jxr_linenumber" name="L983" href="#L983">983</a>
File path = i.next().getSource();
-<a class="jxr_linenumber" name="L984" href="#L984">984</a>
<strong class="jxr_keyword">if</strong> ( path != <strong
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L985" href="#L985">985</a> {
-<a class="jxr_linenumber" name="L986" href="#L986">986</a>
buf.append(' ').append(path.toString()).append(i.hasNext() ? <span
class="jxr_string">",\\"</span> : <span
class="jxr_string">""</span>).append(NL);
-<a class="jxr_linenumber" name="L987" href="#L987">987</a> }
-<a class="jxr_linenumber" name="L988" href="#L988">988</a> }
-<a class="jxr_linenumber" name="L989" href="#L989">989</a>
buf.append(<span
class="jxr_string">"#-----------------------------------------------------------------------"</span>).append(NL);
-<a class="jxr_linenumber" name="L990" href="#L990">990</a> }
-<a class="jxr_linenumber" name="L991" href="#L991">991</a> <strong
class="jxr_keyword">catch</strong> ( Throwable e )
-<a class="jxr_linenumber" name="L992" href="#L992">992</a> {
-<a class="jxr_linenumber" name="L993" href="#L993">993</a> <em
class="jxr_comment">// ignore...</em>
-<a class="jxr_linenumber" name="L994" href="#L994">994</a> }
-<a class="jxr_linenumber" name="L995" href="#L995">995</a> <strong
class="jxr_keyword">return</strong> buf;
-<a class="jxr_linenumber" name="L996" href="#L996">996</a> }
-<a class="jxr_linenumber" name="L997" href="#L997">997</a>
-<a class="jxr_linenumber" name="L998" href="#L998">998</a>
-<a class="jxr_linenumber" name="L999" href="#L999">999</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">static</strong> StringBuilder dumpManifest( Manifest
manifest, StringBuilder buf )
-<a class="jxr_linenumber" name="L1000" href="#L1000">1000</a> {
-<a class="jxr_linenumber" name="L1001" href="#L1001">1001</a> <strong
class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L1002" href="#L1002">1002</a> {
-<a class="jxr_linenumber" name="L1003" href="#L1003">1003</a>
buf.append(<span
class="jxr_string">"#-----------------------------------------------------------------------"</span>).append(NL);
-<a class="jxr_linenumber" name="L1004" href="#L1004">1004</a>
ByteArrayOutputStream out = <strong class="jxr_keyword">new</strong>
ByteArrayOutputStream();
-<a class="jxr_linenumber" name="L1005" href="#L1005">1005</a>
ManifestWriter.outputManifest(manifest, out, <strong
class="jxr_keyword">true</strong>); <em class="jxr_comment">// manifest
encoding is UTF8</em>
-<a class="jxr_linenumber" name="L1006" href="#L1006">1006</a>
buf.append( out.toString( <span class="jxr_string">"UTF8"</span> ) );
-<a class="jxr_linenumber" name="L1007" href="#L1007">1007</a>
buf.append(<span
class="jxr_string">"#-----------------------------------------------------------------------"</span>).append(NL);
-<a class="jxr_linenumber" name="L1008" href="#L1008">1008</a> }
-<a class="jxr_linenumber" name="L1009" href="#L1009">1009</a> <strong
class="jxr_keyword">catch</strong> ( Throwable e )
-<a class="jxr_linenumber" name="L1010" href="#L1010">1010</a> {
-<a class="jxr_linenumber" name="L1011" href="#L1011">1011</a> <em
class="jxr_comment">// ignore...</em>
-<a class="jxr_linenumber" name="L1012" href="#L1012">1012</a> }
-<a class="jxr_linenumber" name="L1013" href="#L1013">1013</a> <strong
class="jxr_keyword">return</strong> buf;
-<a class="jxr_linenumber" name="L1014" href="#L1014">1014</a> }
-<a class="jxr_linenumber" name="L1015" href="#L1015">1015</a>
-<a class="jxr_linenumber" name="L1016" href="#L1016">1016</a>
-<a class="jxr_linenumber" name="L1017" href="#L1017">1017</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong>
includeMavenResources( MavenProject currentProject, Analyzer analyzer, Log log )
-<a class="jxr_linenumber" name="L1018" href="#L1018">1018</a> {
-<a class="jxr_linenumber" name="L1019" href="#L1019">1019</a> <em
class="jxr_comment">// pass maven resource paths onto BND analyzer</em>
-<a class="jxr_linenumber" name="L1020" href="#L1020">1020</a> <strong
class="jxr_keyword">final</strong> String mavenResourcePaths =
getMavenResourcePaths( currentProject, false );
-<a class="jxr_linenumber" name="L1021" href="#L1021">1021</a> <strong
class="jxr_keyword">final</strong> String mavenTestResourcePaths =
getMavenResourcePaths( currentProject, <strong
class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="L1022" href="#L1022">1022</a> <strong
class="jxr_keyword">final</strong> String includeResource =
analyzer.getProperty( Analyzer.INCLUDE_RESOURCE );
-<a class="jxr_linenumber" name="L1023" href="#L1023">1023</a> <strong
class="jxr_keyword">if</strong> ( includeResource != <strong
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L1024" href="#L1024">1024</a> {
-<a class="jxr_linenumber" name="L1025" href="#L1025">1025</a>
<strong class="jxr_keyword">if</strong> ( includeResource.contains(
MAVEN_RESOURCES ) || includeResource.contains( MAVEN_TEST_RESOURCES ) )
-<a class="jxr_linenumber" name="L1026" href="#L1026">1026</a> {
-<a class="jxr_linenumber" name="L1027" href="#L1027">1027</a>
String combinedResource = StringUtils.replace( includeResource,
MAVEN_RESOURCES, mavenResourcePaths );
-<a class="jxr_linenumber" name="L1028" href="#L1028">1028</a>
combinedResource = StringUtils.replace( combinedResource, MAVEN_TEST_RESOURCES,
mavenTestResourcePaths );
-<a class="jxr_linenumber" name="L1029" href="#L1029">1029</a>
<strong class="jxr_keyword">if</strong> ( combinedResource.length() > 0 )
-<a class="jxr_linenumber" name="L1030" href="#L1030">1030</a> {
-<a class="jxr_linenumber" name="L1031" href="#L1031">1031</a>
analyzer.setProperty( Analyzer.INCLUDE_RESOURCE, combinedResource );
-<a class="jxr_linenumber" name="L1032" href="#L1032">1032</a> }
-<a class="jxr_linenumber" name="L1033" href="#L1033">1033</a>
<strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L1034" href="#L1034">1034</a> {
-<a class="jxr_linenumber" name="L1035" href="#L1035">1035</a>
analyzer.unsetProperty( Analyzer.INCLUDE_RESOURCE );
-<a class="jxr_linenumber" name="L1036" href="#L1036">1036</a> }
-<a class="jxr_linenumber" name="L1037" href="#L1037">1037</a> }
-<a class="jxr_linenumber" name="L1038" href="#L1038">1038</a>
<strong class="jxr_keyword">else</strong> <strong
class="jxr_keyword">if</strong> ( mavenResourcePaths.length() > 0 )
-<a class="jxr_linenumber" name="L1039" href="#L1039">1039</a> {
[... 2347 lines stripped ...]
