Modified: websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/BaseFilter.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/BaseFilter.html (original) +++ websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/BaseFilter.html Sat May 28 21:55:32 2016 @@ -44,292 +44,305 @@ <a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.interpolation.multi.MultiDelimiterStringSearchInterpolator; <a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.logging.AbstractLogEnabled; <a class="jxr_linenumber" name="L38" href="#L38">38</a> -<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">import</strong> javax.annotation.Nonnull; -<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">import</strong> java.io.File; -<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">import</strong> java.io.IOException; -<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">import</strong> java.io.Reader; -<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">import</strong> java.util.ArrayList; -<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">import</strong> java.util.Collections; -<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">import</strong> java.util.LinkedHashSet; -<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong class="jxr_keyword">import</strong> java.util.List; -<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">import</strong> java.util.Properties; -<a class="jxr_linenumber" name="L48" href="#L48">48</a> -<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/shared/filtering/BaseFilter.html">BaseFilter</a> -<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong class="jxr_keyword">extends</strong> AbstractLogEnabled -<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">implements</strong> <a href="../../../../../org/apache/maven/shared/filtering/DefaultFilterInfo.html">DefaultFilterInfo</a> -<a class="jxr_linenumber" name="L52" href="#L52">52</a> { -<a class="jxr_linenumber" name="L53" href="#L53">53</a> -<a class="jxr_linenumber" name="L54" href="#L54">54</a> @Nonnull -<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">public</strong> List<FileUtils.FilterWrapper> getDefaultFilterWrappers( <strong class="jxr_keyword">final</strong> MavenProject mavenProject, -<a class="jxr_linenumber" name="L56" href="#L56">56</a> List<String> filters, -<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> escapedBackslashesInFilePath, -<a class="jxr_linenumber" name="L58" href="#L58">58</a> MavenSession mavenSession, -<a class="jxr_linenumber" name="L59" href="#L59">59</a> <a href="../../../../../org/apache/maven/shared/filtering/MavenResourcesExecution.html">MavenResourcesExecution</a> mavenResourcesExecution ) -<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/shared/filtering/MavenFilteringException.html">MavenFilteringException</a> -<a class="jxr_linenumber" name="L61" href="#L61">61</a> { -<a class="jxr_linenumber" name="L62" href="#L62">62</a> -<a class="jxr_linenumber" name="L63" href="#L63">63</a> <a href="../../../../../org/apache/maven/shared/filtering/MavenResourcesExecution.html">MavenResourcesExecution</a> mre = -<a class="jxr_linenumber" name="L64" href="#L64">64</a> mavenResourcesExecution == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/shared/filtering/MavenResourcesExecution.html">MavenResourcesExecution</a>() : mavenResourcesExecution.copyOf(); -<a class="jxr_linenumber" name="L65" href="#L65">65</a> -<a class="jxr_linenumber" name="L66" href="#L66">66</a> mre.setMavenProject( mavenProject ); -<a class="jxr_linenumber" name="L67" href="#L67">67</a> mre.setMavenSession( mavenSession ); -<a class="jxr_linenumber" name="L68" href="#L68">68</a> mre.setFilters( filters ); -<a class="jxr_linenumber" name="L69" href="#L69">69</a> mre.setEscapedBackslashesInFilePath( escapedBackslashesInFilePath ); -<a class="jxr_linenumber" name="L70" href="#L70">70</a> -<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong class="jxr_keyword">return</strong> getDefaultFilterWrappers( mre ); -<a class="jxr_linenumber" name="L72" href="#L72">72</a> -<a class="jxr_linenumber" name="L73" href="#L73">73</a> } -<a class="jxr_linenumber" name="L74" href="#L74">74</a> -<a class="jxr_linenumber" name="L75" href="#L75">75</a> @Nonnull -<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong class="jxr_keyword">public</strong> List<FileUtils.FilterWrapper> getDefaultFilterWrappers( <strong class="jxr_keyword">final</strong> AbstractMavenFilteringRequest req ) -<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/shared/filtering/MavenFilteringException.html">MavenFilteringException</a> -<a class="jxr_linenumber" name="L78" href="#L78">78</a> { -<a class="jxr_linenumber" name="L79" href="#L79">79</a> <em class="jxr_comment">// backup values</em> -<a class="jxr_linenumber" name="L80" href="#L80">80</a> <strong class="jxr_keyword">boolean</strong> supportMultiLineFiltering = req.isSupportMultiLineFiltering(); -<a class="jxr_linenumber" name="L81" href="#L81">81</a> -<a class="jxr_linenumber" name="L82" href="#L82">82</a> <em class="jxr_comment">// compensate for null parameter value.</em> -<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.html">AbstractMavenFilteringRequest</a> request = req == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/shared/filtering/MavenFileFilterRequest.html">MavenFileFilterRequest</a>() : req; -<a class="jxr_linenumber" name="L84" href="#L84">84</a> -<a class="jxr_linenumber" name="L85" href="#L85">85</a> request.setSupportMultiLineFiltering( supportMultiLineFiltering ); -<a class="jxr_linenumber" name="L86" href="#L86">86</a> -<a class="jxr_linenumber" name="L87" href="#L87">87</a> <em class="jxr_comment">// Here we build some properties which will be used to read some properties files</em> -<a class="jxr_linenumber" name="L88" href="#L88">88</a> <em class="jxr_comment">// to interpolate the expression ${ } in this properties file</em> -<a class="jxr_linenumber" name="L89" href="#L89">89</a> -<a class="jxr_linenumber" name="L90" href="#L90">90</a> <em class="jxr_comment">// Take a copy of filterProperties to ensure that evaluated filterTokens are not propagated</em> -<a class="jxr_linenumber" name="L91" href="#L91">91</a> <em class="jxr_comment">// to subsequent filter files. Note: this replicates current behaviour and seems to make sense.</em> -<a class="jxr_linenumber" name="L92" href="#L92">92</a> -<a class="jxr_linenumber" name="L93" href="#L93">93</a> <strong class="jxr_keyword">final</strong> Properties baseProps = <strong class="jxr_keyword">new</strong> Properties(); -<a class="jxr_linenumber" name="L94" href="#L94">94</a> -<a class="jxr_linenumber" name="L95" href="#L95">95</a> <em class="jxr_comment">// Project properties</em> -<a class="jxr_linenumber" name="L96" href="#L96">96</a> <strong class="jxr_keyword">if</strong> ( request.getMavenProject() != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L97" href="#L97">97</a> { -<a class="jxr_linenumber" name="L98" href="#L98">98</a> baseProps.putAll( request.getMavenProject().getProperties() == <strong class="jxr_keyword">null</strong> ? Collections.emptyMap() -<a class="jxr_linenumber" name="L99" href="#L99">99</a> : request.getMavenProject().getProperties() ); -<a class="jxr_linenumber" name="L100" href="#L100">100</a> } -<a class="jxr_linenumber" name="L101" href="#L101">101</a> <em class="jxr_comment">// TODO this is NPE free but do we consider this as normal</em> -<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_comment">// or do we have to throw an MavenFilteringException with mavenSession cannot be null</em> -<a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong class="jxr_keyword">if</strong> ( request.getMavenSession() != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L104" href="#L104">104</a> { -<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_comment">// execution properties wins</em> -<a class="jxr_linenumber" name="L106" href="#L106">106</a> baseProps.putAll( request.getMavenSession().getExecutionProperties() ); -<a class="jxr_linenumber" name="L107" href="#L107">107</a> } -<a class="jxr_linenumber" name="L108" href="#L108">108</a> -<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_comment">// now we build properties to use for resources interpolation</em> -<a class="jxr_linenumber" name="L110" href="#L110">110</a> -<a class="jxr_linenumber" name="L111" href="#L111">111</a> <strong class="jxr_keyword">final</strong> Properties filterProperties = <strong class="jxr_keyword">new</strong> Properties(); -<a class="jxr_linenumber" name="L112" href="#L112">112</a> -<a class="jxr_linenumber" name="L113" href="#L113">113</a> File basedir = request.getMavenProject() != <strong class="jxr_keyword">null</strong> ? request.getMavenProject().getBasedir() : <strong class="jxr_keyword">new</strong> File( <span class="jxr_string">"."</span> ); -<a class="jxr_linenumber" name="L114" href="#L114">114</a> -<a class="jxr_linenumber" name="L115" href="#L115">115</a> loadProperties( filterProperties, basedir, request.getFileFilters(), baseProps ); -<a class="jxr_linenumber" name="L116" href="#L116">116</a> <strong class="jxr_keyword">if</strong> ( filterProperties.size() < 1 ) -<a class="jxr_linenumber" name="L117" href="#L117">117</a> { -<a class="jxr_linenumber" name="L118" href="#L118">118</a> filterProperties.putAll( baseProps ); +<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">import</strong> java.io.File; +<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">import</strong> java.io.IOException; +<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">import</strong> java.io.Reader; +<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">import</strong> java.util.ArrayList; +<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">import</strong> java.util.Collections; +<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">import</strong> java.util.LinkedHashSet; +<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">import</strong> java.util.List; +<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong class="jxr_keyword">import</strong> java.util.Properties; +<a class="jxr_linenumber" name="L47" href="#L47">47</a> +<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong class="jxr_keyword">import</strong> javax.annotation.Nonnull; +<a class="jxr_linenumber" name="L49" href="#L49">49</a> +<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/shared/filtering/BaseFilter.html">BaseFilter</a> +<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">extends</strong> AbstractLogEnabled +<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">implements</strong> <a href="../../../../../org/apache/maven/shared/filtering/DefaultFilterInfo.html">DefaultFilterInfo</a> +<a class="jxr_linenumber" name="L53" href="#L53">53</a> { +<a class="jxr_linenumber" name="L54" href="#L54">54</a> +<a class="jxr_linenumber" name="L55" href="#L55">55</a> @Nonnull +<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">public</strong> List<FileUtils.FilterWrapper> getDefaultFilterWrappers( <strong class="jxr_keyword">final</strong> MavenProject mavenProject, +<a class="jxr_linenumber" name="L57" href="#L57">57</a> List<String> filters, +<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> escapedBackslashesInFilePath, +<a class="jxr_linenumber" name="L59" href="#L59">59</a> MavenSession mavenSession, +<a class="jxr_linenumber" name="L60" href="#L60">60</a> <a href="../../../../../org/apache/maven/shared/filtering/MavenResourcesExecution.html">MavenResourcesExecution</a> mavenResourcesExecution ) +<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/shared/filtering/MavenFilteringException.html">MavenFilteringException</a> +<a class="jxr_linenumber" name="L62" href="#L62">62</a> { +<a class="jxr_linenumber" name="L63" href="#L63">63</a> +<a class="jxr_linenumber" name="L64" href="#L64">64</a> <a href="../../../../../org/apache/maven/shared/filtering/MavenResourcesExecution.html">MavenResourcesExecution</a> mre = +<a class="jxr_linenumber" name="L65" href="#L65">65</a> mavenResourcesExecution == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/shared/filtering/MavenResourcesExecution.html">MavenResourcesExecution</a>() : mavenResourcesExecution.copyOf(); +<a class="jxr_linenumber" name="L66" href="#L66">66</a> +<a class="jxr_linenumber" name="L67" href="#L67">67</a> mre.setMavenProject( mavenProject ); +<a class="jxr_linenumber" name="L68" href="#L68">68</a> mre.setMavenSession( mavenSession ); +<a class="jxr_linenumber" name="L69" href="#L69">69</a> mre.setFilters( filters ); +<a class="jxr_linenumber" name="L70" href="#L70">70</a> mre.setEscapedBackslashesInFilePath( escapedBackslashesInFilePath ); +<a class="jxr_linenumber" name="L71" href="#L71">71</a> +<a class="jxr_linenumber" name="L72" href="#L72">72</a> <strong class="jxr_keyword">return</strong> getDefaultFilterWrappers( mre ); +<a class="jxr_linenumber" name="L73" href="#L73">73</a> +<a class="jxr_linenumber" name="L74" href="#L74">74</a> } +<a class="jxr_linenumber" name="L75" href="#L75">75</a> +<a class="jxr_linenumber" name="L76" href="#L76">76</a> @Nonnull +<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">public</strong> List<FileUtils.FilterWrapper> getDefaultFilterWrappers( <strong class="jxr_keyword">final</strong> AbstractMavenFilteringRequest req ) +<a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/shared/filtering/MavenFilteringException.html">MavenFilteringException</a> +<a class="jxr_linenumber" name="L79" href="#L79">79</a> { +<a class="jxr_linenumber" name="L80" href="#L80">80</a> <em class="jxr_comment">// backup values</em> +<a class="jxr_linenumber" name="L81" href="#L81">81</a> <strong class="jxr_keyword">boolean</strong> supportMultiLineFiltering = req.isSupportMultiLineFiltering(); +<a class="jxr_linenumber" name="L82" href="#L82">82</a> +<a class="jxr_linenumber" name="L83" href="#L83">83</a> <em class="jxr_comment">// compensate for null parameter value.</em> +<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.html">AbstractMavenFilteringRequest</a> request = req == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/shared/filtering/MavenFileFilterRequest.html">MavenFileFilterRequest</a>() : req; +<a class="jxr_linenumber" name="L85" href="#L85">85</a> +<a class="jxr_linenumber" name="L86" href="#L86">86</a> request.setSupportMultiLineFiltering( supportMultiLineFiltering ); +<a class="jxr_linenumber" name="L87" href="#L87">87</a> +<a class="jxr_linenumber" name="L88" href="#L88">88</a> <em class="jxr_comment">// Here we build some properties which will be used to read some properties files</em> +<a class="jxr_linenumber" name="L89" href="#L89">89</a> <em class="jxr_comment">// to interpolate the expression ${ } in this properties file</em> +<a class="jxr_linenumber" name="L90" href="#L90">90</a> +<a class="jxr_linenumber" name="L91" href="#L91">91</a> <em class="jxr_comment">// Take a copy of filterProperties to ensure that evaluated filterTokens are not propagated</em> +<a class="jxr_linenumber" name="L92" href="#L92">92</a> <em class="jxr_comment">// to subsequent filter files. Note: this replicates current behaviour and seems to make sense.</em> +<a class="jxr_linenumber" name="L93" href="#L93">93</a> +<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">final</strong> Properties baseProps = <strong class="jxr_keyword">new</strong> Properties(); +<a class="jxr_linenumber" name="L95" href="#L95">95</a> +<a class="jxr_linenumber" name="L96" href="#L96">96</a> <em class="jxr_comment">// Project properties</em> +<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong class="jxr_keyword">if</strong> ( request.getMavenProject() != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L98" href="#L98">98</a> { +<a class="jxr_linenumber" name="L99" href="#L99">99</a> baseProps.putAll( request.getMavenProject().getProperties() == <strong class="jxr_keyword">null</strong> ? Collections.emptyMap() +<a class="jxr_linenumber" name="L100" href="#L100">100</a> : request.getMavenProject().getProperties() ); +<a class="jxr_linenumber" name="L101" href="#L101">101</a> } +<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_comment">// TODO this is NPE free but do we consider this as normal</em> +<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_comment">// or do we have to throw an MavenFilteringException with mavenSession cannot be null</em> +<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_comment">//</em> +<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_comment">// khmarbaise: 2016-05-21:</em> +<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_comment">// If we throw an MavenFilteringException tests will fail which is</em> +<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_comment">// caused by for example:</em> +<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_comment">// void copyFile( File from, final File to, boolean filtering, List<FileUtils.FilterWrapper> filterWrappers,</em> +<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em class="jxr_comment">// String encoding )</em> +<a class="jxr_linenumber" name="L110" href="#L110">110</a> <em class="jxr_comment">// in MavenFileFilter interface where no MavenSession is given.</em> +<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_comment">// So changing here to throw a MavenFilteringException would make</em> +<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_comment">// it necessary to change the interface or we need to find a better solution.</em> +<a class="jxr_linenumber" name="L113" href="#L113">113</a> <em class="jxr_comment">//</em> +<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong class="jxr_keyword">if</strong> ( request.getMavenSession() != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L115" href="#L115">115</a> { +<a class="jxr_linenumber" name="L116" href="#L116">116</a> <em class="jxr_comment">// User properties have precedence over system properties</em> +<a class="jxr_linenumber" name="L117" href="#L117">117</a> baseProps.putAll( request.getMavenSession().getSystemProperties() ); +<a class="jxr_linenumber" name="L118" href="#L118">118</a> baseProps.putAll( request.getMavenSession().getUserProperties() ); <a class="jxr_linenumber" name="L119" href="#L119">119</a> } <a class="jxr_linenumber" name="L120" href="#L120">120</a> -<a class="jxr_linenumber" name="L121" href="#L121">121</a> <strong class="jxr_keyword">if</strong> ( request.getMavenProject() != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L122" href="#L122">122</a> { -<a class="jxr_linenumber" name="L123" href="#L123">123</a> <strong class="jxr_keyword">if</strong> ( request.isInjectProjectBuildFilters() ) -<a class="jxr_linenumber" name="L124" href="#L124">124</a> { -<a class="jxr_linenumber" name="L125" href="#L125">125</a> List<String> buildFilters = <strong class="jxr_keyword">new</strong> ArrayList<String>( request.getMavenProject().getBuild().getFilters() ); +<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_comment">// now we build properties to use for resources interpolation</em> +<a class="jxr_linenumber" name="L122" href="#L122">122</a> +<a class="jxr_linenumber" name="L123" href="#L123">123</a> <strong class="jxr_keyword">final</strong> Properties filterProperties = <strong class="jxr_keyword">new</strong> Properties(); +<a class="jxr_linenumber" name="L124" href="#L124">124</a> +<a class="jxr_linenumber" name="L125" href="#L125">125</a> File basedir = request.getMavenProject() != <strong class="jxr_keyword">null</strong> ? request.getMavenProject().getBasedir() : <strong class="jxr_keyword">new</strong> File( <span class="jxr_string">"."</span> ); <a class="jxr_linenumber" name="L126" href="#L126">126</a> -<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_comment">// JDK-8015656: (coll) unexpected NPE from removeAll</em> -<a class="jxr_linenumber" name="L128" href="#L128">128</a> <strong class="jxr_keyword">if</strong> ( request.getFileFilters() != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L129" href="#L129">129</a> { -<a class="jxr_linenumber" name="L130" href="#L130">130</a> buildFilters.removeAll( request.getFileFilters() ); -<a class="jxr_linenumber" name="L131" href="#L131">131</a> } +<a class="jxr_linenumber" name="L127" href="#L127">127</a> loadProperties( filterProperties, basedir, request.getFileFilters(), baseProps ); +<a class="jxr_linenumber" name="L128" href="#L128">128</a> <strong class="jxr_keyword">if</strong> ( filterProperties.size() < 1 ) +<a class="jxr_linenumber" name="L129" href="#L129">129</a> { +<a class="jxr_linenumber" name="L130" href="#L130">130</a> filterProperties.putAll( baseProps ); +<a class="jxr_linenumber" name="L131" href="#L131">131</a> } <a class="jxr_linenumber" name="L132" href="#L132">132</a> -<a class="jxr_linenumber" name="L133" href="#L133">133</a> loadProperties( filterProperties, basedir, buildFilters, baseProps ); -<a class="jxr_linenumber" name="L134" href="#L134">134</a> } -<a class="jxr_linenumber" name="L135" href="#L135">135</a> -<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_comment">// Project properties</em> -<a class="jxr_linenumber" name="L137" href="#L137">137</a> filterProperties.putAll( request.getMavenProject().getProperties() == <strong class="jxr_keyword">null</strong> ? Collections.emptyMap() -<a class="jxr_linenumber" name="L138" href="#L138">138</a> : request.getMavenProject().getProperties() ); -<a class="jxr_linenumber" name="L139" href="#L139">139</a> } -<a class="jxr_linenumber" name="L140" href="#L140">140</a> <strong class="jxr_keyword">if</strong> ( request.getMavenSession() != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L141" href="#L141">141</a> { -<a class="jxr_linenumber" name="L142" href="#L142">142</a> <em class="jxr_comment">// execution properties wins</em> -<a class="jxr_linenumber" name="L143" href="#L143">143</a> filterProperties.putAll( request.getMavenSession().getExecutionProperties() ); -<a class="jxr_linenumber" name="L144" href="#L144">144</a> } -<a class="jxr_linenumber" name="L145" href="#L145">145</a> -<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">if</strong> ( request.getAdditionalProperties() != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L147" href="#L147">147</a> { -<a class="jxr_linenumber" name="L148" href="#L148">148</a> <em class="jxr_comment">// additional properties wins</em> -<a class="jxr_linenumber" name="L149" href="#L149">149</a> filterProperties.putAll( request.getAdditionalProperties() ); -<a class="jxr_linenumber" name="L150" href="#L150">150</a> } -<a class="jxr_linenumber" name="L151" href="#L151">151</a> -<a class="jxr_linenumber" name="L152" href="#L152">152</a> List<FileUtils.FilterWrapper> defaultFilterWrappers = -<a class="jxr_linenumber" name="L153" href="#L153">153</a> request == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">new</strong> ArrayList<FileUtils.FilterWrapper>( 1 ) -<a class="jxr_linenumber" name="L154" href="#L154">154</a> : <strong class="jxr_keyword">new</strong> ArrayList<FileUtils.FilterWrapper>( request.getDelimiters().size() + 1 ); -<a class="jxr_linenumber" name="L155" href="#L155">155</a> -<a class="jxr_linenumber" name="L156" href="#L156">156</a> <strong class="jxr_keyword">if</strong> ( getLogger().isDebugEnabled() ) -<a class="jxr_linenumber" name="L157" href="#L157">157</a> { -<a class="jxr_linenumber" name="L158" href="#L158">158</a> getLogger().debug( <span class="jxr_string">"properties used "</span> + filterProperties ); -<a class="jxr_linenumber" name="L159" href="#L159">159</a> } -<a class="jxr_linenumber" name="L160" href="#L160">160</a> -<a class="jxr_linenumber" name="L161" href="#L161">161</a> <strong class="jxr_keyword">final</strong> ValueSource propertiesValueSource = <strong class="jxr_keyword">new</strong> PropertiesBasedValueSource( filterProperties ); -<a class="jxr_linenumber" name="L162" href="#L162">162</a> -<a class="jxr_linenumber" name="L163" href="#L163">163</a> <strong class="jxr_keyword">if</strong> ( request != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L164" href="#L164">164</a> { -<a class="jxr_linenumber" name="L165" href="#L165">165</a> FileUtils.FilterWrapper wrapper = -<a class="jxr_linenumber" name="L166" href="#L166">166</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/shared/filtering/BaseFilter.html">Wrapper</a>( request.getDelimiters(), request.getMavenProject(), request.getMavenSession(), -<a class="jxr_linenumber" name="L167" href="#L167">167</a> propertiesValueSource, request.getProjectStartExpressions(), request.getEscapeString(), -<a class="jxr_linenumber" name="L168" href="#L168">168</a> request.isEscapeWindowsPaths(), request.isSupportMultiLineFiltering() ); -<a class="jxr_linenumber" name="L169" href="#L169">169</a> -<a class="jxr_linenumber" name="L170" href="#L170">170</a> defaultFilterWrappers.add( wrapper ); -<a class="jxr_linenumber" name="L171" href="#L171">171</a> } -<a class="jxr_linenumber" name="L172" href="#L172">172</a> -<a class="jxr_linenumber" name="L173" href="#L173">173</a> <strong class="jxr_keyword">return</strong> defaultFilterWrappers; -<a class="jxr_linenumber" name="L174" href="#L174">174</a> } +<a class="jxr_linenumber" name="L133" href="#L133">133</a> <strong class="jxr_keyword">if</strong> ( request.getMavenProject() != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L134" href="#L134">134</a> { +<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong class="jxr_keyword">if</strong> ( request.isInjectProjectBuildFilters() ) +<a class="jxr_linenumber" name="L136" href="#L136">136</a> { +<a class="jxr_linenumber" name="L137" href="#L137">137</a> List<String> buildFilters = <strong class="jxr_keyword">new</strong> ArrayList<String>( request.getMavenProject().getBuild().getFilters() ); +<a class="jxr_linenumber" name="L138" href="#L138">138</a> +<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_comment">// JDK-8015656: (coll) unexpected NPE from removeAll</em> +<a class="jxr_linenumber" name="L140" href="#L140">140</a> <strong class="jxr_keyword">if</strong> ( request.getFileFilters() != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L141" href="#L141">141</a> { +<a class="jxr_linenumber" name="L142" href="#L142">142</a> buildFilters.removeAll( request.getFileFilters() ); +<a class="jxr_linenumber" name="L143" href="#L143">143</a> } +<a class="jxr_linenumber" name="L144" href="#L144">144</a> +<a class="jxr_linenumber" name="L145" href="#L145">145</a> loadProperties( filterProperties, basedir, buildFilters, baseProps ); +<a class="jxr_linenumber" name="L146" href="#L146">146</a> } +<a class="jxr_linenumber" name="L147" href="#L147">147</a> +<a class="jxr_linenumber" name="L148" href="#L148">148</a> <em class="jxr_comment">// Project properties</em> +<a class="jxr_linenumber" name="L149" href="#L149">149</a> filterProperties.putAll( request.getMavenProject().getProperties() == <strong class="jxr_keyword">null</strong> ? Collections.emptyMap() +<a class="jxr_linenumber" name="L150" href="#L150">150</a> : request.getMavenProject().getProperties() ); +<a class="jxr_linenumber" name="L151" href="#L151">151</a> } +<a class="jxr_linenumber" name="L152" href="#L152">152</a> <strong class="jxr_keyword">if</strong> ( request.getMavenSession() != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L153" href="#L153">153</a> { +<a class="jxr_linenumber" name="L154" href="#L154">154</a> <em class="jxr_comment">// User properties have precedence over system properties</em> +<a class="jxr_linenumber" name="L155" href="#L155">155</a> filterProperties.putAll( request.getMavenSession().getSystemProperties() ); +<a class="jxr_linenumber" name="L156" href="#L156">156</a> filterProperties.putAll( request.getMavenSession().getUserProperties() ); +<a class="jxr_linenumber" name="L157" href="#L157">157</a> } +<a class="jxr_linenumber" name="L158" href="#L158">158</a> +<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">if</strong> ( request.getAdditionalProperties() != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L160" href="#L160">160</a> { +<a class="jxr_linenumber" name="L161" href="#L161">161</a> <em class="jxr_comment">// additional properties wins</em> +<a class="jxr_linenumber" name="L162" href="#L162">162</a> filterProperties.putAll( request.getAdditionalProperties() ); +<a class="jxr_linenumber" name="L163" href="#L163">163</a> } +<a class="jxr_linenumber" name="L164" href="#L164">164</a> +<a class="jxr_linenumber" name="L165" href="#L165">165</a> List<FileUtils.FilterWrapper> defaultFilterWrappers = +<a class="jxr_linenumber" name="L166" href="#L166">166</a> request == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">new</strong> ArrayList<FileUtils.FilterWrapper>( 1 ) +<a class="jxr_linenumber" name="L167" href="#L167">167</a> : <strong class="jxr_keyword">new</strong> ArrayList<FileUtils.FilterWrapper>( request.getDelimiters().size() + 1 ); +<a class="jxr_linenumber" name="L168" href="#L168">168</a> +<a class="jxr_linenumber" name="L169" href="#L169">169</a> <strong class="jxr_keyword">if</strong> ( getLogger().isDebugEnabled() ) +<a class="jxr_linenumber" name="L170" href="#L170">170</a> { +<a class="jxr_linenumber" name="L171" href="#L171">171</a> getLogger().debug( <span class="jxr_string">"properties used "</span> + filterProperties ); +<a class="jxr_linenumber" name="L172" href="#L172">172</a> } +<a class="jxr_linenumber" name="L173" href="#L173">173</a> +<a class="jxr_linenumber" name="L174" href="#L174">174</a> <strong class="jxr_keyword">final</strong> ValueSource propertiesValueSource = <strong class="jxr_keyword">new</strong> PropertiesBasedValueSource( filterProperties ); <a class="jxr_linenumber" name="L175" href="#L175">175</a> -<a class="jxr_linenumber" name="L176" href="#L176">176</a> <em class="jxr_javadoccomment">/**</em> -<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em class="jxr_javadoccomment"> * default visibility only for testing reason !</em> -<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">void</strong> loadProperties( Properties filterProperties, File basedir, List<String> propertiesFilePaths, -<a class="jxr_linenumber" name="L180" href="#L180">180</a> Properties baseProps ) -<a class="jxr_linenumber" name="L181" href="#L181">181</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/shared/filtering/MavenFilteringException.html">MavenFilteringException</a> -<a class="jxr_linenumber" name="L182" href="#L182">182</a> { -<a class="jxr_linenumber" name="L183" href="#L183">183</a> <strong class="jxr_keyword">if</strong> ( propertiesFilePaths != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L184" href="#L184">184</a> { -<a class="jxr_linenumber" name="L185" href="#L185">185</a> Properties workProperties = <strong class="jxr_keyword">new</strong> Properties(); -<a class="jxr_linenumber" name="L186" href="#L186">186</a> workProperties.putAll( baseProps ); -<a class="jxr_linenumber" name="L187" href="#L187">187</a> -<a class="jxr_linenumber" name="L188" href="#L188">188</a> <strong class="jxr_keyword">for</strong> ( String filterFile : propertiesFilePaths ) -<a class="jxr_linenumber" name="L189" href="#L189">189</a> { -<a class="jxr_linenumber" name="L190" href="#L190">190</a> <strong class="jxr_keyword">if</strong> ( StringUtils.isEmpty( filterFile ) ) -<a class="jxr_linenumber" name="L191" href="#L191">191</a> { -<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_comment">// skip empty file name</em> -<a class="jxr_linenumber" name="L193" href="#L193">193</a> <strong class="jxr_keyword">continue</strong>; -<a class="jxr_linenumber" name="L194" href="#L194">194</a> } -<a class="jxr_linenumber" name="L195" href="#L195">195</a> <strong class="jxr_keyword">try</strong> -<a class="jxr_linenumber" name="L196" href="#L196">196</a> { -<a class="jxr_linenumber" name="L197" href="#L197">197</a> File propFile = FileUtils.resolveFile( basedir, filterFile ); -<a class="jxr_linenumber" name="L198" href="#L198">198</a> Properties properties = PropertyUtils.loadPropertyFile( propFile, workProperties ); -<a class="jxr_linenumber" name="L199" href="#L199">199</a> filterProperties.putAll( properties ); -<a class="jxr_linenumber" name="L200" href="#L200">200</a> workProperties.putAll( properties ); -<a class="jxr_linenumber" name="L201" href="#L201">201</a> } -<a class="jxr_linenumber" name="L202" href="#L202">202</a> <strong class="jxr_keyword">catch</strong> ( IOException e ) -<a class="jxr_linenumber" name="L203" href="#L203">203</a> { -<a class="jxr_linenumber" name="L204" href="#L204">204</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/shared/filtering/MavenFilteringException.html">MavenFilteringException</a>( <span class="jxr_string">"Error loading property file '"</span> + filterFile + <span class="jxr_string">"'"</span>, e ); -<a class="jxr_linenumber" name="L205" href="#L205">205</a> } -<a class="jxr_linenumber" name="L206" href="#L206">206</a> } -<a class="jxr_linenumber" name="L207" href="#L207">207</a> } -<a class="jxr_linenumber" name="L208" href="#L208">208</a> } -<a class="jxr_linenumber" name="L209" href="#L209">209</a> -<a class="jxr_linenumber" name="L210" href="#L210">210</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/shared/filtering/BaseFilter.html">Wrapper</a> -<a class="jxr_linenumber" name="L211" href="#L211">211</a> <strong class="jxr_keyword">extends</strong> FileUtils.FilterWrapper -<a class="jxr_linenumber" name="L212" href="#L212">212</a> { -<a class="jxr_linenumber" name="L213" href="#L213">213</a> -<a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong class="jxr_keyword">private</strong> LinkedHashSet<String> delimiters; -<a class="jxr_linenumber" name="L215" href="#L215">215</a> -<a class="jxr_linenumber" name="L216" href="#L216">216</a> <strong class="jxr_keyword">private</strong> MavenProject project; -<a class="jxr_linenumber" name="L217" href="#L217">217</a> -<a class="jxr_linenumber" name="L218" href="#L218">218</a> <strong class="jxr_keyword">private</strong> ValueSource propertiesValueSource; -<a class="jxr_linenumber" name="L219" href="#L219">219</a> -<a class="jxr_linenumber" name="L220" href="#L220">220</a> <strong class="jxr_keyword">private</strong> List<String> projectStartExpressions; -<a class="jxr_linenumber" name="L221" href="#L221">221</a> -<a class="jxr_linenumber" name="L222" href="#L222">222</a> <strong class="jxr_keyword">private</strong> String escapeString; -<a class="jxr_linenumber" name="L223" href="#L223">223</a> -<a class="jxr_linenumber" name="L224" href="#L224">224</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> escapeWindowsPaths; -<a class="jxr_linenumber" name="L225" href="#L225">225</a> -<a class="jxr_linenumber" name="L226" href="#L226">226</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> MavenSession mavenSession; -<a class="jxr_linenumber" name="L227" href="#L227">227</a> -<a class="jxr_linenumber" name="L228" href="#L228">228</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> supportMultiLineFiltering; -<a class="jxr_linenumber" name="L229" href="#L229">229</a> -<a class="jxr_linenumber" name="L230" href="#L230">230</a> <a href="../../../../../org/apache/maven/shared/filtering/BaseFilter.html">Wrapper</a>( LinkedHashSet<String> delimiters, MavenProject project, MavenSession mavenSession, -<a class="jxr_linenumber" name="L231" href="#L231">231</a> ValueSource propertiesValueSource, List<String> projectStartExpressions, String escapeString, -<a class="jxr_linenumber" name="L232" href="#L232">232</a> <strong class="jxr_keyword">boolean</strong> escapeWindowsPaths, <strong class="jxr_keyword">boolean</strong> supportMultiLineFiltering ) -<a class="jxr_linenumber" name="L233" href="#L233">233</a> { -<a class="jxr_linenumber" name="L234" href="#L234">234</a> <strong class="jxr_keyword">super</strong>(); -<a class="jxr_linenumber" name="L235" href="#L235">235</a> <strong class="jxr_keyword">this</strong>.delimiters = delimiters; -<a class="jxr_linenumber" name="L236" href="#L236">236</a> <strong class="jxr_keyword">this</strong>.project = project; -<a class="jxr_linenumber" name="L237" href="#L237">237</a> <strong class="jxr_keyword">this</strong>.mavenSession = mavenSession; -<a class="jxr_linenumber" name="L238" href="#L238">238</a> <strong class="jxr_keyword">this</strong>.propertiesValueSource = propertiesValueSource; -<a class="jxr_linenumber" name="L239" href="#L239">239</a> <strong class="jxr_keyword">this</strong>.projectStartExpressions = projectStartExpressions; -<a class="jxr_linenumber" name="L240" href="#L240">240</a> <strong class="jxr_keyword">this</strong>.escapeString = escapeString; -<a class="jxr_linenumber" name="L241" href="#L241">241</a> <strong class="jxr_keyword">this</strong>.escapeWindowsPaths = escapeWindowsPaths; -<a class="jxr_linenumber" name="L242" href="#L242">242</a> <strong class="jxr_keyword">this</strong>.supportMultiLineFiltering = supportMultiLineFiltering; -<a class="jxr_linenumber" name="L243" href="#L243">243</a> } -<a class="jxr_linenumber" name="L244" href="#L244">244</a> -<a class="jxr_linenumber" name="L245" href="#L245">245</a> <strong class="jxr_keyword">public</strong> Reader getReader( Reader reader ) +<a class="jxr_linenumber" name="L176" href="#L176">176</a> <strong class="jxr_keyword">if</strong> ( request != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L177" href="#L177">177</a> { +<a class="jxr_linenumber" name="L178" href="#L178">178</a> FileUtils.FilterWrapper wrapper = +<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/shared/filtering/BaseFilter.html">Wrapper</a>( request.getDelimiters(), request.getMavenProject(), request.getMavenSession(), +<a class="jxr_linenumber" name="L180" href="#L180">180</a> propertiesValueSource, request.getProjectStartExpressions(), request.getEscapeString(), +<a class="jxr_linenumber" name="L181" href="#L181">181</a> request.isEscapeWindowsPaths(), request.isSupportMultiLineFiltering() ); +<a class="jxr_linenumber" name="L182" href="#L182">182</a> +<a class="jxr_linenumber" name="L183" href="#L183">183</a> defaultFilterWrappers.add( wrapper ); +<a class="jxr_linenumber" name="L184" href="#L184">184</a> } +<a class="jxr_linenumber" name="L185" href="#L185">185</a> +<a class="jxr_linenumber" name="L186" href="#L186">186</a> <strong class="jxr_keyword">return</strong> defaultFilterWrappers; +<a class="jxr_linenumber" name="L187" href="#L187">187</a> } +<a class="jxr_linenumber" name="L188" href="#L188">188</a> +<a class="jxr_linenumber" name="L189" href="#L189">189</a> <em class="jxr_javadoccomment">/**</em> +<a class="jxr_linenumber" name="L190" href="#L190">190</a> <em class="jxr_javadoccomment"> * default visibility only for testing reason !</em> +<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment"> */</em> +<a class="jxr_linenumber" name="L192" href="#L192">192</a> <strong class="jxr_keyword">void</strong> loadProperties( Properties filterProperties, File basedir, List<String> propertiesFilePaths, +<a class="jxr_linenumber" name="L193" href="#L193">193</a> Properties baseProps ) +<a class="jxr_linenumber" name="L194" href="#L194">194</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/maven/shared/filtering/MavenFilteringException.html">MavenFilteringException</a> +<a class="jxr_linenumber" name="L195" href="#L195">195</a> { +<a class="jxr_linenumber" name="L196" href="#L196">196</a> <strong class="jxr_keyword">if</strong> ( propertiesFilePaths != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L197" href="#L197">197</a> { +<a class="jxr_linenumber" name="L198" href="#L198">198</a> Properties workProperties = <strong class="jxr_keyword">new</strong> Properties(); +<a class="jxr_linenumber" name="L199" href="#L199">199</a> workProperties.putAll( baseProps ); +<a class="jxr_linenumber" name="L200" href="#L200">200</a> +<a class="jxr_linenumber" name="L201" href="#L201">201</a> <strong class="jxr_keyword">for</strong> ( String filterFile : propertiesFilePaths ) +<a class="jxr_linenumber" name="L202" href="#L202">202</a> { +<a class="jxr_linenumber" name="L203" href="#L203">203</a> <strong class="jxr_keyword">if</strong> ( StringUtils.isEmpty( filterFile ) ) +<a class="jxr_linenumber" name="L204" href="#L204">204</a> { +<a class="jxr_linenumber" name="L205" href="#L205">205</a> <em class="jxr_comment">// skip empty file name</em> +<a class="jxr_linenumber" name="L206" href="#L206">206</a> <strong class="jxr_keyword">continue</strong>; +<a class="jxr_linenumber" name="L207" href="#L207">207</a> } +<a class="jxr_linenumber" name="L208" href="#L208">208</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="L209" href="#L209">209</a> { +<a class="jxr_linenumber" name="L210" href="#L210">210</a> File propFile = FileUtils.resolveFile( basedir, filterFile ); +<a class="jxr_linenumber" name="L211" href="#L211">211</a> Properties properties = PropertyUtils.loadPropertyFile( propFile, workProperties ); +<a class="jxr_linenumber" name="L212" href="#L212">212</a> filterProperties.putAll( properties ); +<a class="jxr_linenumber" name="L213" href="#L213">213</a> workProperties.putAll( properties ); +<a class="jxr_linenumber" name="L214" href="#L214">214</a> } +<a class="jxr_linenumber" name="L215" href="#L215">215</a> <strong class="jxr_keyword">catch</strong> ( IOException e ) +<a class="jxr_linenumber" name="L216" href="#L216">216</a> { +<a class="jxr_linenumber" name="L217" href="#L217">217</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/shared/filtering/MavenFilteringException.html">MavenFilteringException</a>( <span class="jxr_string">"Error loading property file '"</span> + filterFile + <span class="jxr_string">"'"</span>, e ); +<a class="jxr_linenumber" name="L218" href="#L218">218</a> } +<a class="jxr_linenumber" name="L219" href="#L219">219</a> } +<a class="jxr_linenumber" name="L220" href="#L220">220</a> } +<a class="jxr_linenumber" name="L221" href="#L221">221</a> } +<a class="jxr_linenumber" name="L222" href="#L222">222</a> +<a class="jxr_linenumber" name="L223" href="#L223">223</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/shared/filtering/BaseFilter.html">Wrapper</a> +<a class="jxr_linenumber" name="L224" href="#L224">224</a> <strong class="jxr_keyword">extends</strong> FileUtils.FilterWrapper +<a class="jxr_linenumber" name="L225" href="#L225">225</a> { +<a class="jxr_linenumber" name="L226" href="#L226">226</a> +<a class="jxr_linenumber" name="L227" href="#L227">227</a> <strong class="jxr_keyword">private</strong> LinkedHashSet<String> delimiters; +<a class="jxr_linenumber" name="L228" href="#L228">228</a> +<a class="jxr_linenumber" name="L229" href="#L229">229</a> <strong class="jxr_keyword">private</strong> MavenProject project; +<a class="jxr_linenumber" name="L230" href="#L230">230</a> +<a class="jxr_linenumber" name="L231" href="#L231">231</a> <strong class="jxr_keyword">private</strong> ValueSource propertiesValueSource; +<a class="jxr_linenumber" name="L232" href="#L232">232</a> +<a class="jxr_linenumber" name="L233" href="#L233">233</a> <strong class="jxr_keyword">private</strong> List<String> projectStartExpressions; +<a class="jxr_linenumber" name="L234" href="#L234">234</a> +<a class="jxr_linenumber" name="L235" href="#L235">235</a> <strong class="jxr_keyword">private</strong> String escapeString; +<a class="jxr_linenumber" name="L236" href="#L236">236</a> +<a class="jxr_linenumber" name="L237" href="#L237">237</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> escapeWindowsPaths; +<a class="jxr_linenumber" name="L238" href="#L238">238</a> +<a class="jxr_linenumber" name="L239" href="#L239">239</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> MavenSession mavenSession; +<a class="jxr_linenumber" name="L240" href="#L240">240</a> +<a class="jxr_linenumber" name="L241" href="#L241">241</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> supportMultiLineFiltering; +<a class="jxr_linenumber" name="L242" href="#L242">242</a> +<a class="jxr_linenumber" name="L243" href="#L243">243</a> <a href="../../../../../org/apache/maven/shared/filtering/BaseFilter.html">Wrapper</a>( LinkedHashSet<String> delimiters, MavenProject project, MavenSession mavenSession, +<a class="jxr_linenumber" name="L244" href="#L244">244</a> ValueSource propertiesValueSource, List<String> projectStartExpressions, String escapeString, +<a class="jxr_linenumber" name="L245" href="#L245">245</a> <strong class="jxr_keyword">boolean</strong> escapeWindowsPaths, <strong class="jxr_keyword">boolean</strong> supportMultiLineFiltering ) <a class="jxr_linenumber" name="L246" href="#L246">246</a> { -<a class="jxr_linenumber" name="L247" href="#L247">247</a> Interpolator interpolator = createInterpolator( delimiters, projectStartExpressions, propertiesValueSource, -<a class="jxr_linenumber" name="L248" href="#L248">248</a> project, mavenSession, escapeString, escapeWindowsPaths ); -<a class="jxr_linenumber" name="L249" href="#L249">249</a> -<a class="jxr_linenumber" name="L250" href="#L250">250</a> <a href="../../../../../org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.html">MultiDelimiterInterpolatorFilterReaderLineEnding</a> filterReader = -<a class="jxr_linenumber" name="L251" href="#L251">251</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.html">MultiDelimiterInterpolatorFilterReaderLineEnding</a>( reader, interpolator, supportMultiLineFiltering ); -<a class="jxr_linenumber" name="L252" href="#L252">252</a> -<a class="jxr_linenumber" name="L253" href="#L253">253</a> <strong class="jxr_keyword">final</strong> RecursionInterceptor ri; -<a class="jxr_linenumber" name="L254" href="#L254">254</a> <strong class="jxr_keyword">if</strong> ( projectStartExpressions != <strong class="jxr_keyword">null</strong> && !projectStartExpressions.isEmpty() ) -<a class="jxr_linenumber" name="L255" href="#L255">255</a> { -<a class="jxr_linenumber" name="L256" href="#L256">256</a> ri = <strong class="jxr_keyword">new</strong> PrefixAwareRecursionInterceptor( projectStartExpressions, <strong class="jxr_keyword">true</strong> ); -<a class="jxr_linenumber" name="L257" href="#L257">257</a> } -<a class="jxr_linenumber" name="L258" href="#L258">258</a> <strong class="jxr_keyword">else</strong> -<a class="jxr_linenumber" name="L259" href="#L259">259</a> { -<a class="jxr_linenumber" name="L260" href="#L260">260</a> ri = <strong class="jxr_keyword">new</strong> SimpleRecursionInterceptor(); -<a class="jxr_linenumber" name="L261" href="#L261">261</a> } +<a class="jxr_linenumber" name="L247" href="#L247">247</a> <strong class="jxr_keyword">super</strong>(); +<a class="jxr_linenumber" name="L248" href="#L248">248</a> <strong class="jxr_keyword">this</strong>.delimiters = delimiters; +<a class="jxr_linenumber" name="L249" href="#L249">249</a> <strong class="jxr_keyword">this</strong>.project = project; +<a class="jxr_linenumber" name="L250" href="#L250">250</a> <strong class="jxr_keyword">this</strong>.mavenSession = mavenSession; +<a class="jxr_linenumber" name="L251" href="#L251">251</a> <strong class="jxr_keyword">this</strong>.propertiesValueSource = propertiesValueSource; +<a class="jxr_linenumber" name="L252" href="#L252">252</a> <strong class="jxr_keyword">this</strong>.projectStartExpressions = projectStartExpressions; +<a class="jxr_linenumber" name="L253" href="#L253">253</a> <strong class="jxr_keyword">this</strong>.escapeString = escapeString; +<a class="jxr_linenumber" name="L254" href="#L254">254</a> <strong class="jxr_keyword">this</strong>.escapeWindowsPaths = escapeWindowsPaths; +<a class="jxr_linenumber" name="L255" href="#L255">255</a> <strong class="jxr_keyword">this</strong>.supportMultiLineFiltering = supportMultiLineFiltering; +<a class="jxr_linenumber" name="L256" href="#L256">256</a> } +<a class="jxr_linenumber" name="L257" href="#L257">257</a> +<a class="jxr_linenumber" name="L258" href="#L258">258</a> <strong class="jxr_keyword">public</strong> Reader getReader( Reader reader ) +<a class="jxr_linenumber" name="L259" href="#L259">259</a> { +<a class="jxr_linenumber" name="L260" href="#L260">260</a> Interpolator interpolator = createInterpolator( delimiters, projectStartExpressions, propertiesValueSource, +<a class="jxr_linenumber" name="L261" href="#L261">261</a> project, mavenSession, escapeString, escapeWindowsPaths ); <a class="jxr_linenumber" name="L262" href="#L262">262</a> -<a class="jxr_linenumber" name="L263" href="#L263">263</a> filterReader.setRecursionInterceptor( ri ); -<a class="jxr_linenumber" name="L264" href="#L264">264</a> filterReader.setDelimiterSpecs( delimiters ); +<a class="jxr_linenumber" name="L263" href="#L263">263</a> <a href="../../../../../org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.html">MultiDelimiterInterpolatorFilterReaderLineEnding</a> filterReader = +<a class="jxr_linenumber" name="L264" href="#L264">264</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.html">MultiDelimiterInterpolatorFilterReaderLineEnding</a>( reader, interpolator, supportMultiLineFiltering ); <a class="jxr_linenumber" name="L265" href="#L265">265</a> -<a class="jxr_linenumber" name="L266" href="#L266">266</a> filterReader.setInterpolateWithPrefixPattern( false ); -<a class="jxr_linenumber" name="L267" href="#L267">267</a> filterReader.setEscapeString( escapeString ); -<a class="jxr_linenumber" name="L268" href="#L268">268</a> -<a class="jxr_linenumber" name="L269" href="#L269">269</a> <strong class="jxr_keyword">return</strong> filterReader; -<a class="jxr_linenumber" name="L270" href="#L270">270</a> } -<a class="jxr_linenumber" name="L271" href="#L271">271</a> -<a class="jxr_linenumber" name="L272" href="#L272">272</a> } -<a class="jxr_linenumber" name="L273" href="#L273">273</a> -<a class="jxr_linenumber" name="L274" href="#L274">274</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Interpolator createInterpolator( LinkedHashSet<String> delimiters, -<a class="jxr_linenumber" name="L275" href="#L275">275</a> List<String> projectStartExpressions, -<a class="jxr_linenumber" name="L276" href="#L276">276</a> ValueSource propertiesValueSource, MavenProject project, -<a class="jxr_linenumber" name="L277" href="#L277">277</a> MavenSession mavenSession, String escapeString, -<a class="jxr_linenumber" name="L278" href="#L278">278</a> <strong class="jxr_keyword">boolean</strong> escapeWindowsPaths ) -<a class="jxr_linenumber" name="L279" href="#L279">279</a> { -<a class="jxr_linenumber" name="L280" href="#L280">280</a> MultiDelimiterStringSearchInterpolator interpolator = <strong class="jxr_keyword">new</strong> MultiDelimiterStringSearchInterpolator(); -<a class="jxr_linenumber" name="L281" href="#L281">281</a> interpolator.setDelimiterSpecs( delimiters ); -<a class="jxr_linenumber" name="L282" href="#L282">282</a> -<a class="jxr_linenumber" name="L283" href="#L283">283</a> interpolator.addValueSource( propertiesValueSource ); +<a class="jxr_linenumber" name="L266" href="#L266">266</a> <strong class="jxr_keyword">final</strong> RecursionInterceptor ri; +<a class="jxr_linenumber" name="L267" href="#L267">267</a> <strong class="jxr_keyword">if</strong> ( projectStartExpressions != <strong class="jxr_keyword">null</strong> && !projectStartExpressions.isEmpty() ) +<a class="jxr_linenumber" name="L268" href="#L268">268</a> { +<a class="jxr_linenumber" name="L269" href="#L269">269</a> ri = <strong class="jxr_keyword">new</strong> PrefixAwareRecursionInterceptor( projectStartExpressions, <strong class="jxr_keyword">true</strong> ); +<a class="jxr_linenumber" name="L270" href="#L270">270</a> } +<a class="jxr_linenumber" name="L271" href="#L271">271</a> <strong class="jxr_keyword">else</strong> +<a class="jxr_linenumber" name="L272" href="#L272">272</a> { +<a class="jxr_linenumber" name="L273" href="#L273">273</a> ri = <strong class="jxr_keyword">new</strong> SimpleRecursionInterceptor(); +<a class="jxr_linenumber" name="L274" href="#L274">274</a> } +<a class="jxr_linenumber" name="L275" href="#L275">275</a> +<a class="jxr_linenumber" name="L276" href="#L276">276</a> filterReader.setRecursionInterceptor( ri ); +<a class="jxr_linenumber" name="L277" href="#L277">277</a> filterReader.setDelimiterSpecs( delimiters ); +<a class="jxr_linenumber" name="L278" href="#L278">278</a> +<a class="jxr_linenumber" name="L279" href="#L279">279</a> filterReader.setInterpolateWithPrefixPattern( false ); +<a class="jxr_linenumber" name="L280" href="#L280">280</a> filterReader.setEscapeString( escapeString ); +<a class="jxr_linenumber" name="L281" href="#L281">281</a> +<a class="jxr_linenumber" name="L282" href="#L282">282</a> <strong class="jxr_keyword">return</strong> filterReader; +<a class="jxr_linenumber" name="L283" href="#L283">283</a> } <a class="jxr_linenumber" name="L284" href="#L284">284</a> -<a class="jxr_linenumber" name="L285" href="#L285">285</a> <strong class="jxr_keyword">if</strong> ( project != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L286" href="#L286">286</a> { -<a class="jxr_linenumber" name="L287" href="#L287">287</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> PrefixedObjectValueSource( projectStartExpressions, project, <strong class="jxr_keyword">true</strong> ) ); -<a class="jxr_linenumber" name="L288" href="#L288">288</a> } -<a class="jxr_linenumber" name="L289" href="#L289">289</a> -<a class="jxr_linenumber" name="L290" href="#L290">290</a> <strong class="jxr_keyword">if</strong> ( mavenSession != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L291" href="#L291">291</a> { -<a class="jxr_linenumber" name="L292" href="#L292">292</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> PrefixedObjectValueSource( <span class="jxr_string">"session"</span>, mavenSession ) ); -<a class="jxr_linenumber" name="L293" href="#L293">293</a> -<a class="jxr_linenumber" name="L294" href="#L294">294</a> <strong class="jxr_keyword">final</strong> Settings settings = mavenSession.getSettings(); -<a class="jxr_linenumber" name="L295" href="#L295">295</a> <strong class="jxr_keyword">if</strong> ( settings != <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L296" href="#L296">296</a> { -<a class="jxr_linenumber" name="L297" href="#L297">297</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> PrefixedObjectValueSource( <span class="jxr_string">"settings"</span>, settings ) ); -<a class="jxr_linenumber" name="L298" href="#L298">298</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> SingleResponseValueSource( <span class="jxr_string">"localRepository"</span>, -<a class="jxr_linenumber" name="L299" href="#L299">299</a> settings.getLocalRepository() ) ); -<a class="jxr_linenumber" name="L300" href="#L300">300</a> } +<a class="jxr_linenumber" name="L285" href="#L285">285</a> } +<a class="jxr_linenumber" name="L286" href="#L286">286</a> +<a class="jxr_linenumber" name="L287" href="#L287">287</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Interpolator createInterpolator( LinkedHashSet<String> delimiters, +<a class="jxr_linenumber" name="L288" href="#L288">288</a> List<String> projectStartExpressions, +<a class="jxr_linenumber" name="L289" href="#L289">289</a> ValueSource propertiesValueSource, MavenProject project, +<a class="jxr_linenumber" name="L290" href="#L290">290</a> MavenSession mavenSession, String escapeString, +<a class="jxr_linenumber" name="L291" href="#L291">291</a> <strong class="jxr_keyword">boolean</strong> escapeWindowsPaths ) +<a class="jxr_linenumber" name="L292" href="#L292">292</a> { +<a class="jxr_linenumber" name="L293" href="#L293">293</a> MultiDelimiterStringSearchInterpolator interpolator = <strong class="jxr_keyword">new</strong> MultiDelimiterStringSearchInterpolator(); +<a class="jxr_linenumber" name="L294" href="#L294">294</a> interpolator.setDelimiterSpecs( delimiters ); +<a class="jxr_linenumber" name="L295" href="#L295">295</a> +<a class="jxr_linenumber" name="L296" href="#L296">296</a> interpolator.addValueSource( propertiesValueSource ); +<a class="jxr_linenumber" name="L297" href="#L297">297</a> +<a class="jxr_linenumber" name="L298" href="#L298">298</a> <strong class="jxr_keyword">if</strong> ( project != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L299" href="#L299">299</a> { +<a class="jxr_linenumber" name="L300" href="#L300">300</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> PrefixedObjectValueSource( projectStartExpressions, project, <strong class="jxr_keyword">true</strong> ) ); <a class="jxr_linenumber" name="L301" href="#L301">301</a> } <a class="jxr_linenumber" name="L302" href="#L302">302</a> -<a class="jxr_linenumber" name="L303" href="#L303">303</a> interpolator.setEscapeString( escapeString ); -<a class="jxr_linenumber" name="L304" href="#L304">304</a> -<a class="jxr_linenumber" name="L305" href="#L305">305</a> <strong class="jxr_keyword">if</strong> ( escapeWindowsPaths ) -<a class="jxr_linenumber" name="L306" href="#L306">306</a> { -<a class="jxr_linenumber" name="L307" href="#L307">307</a> interpolator.addPostProcessor( <strong class="jxr_keyword">new</strong> InterpolationPostProcessor() -<a class="jxr_linenumber" name="L308" href="#L308">308</a> { -<a class="jxr_linenumber" name="L309" href="#L309">309</a> <strong class="jxr_keyword">public</strong> Object execute( String expression, Object value ) -<a class="jxr_linenumber" name="L310" href="#L310">310</a> { -<a class="jxr_linenumber" name="L311" href="#L311">311</a> <strong class="jxr_keyword">if</strong> ( value instanceof String ) -<a class="jxr_linenumber" name="L312" href="#L312">312</a> { -<a class="jxr_linenumber" name="L313" href="#L313">313</a> <strong class="jxr_keyword">return</strong> FilteringUtils.escapeWindowsPath( (String) value ); -<a class="jxr_linenumber" name="L314" href="#L314">314</a> } +<a class="jxr_linenumber" name="L303" href="#L303">303</a> <strong class="jxr_keyword">if</strong> ( mavenSession != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L304" href="#L304">304</a> { +<a class="jxr_linenumber" name="L305" href="#L305">305</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> PrefixedObjectValueSource( <span class="jxr_string">"session"</span>, mavenSession ) ); +<a class="jxr_linenumber" name="L306" href="#L306">306</a> +<a class="jxr_linenumber" name="L307" href="#L307">307</a> <strong class="jxr_keyword">final</strong> Settings settings = mavenSession.getSettings(); +<a class="jxr_linenumber" name="L308" href="#L308">308</a> <strong class="jxr_keyword">if</strong> ( settings != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L309" href="#L309">309</a> { +<a class="jxr_linenumber" name="L310" href="#L310">310</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> PrefixedObjectValueSource( <span class="jxr_string">"settings"</span>, settings ) ); +<a class="jxr_linenumber" name="L311" href="#L311">311</a> interpolator.addValueSource( <strong class="jxr_keyword">new</strong> SingleResponseValueSource( <span class="jxr_string">"localRepository"</span>, +<a class="jxr_linenumber" name="L312" href="#L312">312</a> settings.getLocalRepository() ) ); +<a class="jxr_linenumber" name="L313" href="#L313">313</a> } +<a class="jxr_linenumber" name="L314" href="#L314">314</a> } <a class="jxr_linenumber" name="L315" href="#L315">315</a> -<a class="jxr_linenumber" name="L316" href="#L316">316</a> <strong class="jxr_keyword">return</strong> value; -<a class="jxr_linenumber" name="L317" href="#L317">317</a> } -<a class="jxr_linenumber" name="L318" href="#L318">318</a> } ); -<a class="jxr_linenumber" name="L319" href="#L319">319</a> } -<a class="jxr_linenumber" name="L320" href="#L320">320</a> <strong class="jxr_keyword">return</strong> interpolator; -<a class="jxr_linenumber" name="L321" href="#L321">321</a> } -<a class="jxr_linenumber" name="L322" href="#L322">322</a> } +<a class="jxr_linenumber" name="L316" href="#L316">316</a> interpolator.setEscapeString( escapeString ); +<a class="jxr_linenumber" name="L317" href="#L317">317</a> +<a class="jxr_linenumber" name="L318" href="#L318">318</a> <strong class="jxr_keyword">if</strong> ( escapeWindowsPaths ) +<a class="jxr_linenumber" name="L319" href="#L319">319</a> { +<a class="jxr_linenumber" name="L320" href="#L320">320</a> interpolator.addPostProcessor( <strong class="jxr_keyword">new</strong> InterpolationPostProcessor() +<a class="jxr_linenumber" name="L321" href="#L321">321</a> { +<a class="jxr_linenumber" name="L322" href="#L322">322</a> <strong class="jxr_keyword">public</strong> Object execute( String expression, Object value ) +<a class="jxr_linenumber" name="L323" href="#L323">323</a> { +<a class="jxr_linenumber" name="L324" href="#L324">324</a> <strong class="jxr_keyword">if</strong> ( value instanceof String ) +<a class="jxr_linenumber" name="L325" href="#L325">325</a> { +<a class="jxr_linenumber" name="L326" href="#L326">326</a> <strong class="jxr_keyword">return</strong> FilteringUtils.escapeWindowsPath( (String) value ); +<a class="jxr_linenumber" name="L327" href="#L327">327</a> } +<a class="jxr_linenumber" name="L328" href="#L328">328</a> +<a class="jxr_linenumber" name="L329" href="#L329">329</a> <strong class="jxr_keyword">return</strong> value; +<a class="jxr_linenumber" name="L330" href="#L330">330</a> } +<a class="jxr_linenumber" name="L331" href="#L331">331</a> } ); +<a class="jxr_linenumber" name="L332" href="#L332">332</a> } +<a class="jxr_linenumber" name="L333" href="#L333">333</a> <strong class="jxr_keyword">return</strong> interpolator; +<a class="jxr_linenumber" name="L334" href="#L334">334</a> } +<a class="jxr_linenumber" name="L335" href="#L335">335</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file
Modified: websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/BoundedReader.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/BoundedReader.html (original) +++ websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/BoundedReader.html Sat May 28 21:55:32 2016 @@ -112,6 +112,6 @@ <a class="jxr_linenumber" name="L104" href="#L104">104</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/DefaultFilterInfo.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/DefaultFilterInfo.html (original) +++ websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/DefaultFilterInfo.html Sat May 28 21:55:32 2016 @@ -70,6 +70,6 @@ <a class="jxr_linenumber" name="L62" href="#L62">62</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/DefaultMavenFileFilter.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/DefaultMavenFileFilter.html (original) +++ websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/DefaultMavenFileFilter.html Sat May 28 21:55:32 2016 @@ -202,6 +202,6 @@ <a class="jxr_linenumber" name="L194" href="#L194">194</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file Modified: websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.html (original) +++ websites/production/maven/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.html Sat May 28 21:55:32 2016 @@ -93,6 +93,6 @@ <a class="jxr_linenumber" name="L85" href="#L85">85</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file