Modified: websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.html Sat Apr 29 16:06:50 2017 @@ -27,33 +27,33 @@ <a class="jxr_linenumber" name="L19" href="#L19">19</a> <em class="jxr_comment"> * under the License.</em> <a class="jxr_linenumber" name="L20" href="#L20">20</a> <em class="jxr_comment"> */</em> <a class="jxr_linenumber" name="L21" href="#L21">21</a> -<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong class="jxr_keyword">import</strong> java.io.File; -<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong class="jxr_keyword">import</strong> java.util.Arrays; -<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong class="jxr_keyword">import</strong> java.util.Collections; -<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong class="jxr_keyword">import</strong> java.util.HashSet; -<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong class="jxr_keyword">import</strong> java.util.List; -<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">import</strong> java.util.Properties; -<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> java.util.Set; -<a class="jxr_linenumber" name="L29" href="#L29">29</a> -<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.Artifact; -<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.DefaultArtifact; -<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.handler.ArtifactHandler; -<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.handler.DefaultArtifactHandler; -<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.versioning.VersionRange; -<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">import</strong> org.apache.maven.project.MavenProject; -<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.invoker.InvocationRequest; -<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.invoker.InvocationResult; -<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.test.plugin.BuildTool; -<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.test.plugin.ProjectTool; -<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.test.plugin.RepositoryTool; -<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.test.plugin.TestToolsException; -<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.PlexusTestCase; +<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong class="jxr_keyword">import</strong> org.apache.commons.lang.SystemUtils; +<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.Artifact; +<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.DefaultArtifact; +<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.handler.ArtifactHandler; +<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.handler.DefaultArtifactHandler; +<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.versioning.VersionRange; +<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> org.apache.maven.project.MavenProject; +<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.invoker.InvocationRequest; +<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.invoker.InvocationResult; +<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.test.plugin.BuildTool; +<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.test.plugin.ProjectTool; +<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.test.plugin.RepositoryTool; +<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.test.plugin.TestToolsException; +<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.PlexusTestCase; +<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">import</strong> java.io.File; +<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">import</strong> java.util.Arrays; +<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">import</strong> java.util.Collections; +<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">import</strong> java.util.HashSet; +<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">import</strong> java.util.List; +<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">import</strong> java.util.Properties; +<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">import</strong> java.util.Set; <a class="jxr_linenumber" name="L43" href="#L43">43</a> <a class="jxr_linenumber" name="L44" href="#L44">44</a> <em class="jxr_javadoccomment">/**</em> <a class="jxr_linenumber" name="L45" href="#L45">45</a> <em class="jxr_javadoccomment"> * Tests <code>DefaultProjectDependencyAnalyzer</code>.</em> -<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em class="jxr_javadoccomment"> * </em> +<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em class="jxr_javadoccomment"> *</em> <a class="jxr_linenumber" name="L47" href="#L47">47</a> <em class="jxr_javadoccomment"> * @author <a href="<a href="mailto:markhob...@gmail.com" target="alexandria_uri">mailto:markhob...@gmail.com</a>">Mark Hobson</a></em> -<a class="jxr_linenumber" name="L48" href="#L48">48</a> <em class="jxr_javadoccomment"> * @version $Id: DefaultProjectDependencyAnalyzerTest.java 1635191 2014-10-29 16:33:52Z andham $</em> +<a class="jxr_linenumber" name="L48" href="#L48">48</a> <em class="jxr_javadoccomment"> * @version $Id: DefaultProjectDependencyAnalyzerTest.java 1722332 2015-12-30 14:17:31Z andham $</em> <a class="jxr_linenumber" name="L49" href="#L49">49</a> <em class="jxr_javadoccomment"> * @see DefaultProjectDependencyAnalyzer</em> <a class="jxr_linenumber" name="L50" href="#L50">50</a> <em class="jxr_javadoccomment"> */</em> <a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.html">DefaultProjectDependencyAnalyzerTest</a> @@ -86,208 +86,268 @@ <a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong class="jxr_keyword">if</strong> ( localRepo == <strong class="jxr_keyword">null</strong> ) <a class="jxr_linenumber" name="L79" href="#L79">79</a> { <a class="jxr_linenumber" name="L80" href="#L80">80</a> RepositoryTool repositoryTool = (RepositoryTool) lookup( RepositoryTool.ROLE ); -<a class="jxr_linenumber" name="L81" href="#L81">81</a> localRepo = repositoryTool.findLocalRepositoryDirectory().getAbsoluteFile(); -<a class="jxr_linenumber" name="L82" href="#L82">82</a> System.out.println( <span class="jxr_string">"Local repository: "</span> + localRepo ); -<a class="jxr_linenumber" name="L83" href="#L83">83</a> } -<a class="jxr_linenumber" name="L84" href="#L84">84</a> -<a class="jxr_linenumber" name="L85" href="#L85">85</a> analyzer = (ProjectDependencyAnalyzer) lookup( ProjectDependencyAnalyzer.ROLE ); -<a class="jxr_linenumber" name="L86" href="#L86">86</a> } -<a class="jxr_linenumber" name="L87" href="#L87">87</a> -<a class="jxr_linenumber" name="L88" href="#L88">88</a> <em class="jxr_comment">// tests ------------------------------------------------------------------</em> -<a class="jxr_linenumber" name="L89" href="#L89">89</a> -<a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPom() -<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException -<a class="jxr_linenumber" name="L92" href="#L92">92</a> { -<a class="jxr_linenumber" name="L93" href="#L93">93</a> compileProject( <span class="jxr_string">"pom/pom.xml"</span> ); -<a class="jxr_linenumber" name="L94" href="#L94">94</a> -<a class="jxr_linenumber" name="L95" href="#L95">95</a> MavenProject project = getProject( <span class="jxr_string">"pom/pom.xml"</span> ); -<a class="jxr_linenumber" name="L96" href="#L96">96</a> -<a class="jxr_linenumber" name="L97" href="#L97">97</a> ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project ); -<a class="jxr_linenumber" name="L98" href="#L98">98</a> -<a class="jxr_linenumber" name="L99" href="#L99">99</a> ProjectDependencyAnalysis expectedAnalysis = <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis(); -<a class="jxr_linenumber" name="L100" href="#L100">100</a> -<a class="jxr_linenumber" name="L101" href="#L101">101</a> assertEquals( expectedAnalysis, actualAnalysis ); -<a class="jxr_linenumber" name="L102" href="#L102">102</a> } -<a class="jxr_linenumber" name="L103" href="#L103">103</a> -<a class="jxr_linenumber" name="L104" href="#L104">104</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testJarWithNoDependencies() -<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException -<a class="jxr_linenumber" name="L106" href="#L106">106</a> { -<a class="jxr_linenumber" name="L107" href="#L107">107</a> compileProject( <span class="jxr_string">"jarWithNoDependencies/pom.xml"</span> ); -<a class="jxr_linenumber" name="L108" href="#L108">108</a> -<a class="jxr_linenumber" name="L109" href="#L109">109</a> MavenProject project = getProject( <span class="jxr_string">"jarWithNoDependencies/pom.xml"</span> ); -<a class="jxr_linenumber" name="L110" href="#L110">110</a> -<a class="jxr_linenumber" name="L111" href="#L111">111</a> ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project ); -<a class="jxr_linenumber" name="L112" href="#L112">112</a> -<a class="jxr_linenumber" name="L113" href="#L113">113</a> ProjectDependencyAnalysis expectedAnalysis = <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis(); -<a class="jxr_linenumber" name="L114" href="#L114">114</a> -<a class="jxr_linenumber" name="L115" href="#L115">115</a> assertEquals( expectedAnalysis, actualAnalysis ); -<a class="jxr_linenumber" name="L116" href="#L116">116</a> } -<a class="jxr_linenumber" name="L117" href="#L117">117</a> -<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testJarWithCompileDependency() -<a class="jxr_linenumber" name="L119" href="#L119">119</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException -<a class="jxr_linenumber" name="L120" href="#L120">120</a> { -<a class="jxr_linenumber" name="L121" href="#L121">121</a> compileProject( <span class="jxr_string">"jarWithCompileDependency/pom.xml"</span> ); -<a class="jxr_linenumber" name="L122" href="#L122">122</a> -<a class="jxr_linenumber" name="L123" href="#L123">123</a> MavenProject project2 = getProject( <span class="jxr_string">"jarWithCompileDependency/project2/pom.xml"</span> ); -<a class="jxr_linenumber" name="L124" href="#L124">124</a> -<a class="jxr_linenumber" name="L125" href="#L125">125</a> <strong class="jxr_keyword">if</strong> ( project2.getBuild().getOutputDirectory().contains( <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">// if Maven version used as dependency is upgraded to >= 2.2.0 </em> -<a class="jxr_linenumber" name="L128" href="#L128">128</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> TestToolsException( <span class="jxr_string">"output directory was not interpolated: "</span> -<a class="jxr_linenumber" name="L129" href="#L129">129</a> + project2.getBuild().getOutputDirectory() ); -<a class="jxr_linenumber" name="L130" href="#L130">130</a> } +<a class="jxr_linenumber" name="L81" href="#L81">81</a> localRepo = repositoryTool.findLocalRepositoryDirectory() +<a class="jxr_linenumber" name="L82" href="#L82">82</a> .getAbsoluteFile(); +<a class="jxr_linenumber" name="L83" href="#L83">83</a> System.out.println( <span class="jxr_string">"Local repository: "</span> + localRepo ); +<a class="jxr_linenumber" name="L84" href="#L84">84</a> } +<a class="jxr_linenumber" name="L85" href="#L85">85</a> +<a class="jxr_linenumber" name="L86" href="#L86">86</a> analyzer = (ProjectDependencyAnalyzer) lookup( ProjectDependencyAnalyzer.ROLE ); +<a class="jxr_linenumber" name="L87" href="#L87">87</a> } +<a class="jxr_linenumber" name="L88" href="#L88">88</a> +<a class="jxr_linenumber" name="L89" href="#L89">89</a> <em class="jxr_comment">// tests ------------------------------------------------------------------</em> +<a class="jxr_linenumber" name="L90" href="#L90">90</a> +<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPom() +<a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException +<a class="jxr_linenumber" name="L93" href="#L93">93</a> { +<a class="jxr_linenumber" name="L94" href="#L94">94</a> compileProject( <span class="jxr_string">"pom/pom.xml"</span> ); +<a class="jxr_linenumber" name="L95" href="#L95">95</a> +<a class="jxr_linenumber" name="L96" href="#L96">96</a> MavenProject project = getProject( <span class="jxr_string">"pom/pom.xml"</span> ); +<a class="jxr_linenumber" name="L97" href="#L97">97</a> +<a class="jxr_linenumber" name="L98" href="#L98">98</a> ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project ); +<a class="jxr_linenumber" name="L99" href="#L99">99</a> +<a class="jxr_linenumber" name="L100" href="#L100">100</a> ProjectDependencyAnalysis expectedAnalysis = <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis(); +<a class="jxr_linenumber" name="L101" href="#L101">101</a> +<a class="jxr_linenumber" name="L102" href="#L102">102</a> assertEquals( expectedAnalysis, actualAnalysis ); +<a class="jxr_linenumber" name="L103" href="#L103">103</a> } +<a class="jxr_linenumber" name="L104" href="#L104">104</a> +<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testJarWithNoDependencies() +<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException +<a class="jxr_linenumber" name="L107" href="#L107">107</a> { +<a class="jxr_linenumber" name="L108" href="#L108">108</a> compileProject( <span class="jxr_string">"jarWithNoDependencies/pom.xml"</span> ); +<a class="jxr_linenumber" name="L109" href="#L109">109</a> +<a class="jxr_linenumber" name="L110" href="#L110">110</a> MavenProject project = getProject( <span class="jxr_string">"jarWithNoDependencies/pom.xml"</span> ); +<a class="jxr_linenumber" name="L111" href="#L111">111</a> +<a class="jxr_linenumber" name="L112" href="#L112">112</a> ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project ); +<a class="jxr_linenumber" name="L113" href="#L113">113</a> +<a class="jxr_linenumber" name="L114" href="#L114">114</a> ProjectDependencyAnalysis expectedAnalysis = <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis(); +<a class="jxr_linenumber" name="L115" href="#L115">115</a> +<a class="jxr_linenumber" name="L116" href="#L116">116</a> assertEquals( expectedAnalysis, actualAnalysis ); +<a class="jxr_linenumber" name="L117" href="#L117">117</a> } +<a class="jxr_linenumber" name="L118" href="#L118">118</a> +<a class="jxr_linenumber" name="L119" href="#L119">119</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testJava8methodRefs() +<a class="jxr_linenumber" name="L120" href="#L120">120</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException +<a class="jxr_linenumber" name="L121" href="#L121">121</a> { +<a class="jxr_linenumber" name="L122" href="#L122">122</a> <strong class="jxr_keyword">if</strong> ( !SystemUtils.isJavaVersionAtLeast( 180 ) ) +<a class="jxr_linenumber" name="L123" href="#L123">123</a> { +<a class="jxr_linenumber" name="L124" href="#L124">124</a> <strong class="jxr_keyword">return</strong>; +<a class="jxr_linenumber" name="L125" href="#L125">125</a> } +<a class="jxr_linenumber" name="L126" href="#L126">126</a> +<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_comment">// Only visible through constant pool analysis (supported for JDK8+)</em> +<a class="jxr_linenumber" name="L128" href="#L128">128</a> compileProject( <span class="jxr_string">"java8methodRefs/pom.xml"</span> ); +<a class="jxr_linenumber" name="L129" href="#L129">129</a> +<a class="jxr_linenumber" name="L130" href="#L130">130</a> MavenProject project = getProject( <span class="jxr_string">"java8methodRefs/pom.xml"</span> ); <a class="jxr_linenumber" name="L131" href="#L131">131</a> -<a class="jxr_linenumber" name="L132" href="#L132">132</a> ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project2 ); +<a class="jxr_linenumber" name="L132" href="#L132">132</a> ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project ); <a class="jxr_linenumber" name="L133" href="#L133">133</a> -<a class="jxr_linenumber" name="L134" href="#L134">134</a> Artifact project1 = -<a class="jxr_linenumber" name="L135" href="#L135">135</a> createArtifact( <span class="jxr_string">"org.apache.maven.shared.dependency-analyzer.tests"</span>, <span class="jxr_string">"jarWithCompileDependency1"</span>, <span class="jxr_string">"jar"</span>, -<a class="jxr_linenumber" name="L136" href="#L136">136</a> <span class="jxr_string">"1.0"</span>, <span class="jxr_string">"compile"</span> ); -<a class="jxr_linenumber" name="L137" href="#L137">137</a> Set<Artifact> usedDeclaredArtifacts = Collections.singleton( project1 ); -<a class="jxr_linenumber" name="L138" href="#L138">138</a> ProjectDependencyAnalysis expectedAnalysis = <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis( usedDeclaredArtifacts, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong> ); -<a class="jxr_linenumber" name="L139" href="#L139">139</a> -<a class="jxr_linenumber" name="L140" href="#L140">140</a> assertEquals( expectedAnalysis, actualAnalysis ); -<a class="jxr_linenumber" name="L141" href="#L141">141</a> } -<a class="jxr_linenumber" name="L142" href="#L142">142</a> -<a class="jxr_linenumber" name="L143" href="#L143">143</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testJarWithTestDependency() -<a class="jxr_linenumber" name="L144" href="#L144">144</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException -<a class="jxr_linenumber" name="L145" href="#L145">145</a> { -<a class="jxr_linenumber" name="L146" href="#L146">146</a> compileProject( <span class="jxr_string">"jarWithTestDependency/pom.xml"</span> ); -<a class="jxr_linenumber" name="L147" href="#L147">147</a> -<a class="jxr_linenumber" name="L148" href="#L148">148</a> MavenProject project2 = getProject( <span class="jxr_string">"jarWithTestDependency/project2/pom.xml"</span> ); -<a class="jxr_linenumber" name="L149" href="#L149">149</a> -<a class="jxr_linenumber" name="L150" href="#L150">150</a> ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project2 ); -<a class="jxr_linenumber" name="L151" href="#L151">151</a> -<a class="jxr_linenumber" name="L152" href="#L152">152</a> Artifact project1 = -<a class="jxr_linenumber" name="L153" href="#L153">153</a> createArtifact( <span class="jxr_string">"org.apache.maven.shared.dependency-analyzer.tests"</span>, <span class="jxr_string">"jarWithTestDependency1"</span>, <span class="jxr_string">"jar"</span>, -<a class="jxr_linenumber" name="L154" href="#L154">154</a> <span class="jxr_string">"1.0"</span>, <span class="jxr_string">"test"</span> ); -<a class="jxr_linenumber" name="L155" href="#L155">155</a> Set<Artifact> usedDeclaredArtifacts = Collections.singleton( project1 ); -<a class="jxr_linenumber" name="L156" href="#L156">156</a> -<a class="jxr_linenumber" name="L157" href="#L157">157</a> Artifact junit = createArtifact( <span class="jxr_string">"junit"</span>, <span class="jxr_string">"junit"</span>, <span class="jxr_string">"jar"</span>, <span class="jxr_string">"3.8.1"</span>, <span class="jxr_string">"test"</span> ); -<a class="jxr_linenumber" name="L158" href="#L158">158</a> Set<Artifact> unusedDeclaredArtifacts = Collections.singleton( junit ); +<a class="jxr_linenumber" name="L134" href="#L134">134</a> Artifact project1 = createArtifact( <span class="jxr_string">"commons-io"</span>, <span class="jxr_string">"commons-io"</span>, <span class="jxr_string">"jar"</span>, <span class="jxr_string">"2.4"</span>, <span class="jxr_string">"compile"</span> ); +<a class="jxr_linenumber" name="L135" href="#L135">135</a> Artifact project2 = createArtifact( <span class="jxr_string">"commons-lang"</span>, <span class="jxr_string">"commons-lang"</span>, <span class="jxr_string">"jar"</span>, <span class="jxr_string">"2.6"</span>, <span class="jxr_string">"compile"</span> ); +<a class="jxr_linenumber" name="L136" href="#L136">136</a> Set<Artifact> usedDeclaredArtifacts = <strong class="jxr_keyword">new</strong> HashSet<Artifact>( Arrays.asList( project1, project2 ) ); +<a class="jxr_linenumber" name="L137" href="#L137">137</a> +<a class="jxr_linenumber" name="L138" href="#L138">138</a> ProjectDependencyAnalysis expectedAnalysis = +<a class="jxr_linenumber" name="L139" href="#L139">139</a> <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis( usedDeclaredArtifacts, <strong class="jxr_keyword">new</strong> HashSet<Artifact>(), <strong class="jxr_keyword">new</strong> HashSet<Artifact>() ); +<a class="jxr_linenumber" name="L140" href="#L140">140</a> +<a class="jxr_linenumber" name="L141" href="#L141">141</a> assertEquals( expectedAnalysis, actualAnalysis ); +<a class="jxr_linenumber" name="L142" href="#L142">142</a> } +<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testInlinedStaticReference() +<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException +<a class="jxr_linenumber" name="L147" href="#L147">147</a> { +<a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong class="jxr_keyword">if</strong> ( !SystemUtils.isJavaVersionAtLeast( 180 ) ) +<a class="jxr_linenumber" name="L149" href="#L149">149</a> { +<a class="jxr_linenumber" name="L150" href="#L150">150</a> <strong class="jxr_keyword">return</strong>; +<a class="jxr_linenumber" name="L151" href="#L151">151</a> } +<a class="jxr_linenumber" name="L152" href="#L152">152</a> +<a class="jxr_linenumber" name="L153" href="#L153">153</a> <em class="jxr_comment">// Only visible through constant pool analysis (supported for JDK8+)</em> +<a class="jxr_linenumber" name="L154" href="#L154">154</a> compileProject( <span class="jxr_string">"inlinedStaticReference/pom.xml"</span> ); +<a class="jxr_linenumber" name="L155" href="#L155">155</a> +<a class="jxr_linenumber" name="L156" href="#L156">156</a> MavenProject project = getProject( <span class="jxr_string">"inlinedStaticReference/pom.xml"</span> ); +<a class="jxr_linenumber" name="L157" href="#L157">157</a> +<a class="jxr_linenumber" name="L158" href="#L158">158</a> ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project ); <a class="jxr_linenumber" name="L159" href="#L159">159</a> -<a class="jxr_linenumber" name="L160" href="#L160">160</a> ProjectDependencyAnalysis expectedAnalysis = -<a class="jxr_linenumber" name="L161" href="#L161">161</a> <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis( usedDeclaredArtifacts, <strong class="jxr_keyword">null</strong>, unusedDeclaredArtifacts ); +<a class="jxr_linenumber" name="L160" href="#L160">160</a> Artifact project1 = createArtifact( <span class="jxr_string">"dom4j"</span>, <span class="jxr_string">"dom4j"</span>, <span class="jxr_string">"jar"</span>, <span class="jxr_string">"1.6.1"</span>, <span class="jxr_string">"compile"</span> ); +<a class="jxr_linenumber" name="L161" href="#L161">161</a> Set<Artifact> usedDeclaredArtifacts = Collections.singleton( project1 ); <a class="jxr_linenumber" name="L162" href="#L162">162</a> -<a class="jxr_linenumber" name="L163" href="#L163">163</a> assertEquals( expectedAnalysis, actualAnalysis ); -<a class="jxr_linenumber" name="L164" href="#L164">164</a> -<a class="jxr_linenumber" name="L165" href="#L165">165</a> <em class="jxr_comment">// MSHARED-253: force used dependency (which is actually used but not detected)</em> -<a class="jxr_linenumber" name="L166" href="#L166">166</a> ProjectDependencyAnalysis forcedAnalysis = -<a class="jxr_linenumber" name="L167" href="#L167">167</a> actualAnalysis.forceDeclaredDependenciesUsage( <strong class="jxr_keyword">new</strong> String[] { <span class="jxr_string">"junit:junit"</span> } ); +<a class="jxr_linenumber" name="L163" href="#L163">163</a> ProjectDependencyAnalysis expectedAnalysis = +<a class="jxr_linenumber" name="L164" href="#L164">164</a> <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis( usedDeclaredArtifacts, <strong class="jxr_keyword">new</strong> HashSet<Artifact>(), <strong class="jxr_keyword">new</strong> HashSet<Artifact>() ); +<a class="jxr_linenumber" name="L165" href="#L165">165</a> +<a class="jxr_linenumber" name="L166" href="#L166">166</a> assertEquals( expectedAnalysis, actualAnalysis ); +<a class="jxr_linenumber" name="L167" href="#L167">167</a> } <a class="jxr_linenumber" name="L168" href="#L168">168</a> -<a class="jxr_linenumber" name="L169" href="#L169">169</a> usedDeclaredArtifacts = <strong class="jxr_keyword">new</strong> HashSet<Artifact>( Arrays.asList( project1, junit ) ); -<a class="jxr_linenumber" name="L170" href="#L170">170</a> expectedAnalysis = <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis( usedDeclaredArtifacts, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong> ); -<a class="jxr_linenumber" name="L171" href="#L171">171</a> -<a class="jxr_linenumber" name="L172" href="#L172">172</a> assertEquals( expectedAnalysis, forcedAnalysis ); +<a class="jxr_linenumber" name="L169" href="#L169">169</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testJarWithCompileDependency() +<a class="jxr_linenumber" name="L170" href="#L170">170</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException +<a class="jxr_linenumber" name="L171" href="#L171">171</a> { +<a class="jxr_linenumber" name="L172" href="#L172">172</a> compileProject( <span class="jxr_string">"jarWithCompileDependency/pom.xml"</span> ); <a class="jxr_linenumber" name="L173" href="#L173">173</a> -<a class="jxr_linenumber" name="L174" href="#L174">174</a> <strong class="jxr_keyword">try</strong> -<a class="jxr_linenumber" name="L175" href="#L175">175</a> { -<a class="jxr_linenumber" name="L176" href="#L176">176</a> forcedAnalysis.forceDeclaredDependenciesUsage( <strong class="jxr_keyword">new</strong> String[]{ <span class="jxr_string">"junit:junit"</span> } ); -<a class="jxr_linenumber" name="L177" href="#L177">177</a> fail( <span class="jxr_string">"failure expected since junit dependency is declared-used"</span> ); -<a class="jxr_linenumber" name="L178" href="#L178">178</a> } -<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">catch</strong>( ProjectDependencyAnalyzerException pdae ) -<a class="jxr_linenumber" name="L180" href="#L180">180</a> { -<a class="jxr_linenumber" name="L181" href="#L181">181</a> assertTrue( pdae.getMessage().contains( <span class="jxr_string">"Trying to force use of dependencies which are "</span> -<a class="jxr_linenumber" name="L182" href="#L182">182</a> + <span class="jxr_string">"declared but already detected as used: [junit:junit]"</span> ) ); -<a class="jxr_linenumber" name="L183" href="#L183">183</a> } +<a class="jxr_linenumber" name="L174" href="#L174">174</a> MavenProject project2 = getProject( <span class="jxr_string">"jarWithCompileDependency/project2/pom.xml"</span> ); +<a class="jxr_linenumber" name="L175" href="#L175">175</a> +<a class="jxr_linenumber" name="L176" href="#L176">176</a> <strong class="jxr_keyword">if</strong> ( project2.getBuild().getOutputDirectory().contains( <span class="jxr_string">"${"</span> ) ) +<a class="jxr_linenumber" name="L177" href="#L177">177</a> { +<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_comment">// if Maven version used as dependency is upgraded to >= 2.2.0 </em> +<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> TestToolsException( <span class="jxr_string">"output directory was not interpolated: "</span> + project2.getBuild() +<a class="jxr_linenumber" name="L180" href="#L180">180</a> .getOutputDirectory() ); +<a class="jxr_linenumber" name="L181" href="#L181">181</a> } +<a class="jxr_linenumber" name="L182" href="#L182">182</a> +<a class="jxr_linenumber" name="L183" href="#L183">183</a> ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project2 ); <a class="jxr_linenumber" name="L184" href="#L184">184</a> -<a class="jxr_linenumber" name="L185" href="#L185">185</a> <strong class="jxr_keyword">try</strong> -<a class="jxr_linenumber" name="L186" href="#L186">186</a> { -<a class="jxr_linenumber" name="L187" href="#L187">187</a> forcedAnalysis.forceDeclaredDependenciesUsage( <strong class="jxr_keyword">new</strong> String[]{ <span class="jxr_string">"undefined:undefined"</span> } ); -<a class="jxr_linenumber" name="L188" href="#L188">188</a> fail( <span class="jxr_string">"failure expected since undefined dependency is not declared"</span> ); -<a class="jxr_linenumber" name="L189" href="#L189">189</a> } -<a class="jxr_linenumber" name="L190" href="#L190">190</a> <strong class="jxr_keyword">catch</strong>( ProjectDependencyAnalyzerException pdae ) -<a class="jxr_linenumber" name="L191" href="#L191">191</a> { -<a class="jxr_linenumber" name="L192" href="#L192">192</a> assertTrue( pdae.getMessage().contains( <span class="jxr_string">"Trying to force use of dependencies which are "</span> -<a class="jxr_linenumber" name="L193" href="#L193">193</a> + <span class="jxr_string">"not declared: [undefined:undefined]"</span> ) ); -<a class="jxr_linenumber" name="L194" href="#L194">194</a> } -<a class="jxr_linenumber" name="L195" href="#L195">195</a> } -<a class="jxr_linenumber" name="L196" href="#L196">196</a> -<a class="jxr_linenumber" name="L197" href="#L197">197</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testJarWithXmlTransitiveDependency() -<a class="jxr_linenumber" name="L198" href="#L198">198</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException -<a class="jxr_linenumber" name="L199" href="#L199">199</a> { -<a class="jxr_linenumber" name="L200" href="#L200">200</a> compileProject( <span class="jxr_string">"jarWithXmlTransitiveDependency/pom.xml"</span> ); -<a class="jxr_linenumber" name="L201" href="#L201">201</a> -<a class="jxr_linenumber" name="L202" href="#L202">202</a> MavenProject project = getProject( <span class="jxr_string">"jarWithXmlTransitiveDependency/pom.xml"</span> ); -<a class="jxr_linenumber" name="L203" href="#L203">203</a> -<a class="jxr_linenumber" name="L204" href="#L204">204</a> ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project ); -<a class="jxr_linenumber" name="L205" href="#L205">205</a> -<a class="jxr_linenumber" name="L206" href="#L206">206</a> Artifact jdom = createArtifact( <span class="jxr_string">"dom4j"</span>, <span class="jxr_string">"dom4j"</span>, <span class="jxr_string">"jar"</span>, <span class="jxr_string">"1.6.1"</span>, <span class="jxr_string">"compile"</span> ); -<a class="jxr_linenumber" name="L207" href="#L207">207</a> Set<Artifact> usedDeclaredArtifacts = Collections.singleton( jdom ); -<a class="jxr_linenumber" name="L208" href="#L208">208</a> -<a class="jxr_linenumber" name="L209" href="#L209">209</a> ProjectDependencyAnalysis expectedAnalysis = -<a class="jxr_linenumber" name="L210" href="#L210">210</a> <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis( usedDeclaredArtifacts, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong> ); -<a class="jxr_linenumber" name="L211" href="#L211">211</a> -<a class="jxr_linenumber" name="L212" href="#L212">212</a> <em class="jxr_comment">// MSHARED-47: usedUndeclaredArtifacts=[xml-apis:xml-apis:jar:1.0.b2:compile]</em> -<a class="jxr_linenumber" name="L213" href="#L213">213</a> <em class="jxr_comment">//assertEquals( expectedAnalysis, actualAnalysis );</em> -<a class="jxr_linenumber" name="L214" href="#L214">214</a> } +<a class="jxr_linenumber" name="L185" href="#L185">185</a> Artifact project1 = +<a class="jxr_linenumber" name="L186" href="#L186">186</a> createArtifact( <span class="jxr_string">"org.apache.maven.shared.dependency-analyzer.tests"</span>, <span class="jxr_string">"jarWithCompileDependency1"</span>, <span class="jxr_string">"jar"</span>, +<a class="jxr_linenumber" name="L187" href="#L187">187</a> <span class="jxr_string">"1.0"</span>, <span class="jxr_string">"compile"</span> ); +<a class="jxr_linenumber" name="L188" href="#L188">188</a> Set<Artifact> usedDeclaredArtifacts = Collections.singleton( project1 ); +<a class="jxr_linenumber" name="L189" href="#L189">189</a> ProjectDependencyAnalysis expectedAnalysis = <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis( usedDeclaredArtifacts, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong> ); +<a class="jxr_linenumber" name="L190" href="#L190">190</a> +<a class="jxr_linenumber" name="L191" href="#L191">191</a> assertEquals( expectedAnalysis, actualAnalysis ); +<a class="jxr_linenumber" name="L192" href="#L192">192</a> } +<a class="jxr_linenumber" name="L193" href="#L193">193</a> +<a class="jxr_linenumber" name="L194" href="#L194">194</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testForceDeclaredDependenciesUsage() +<a class="jxr_linenumber" name="L195" href="#L195">195</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException +<a class="jxr_linenumber" name="L196" href="#L196">196</a> { +<a class="jxr_linenumber" name="L197" href="#L197">197</a> compileProject( <span class="jxr_string">"jarWithTestDependency/pom.xml"</span> ); +<a class="jxr_linenumber" name="L198" href="#L198">198</a> +<a class="jxr_linenumber" name="L199" href="#L199">199</a> MavenProject project2 = getProject( <span class="jxr_string">"jarWithTestDependency/project2/pom.xml"</span> ); +<a class="jxr_linenumber" name="L200" href="#L200">200</a> +<a class="jxr_linenumber" name="L201" href="#L201">201</a> ProjectDependencyAnalysis analysis = analyzer.analyze( project2 ); +<a class="jxr_linenumber" name="L202" href="#L202">202</a> +<a class="jxr_linenumber" name="L203" href="#L203">203</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="L204" href="#L204">204</a> { +<a class="jxr_linenumber" name="L205" href="#L205">205</a> analysis.forceDeclaredDependenciesUsage( <strong class="jxr_keyword">new</strong> String[] { +<a class="jxr_linenumber" name="L206" href="#L206">206</a> <span class="jxr_string">"org.apache.maven.shared.dependency-analyzer.tests:jarWithTestDependency1"</span> } ); +<a class="jxr_linenumber" name="L207" href="#L207">207</a> fail( <span class="jxr_string">"failure expected since junit dependency is declared-used"</span> ); +<a class="jxr_linenumber" name="L208" href="#L208">208</a> } +<a class="jxr_linenumber" name="L209" href="#L209">209</a> <strong class="jxr_keyword">catch</strong> ( ProjectDependencyAnalyzerException pdae ) +<a class="jxr_linenumber" name="L210" href="#L210">210</a> { +<a class="jxr_linenumber" name="L211" href="#L211">211</a> assertTrue( pdae.getMessage().contains( <span class="jxr_string">"Trying to force use of dependencies which are "</span> +<a class="jxr_linenumber" name="L212" href="#L212">212</a> + <span class="jxr_string">"declared but already detected as used: "</span> +<a class="jxr_linenumber" name="L213" href="#L213">213</a> + <span class="jxr_string">"[org.apache.maven.shared.dependency-analyzer.tests:jarWithTestDependency1]"</span> ) ); +<a class="jxr_linenumber" name="L214" href="#L214">214</a> } <a class="jxr_linenumber" name="L215" href="#L215">215</a> -<a class="jxr_linenumber" name="L216" href="#L216">216</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMultimoduleProject() -<a class="jxr_linenumber" name="L217" href="#L217">217</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException -<a class="jxr_linenumber" name="L218" href="#L218">218</a> { -<a class="jxr_linenumber" name="L219" href="#L219">219</a> compileProject( <span class="jxr_string">"multimoduleProject/pom.xml"</span> ); -<a class="jxr_linenumber" name="L220" href="#L220">220</a> -<a class="jxr_linenumber" name="L221" href="#L221">221</a> <em class="jxr_comment">// difficult to create multi-module project with Maven 2.x, so here's hacky solution</em> -<a class="jxr_linenumber" name="L222" href="#L222">222</a> <em class="jxr_comment">// to get a inter-module dependency</em> -<a class="jxr_linenumber" name="L223" href="#L223">223</a> MavenProject project = getProject( <span class="jxr_string">"multimoduleProject/module2/pom.xml"</span> ); -<a class="jxr_linenumber" name="L224" href="#L224">224</a> @SuppressWarnings( <span class="jxr_string">"unchecked"</span> ) -<a class="jxr_linenumber" name="L225" href="#L225">225</a> Set<Artifact> dependencyArtifacts = project.getArtifacts(); -<a class="jxr_linenumber" name="L226" href="#L226">226</a> <strong class="jxr_keyword">for</strong> ( Artifact artifact : dependencyArtifacts ) -<a class="jxr_linenumber" name="L227" href="#L227">227</a> { -<a class="jxr_linenumber" name="L228" href="#L228">228</a> <strong class="jxr_keyword">if</strong> ( artifact.getArtifactId().equals( <span class="jxr_string">"test-module1"</span> ) ) -<a class="jxr_linenumber" name="L229" href="#L229">229</a> { -<a class="jxr_linenumber" name="L230" href="#L230">230</a> File dir = getTestFile( <span class="jxr_string">"target/test-classes/"</span>, <span class="jxr_string">"multimoduleProject/module1/target/classes/"</span> ); -<a class="jxr_linenumber" name="L231" href="#L231">231</a> artifact.setFile( dir ); -<a class="jxr_linenumber" name="L232" href="#L232">232</a> } -<a class="jxr_linenumber" name="L233" href="#L233">233</a> } +<a class="jxr_linenumber" name="L216" href="#L216">216</a> <strong class="jxr_keyword">try</strong> +<a class="jxr_linenumber" name="L217" href="#L217">217</a> { +<a class="jxr_linenumber" name="L218" href="#L218">218</a> analysis.forceDeclaredDependenciesUsage( <strong class="jxr_keyword">new</strong> String[]{ <span class="jxr_string">"undefined:undefined"</span> } ); +<a class="jxr_linenumber" name="L219" href="#L219">219</a> fail( <span class="jxr_string">"failure expected since undefined dependency is not declared"</span> ); +<a class="jxr_linenumber" name="L220" href="#L220">220</a> } +<a class="jxr_linenumber" name="L221" href="#L221">221</a> <strong class="jxr_keyword">catch</strong> ( ProjectDependencyAnalyzerException pdae ) +<a class="jxr_linenumber" name="L222" href="#L222">222</a> { +<a class="jxr_linenumber" name="L223" href="#L223">223</a> assertTrue( pdae.getMessage().contains( <span class="jxr_string">"Trying to force use of dependencies which are "</span> +<a class="jxr_linenumber" name="L224" href="#L224">224</a> + <span class="jxr_string">"not declared: [undefined:undefined]"</span> ) ); +<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> +<a class="jxr_linenumber" name="L228" href="#L228">228</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testJarWithTestDependency() +<a class="jxr_linenumber" name="L229" href="#L229">229</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException +<a class="jxr_linenumber" name="L230" href="#L230">230</a> { +<a class="jxr_linenumber" name="L231" href="#L231">231</a> compileProject( <span class="jxr_string">"jarWithTestDependency/pom.xml"</span> ); +<a class="jxr_linenumber" name="L232" href="#L232">232</a> +<a class="jxr_linenumber" name="L233" href="#L233">233</a> MavenProject project2 = getProject( <span class="jxr_string">"jarWithTestDependency/project2/pom.xml"</span> ); <a class="jxr_linenumber" name="L234" href="#L234">234</a> -<a class="jxr_linenumber" name="L235" href="#L235">235</a> ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project ); +<a class="jxr_linenumber" name="L235" href="#L235">235</a> ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project2 ); <a class="jxr_linenumber" name="L236" href="#L236">236</a> -<a class="jxr_linenumber" name="L237" href="#L237">237</a> Artifact junit = createArtifact( <span class="jxr_string">"org.apache.maven.its.dependency"</span>, <span class="jxr_string">"test-module1"</span>, <span class="jxr_string">"jar"</span>, <span class="jxr_string">"1.0"</span>, <span class="jxr_string">"compile"</span> ); -<a class="jxr_linenumber" name="L238" href="#L238">238</a> Set<Artifact> usedDeclaredArtifacts = Collections.singleton( junit ); -<a class="jxr_linenumber" name="L239" href="#L239">239</a> -<a class="jxr_linenumber" name="L240" href="#L240">240</a> ProjectDependencyAnalysis expectedAnalysis = -<a class="jxr_linenumber" name="L241" href="#L241">241</a> <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis( usedDeclaredArtifacts, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong> ); -<a class="jxr_linenumber" name="L242" href="#L242">242</a> -<a class="jxr_linenumber" name="L243" href="#L243">243</a> assertEquals( expectedAnalysis, actualAnalysis ); -<a class="jxr_linenumber" name="L244" href="#L244">244</a> } -<a class="jxr_linenumber" name="L245" href="#L245">245</a> -<a class="jxr_linenumber" name="L246" href="#L246">246</a> <em class="jxr_comment">// private methods --------------------------------------------------------</em> -<a class="jxr_linenumber" name="L247" href="#L247">247</a> -<a class="jxr_linenumber" name="L248" href="#L248">248</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> compileProject( String pomPath ) -<a class="jxr_linenumber" name="L249" href="#L249">249</a> <strong class="jxr_keyword">throws</strong> TestToolsException -<a class="jxr_linenumber" name="L250" href="#L250">250</a> { -<a class="jxr_linenumber" name="L251" href="#L251">251</a> File pom = getTestFile( <span class="jxr_string">"target/test-classes/"</span>, pomPath ); -<a class="jxr_linenumber" name="L252" href="#L252">252</a> Properties properties = <strong class="jxr_keyword">new</strong> Properties(); -<a class="jxr_linenumber" name="L253" href="#L253">253</a> List<String> goals = Arrays.asList( <span class="jxr_string">"clean"</span>, <span class="jxr_string">"install"</span> ); -<a class="jxr_linenumber" name="L254" href="#L254">254</a> File log = <strong class="jxr_keyword">new</strong> File( pom.getParentFile(), <span class="jxr_string">"build.log"</span> ); +<a class="jxr_linenumber" name="L237" href="#L237">237</a> Artifact project1 = +<a class="jxr_linenumber" name="L238" href="#L238">238</a> createArtifact( <span class="jxr_string">"org.apache.maven.shared.dependency-analyzer.tests"</span>, <span class="jxr_string">"jarWithTestDependency1"</span>, <span class="jxr_string">"jar"</span>, <span class="jxr_string">"1.0"</span>, +<a class="jxr_linenumber" name="L239" href="#L239">239</a> <span class="jxr_string">"test"</span> ); +<a class="jxr_linenumber" name="L240" href="#L240">240</a> Artifact junit = createArtifact( <span class="jxr_string">"junit"</span>, <span class="jxr_string">"junit"</span>, <span class="jxr_string">"jar"</span>, <span class="jxr_string">"3.8.1"</span>, <span class="jxr_string">"test"</span> ); +<a class="jxr_linenumber" name="L241" href="#L241">241</a> +<a class="jxr_linenumber" name="L242" href="#L242">242</a> ProjectDependencyAnalysis expectedAnalysis; +<a class="jxr_linenumber" name="L243" href="#L243">243</a> <strong class="jxr_keyword">if</strong> ( SystemUtils.isJavaVersionAtLeast( 180 ) ) +<a class="jxr_linenumber" name="L244" href="#L244">244</a> { +<a class="jxr_linenumber" name="L245" href="#L245">245</a> Set<Artifact> usedDeclaredArtifacts = <strong class="jxr_keyword">new</strong> HashSet<Artifact>( Arrays.asList( project1, junit ) ); +<a class="jxr_linenumber" name="L246" href="#L246">246</a> expectedAnalysis = <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis( usedDeclaredArtifacts, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong> ); +<a class="jxr_linenumber" name="L247" href="#L247">247</a> } +<a class="jxr_linenumber" name="L248" href="#L248">248</a> <strong class="jxr_keyword">else</strong> +<a class="jxr_linenumber" name="L249" href="#L249">249</a> { +<a class="jxr_linenumber" name="L250" href="#L250">250</a> <em class="jxr_comment">// With JDK 7 and earlier, not all deps are identified correctly</em> +<a class="jxr_linenumber" name="L251" href="#L251">251</a> Set<Artifact> usedDeclaredArtifacts = Collections.singleton( project1 ); +<a class="jxr_linenumber" name="L252" href="#L252">252</a> Set<Artifact> unusedDeclaredArtifacts = Collections.singleton( junit ); +<a class="jxr_linenumber" name="L253" href="#L253">253</a> expectedAnalysis = <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis( usedDeclaredArtifacts, <strong class="jxr_keyword">null</strong>, unusedDeclaredArtifacts ); +<a class="jxr_linenumber" name="L254" href="#L254">254</a> } <a class="jxr_linenumber" name="L255" href="#L255">255</a> -<a class="jxr_linenumber" name="L256" href="#L256">256</a> <em class="jxr_comment">// TODO: don't install test artifacts to local repository</em> -<a class="jxr_linenumber" name="L257" href="#L257">257</a> InvocationRequest request = buildTool.createBasicInvocationRequest( pom, properties, goals, log ); -<a class="jxr_linenumber" name="L258" href="#L258">258</a> request.setLocalRepositoryDirectory( localRepo ); -<a class="jxr_linenumber" name="L259" href="#L259">259</a> InvocationResult result = buildTool.executeMaven( request ); -<a class="jxr_linenumber" name="L260" href="#L260">260</a> -<a class="jxr_linenumber" name="L261" href="#L261">261</a> assertNull( <span class="jxr_string">"Error compiling test project"</span>, result.getExecutionException() ); -<a class="jxr_linenumber" name="L262" href="#L262">262</a> assertEquals( <span class="jxr_string">"Error compiling test project"</span>, 0, result.getExitCode() ); -<a class="jxr_linenumber" name="L263" href="#L263">263</a> } -<a class="jxr_linenumber" name="L264" href="#L264">264</a> -<a class="jxr_linenumber" name="L265" href="#L265">265</a> <strong class="jxr_keyword">private</strong> MavenProject getProject( String pomPath ) -<a class="jxr_linenumber" name="L266" href="#L266">266</a> <strong class="jxr_keyword">throws</strong> TestToolsException -<a class="jxr_linenumber" name="L267" href="#L267">267</a> { -<a class="jxr_linenumber" name="L268" href="#L268">268</a> File pom = getTestFile( <span class="jxr_string">"target/test-classes/"</span>, pomPath ); -<a class="jxr_linenumber" name="L269" href="#L269">269</a> -<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong class="jxr_keyword">return</strong> projectTool.readProjectWithDependencies( pom ); -<a class="jxr_linenumber" name="L271" href="#L271">271</a> } +<a class="jxr_linenumber" name="L256" href="#L256">256</a> assertEquals( expectedAnalysis, actualAnalysis ); +<a class="jxr_linenumber" name="L257" href="#L257">257</a> } +<a class="jxr_linenumber" name="L258" href="#L258">258</a> +<a class="jxr_linenumber" name="L259" href="#L259">259</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testJarWithXmlTransitiveDependency() +<a class="jxr_linenumber" name="L260" href="#L260">260</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException +<a class="jxr_linenumber" name="L261" href="#L261">261</a> { +<a class="jxr_linenumber" name="L262" href="#L262">262</a> compileProject( <span class="jxr_string">"jarWithXmlTransitiveDependency/pom.xml"</span> ); +<a class="jxr_linenumber" name="L263" href="#L263">263</a> +<a class="jxr_linenumber" name="L264" href="#L264">264</a> MavenProject project = getProject( <span class="jxr_string">"jarWithXmlTransitiveDependency/pom.xml"</span> ); +<a class="jxr_linenumber" name="L265" href="#L265">265</a> +<a class="jxr_linenumber" name="L266" href="#L266">266</a> ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project ); +<a class="jxr_linenumber" name="L267" href="#L267">267</a> +<a class="jxr_linenumber" name="L268" href="#L268">268</a> Artifact jdom = createArtifact( <span class="jxr_string">"dom4j"</span>, <span class="jxr_string">"dom4j"</span>, <span class="jxr_string">"jar"</span>, <span class="jxr_string">"1.6.1"</span>, <span class="jxr_string">"compile"</span> ); +<a class="jxr_linenumber" name="L269" href="#L269">269</a> Set<Artifact> usedDeclaredArtifacts = Collections.singleton( jdom ); +<a class="jxr_linenumber" name="L270" href="#L270">270</a> +<a class="jxr_linenumber" name="L271" href="#L271">271</a> ProjectDependencyAnalysis expectedAnalysis = <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis( usedDeclaredArtifacts, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong> ); <a class="jxr_linenumber" name="L272" href="#L272">272</a> -<a class="jxr_linenumber" name="L273" href="#L273">273</a> <strong class="jxr_keyword">private</strong> Artifact createArtifact( String groupId, String artifactId, String type, String version, String scope ) -<a class="jxr_linenumber" name="L274" href="#L274">274</a> { -<a class="jxr_linenumber" name="L275" href="#L275">275</a> VersionRange versionRange = VersionRange.createFromVersion( version ); -<a class="jxr_linenumber" name="L276" href="#L276">276</a> ArtifactHandler handler = <strong class="jxr_keyword">new</strong> DefaultArtifactHandler(); -<a class="jxr_linenumber" name="L277" href="#L277">277</a> -<a class="jxr_linenumber" name="L278" href="#L278">278</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> DefaultArtifact( groupId, artifactId, versionRange, scope, type, <strong class="jxr_keyword">null</strong>, handler ); -<a class="jxr_linenumber" name="L279" href="#L279">279</a> } -<a class="jxr_linenumber" name="L280" href="#L280">280</a> } +<a class="jxr_linenumber" name="L273" href="#L273">273</a> <em class="jxr_comment">// MSHARED-47: usedUndeclaredArtifacts=[xml-apis:xml-apis:jar:1.0.b2:compile]</em> +<a class="jxr_linenumber" name="L274" href="#L274">274</a> <em class="jxr_comment">//assertEquals( expectedAnalysis, actualAnalysis );</em> +<a class="jxr_linenumber" name="L275" href="#L275">275</a> } +<a class="jxr_linenumber" name="L276" href="#L276">276</a> +<a class="jxr_linenumber" name="L277" href="#L277">277</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testMultimoduleProject() +<a class="jxr_linenumber" name="L278" href="#L278">278</a> <strong class="jxr_keyword">throws</strong> TestToolsException, ProjectDependencyAnalyzerException +<a class="jxr_linenumber" name="L279" href="#L279">279</a> { +<a class="jxr_linenumber" name="L280" href="#L280">280</a> compileProject( <span class="jxr_string">"multimoduleProject/pom.xml"</span> ); +<a class="jxr_linenumber" name="L281" href="#L281">281</a> +<a class="jxr_linenumber" name="L282" href="#L282">282</a> <em class="jxr_comment">// difficult to create multi-module project with Maven 2.x, so here's hacky solution</em> +<a class="jxr_linenumber" name="L283" href="#L283">283</a> <em class="jxr_comment">// to get a inter-module dependency</em> +<a class="jxr_linenumber" name="L284" href="#L284">284</a> MavenProject project = getProject( <span class="jxr_string">"multimoduleProject/module2/pom.xml"</span> ); +<a class="jxr_linenumber" name="L285" href="#L285">285</a> @SuppressWarnings( <span class="jxr_string">"unchecked"</span> ) Set<Artifact> dependencyArtifacts = project.getArtifacts(); +<a class="jxr_linenumber" name="L286" href="#L286">286</a> <strong class="jxr_keyword">for</strong> ( Artifact artifact : dependencyArtifacts ) +<a class="jxr_linenumber" name="L287" href="#L287">287</a> { +<a class="jxr_linenumber" name="L288" href="#L288">288</a> <strong class="jxr_keyword">if</strong> ( artifact.getArtifactId() +<a class="jxr_linenumber" name="L289" href="#L289">289</a> .equals( <span class="jxr_string">"test-module1"</span> ) ) +<a class="jxr_linenumber" name="L290" href="#L290">290</a> { +<a class="jxr_linenumber" name="L291" href="#L291">291</a> File dir = getTestFile( <span class="jxr_string">"target/test-classes/"</span>, <span class="jxr_string">"multimoduleProject/module1/target/classes/"</span> ); +<a class="jxr_linenumber" name="L292" href="#L292">292</a> artifact.setFile( dir ); +<a class="jxr_linenumber" name="L293" href="#L293">293</a> } +<a class="jxr_linenumber" name="L294" href="#L294">294</a> } +<a class="jxr_linenumber" name="L295" href="#L295">295</a> +<a class="jxr_linenumber" name="L296" href="#L296">296</a> ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project ); +<a class="jxr_linenumber" name="L297" href="#L297">297</a> +<a class="jxr_linenumber" name="L298" href="#L298">298</a> Artifact junit = createArtifact( <span class="jxr_string">"org.apache.maven.its.dependency"</span>, <span class="jxr_string">"test-module1"</span>, <span class="jxr_string">"jar"</span>, <span class="jxr_string">"1.0"</span>, <span class="jxr_string">"compile"</span> ); +<a class="jxr_linenumber" name="L299" href="#L299">299</a> Set<Artifact> usedDeclaredArtifacts = Collections.singleton( junit ); +<a class="jxr_linenumber" name="L300" href="#L300">300</a> +<a class="jxr_linenumber" name="L301" href="#L301">301</a> ProjectDependencyAnalysis expectedAnalysis = <strong class="jxr_keyword">new</strong> ProjectDependencyAnalysis( usedDeclaredArtifacts, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong> ); +<a class="jxr_linenumber" name="L302" href="#L302">302</a> +<a class="jxr_linenumber" name="L303" href="#L303">303</a> assertEquals( expectedAnalysis, actualAnalysis ); +<a class="jxr_linenumber" name="L304" href="#L304">304</a> } +<a class="jxr_linenumber" name="L305" href="#L305">305</a> +<a class="jxr_linenumber" name="L306" href="#L306">306</a> <em class="jxr_comment">// private methods --------------------------------------------------------</em> +<a class="jxr_linenumber" name="L307" href="#L307">307</a> +<a class="jxr_linenumber" name="L308" href="#L308">308</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> compileProject( String pomPath ) +<a class="jxr_linenumber" name="L309" href="#L309">309</a> <strong class="jxr_keyword">throws</strong> TestToolsException +<a class="jxr_linenumber" name="L310" href="#L310">310</a> { +<a class="jxr_linenumber" name="L311" href="#L311">311</a> File pom = getTestFile( <span class="jxr_string">"target/test-classes/"</span>, pomPath ); +<a class="jxr_linenumber" name="L312" href="#L312">312</a> Properties properties = <strong class="jxr_keyword">new</strong> Properties(); +<a class="jxr_linenumber" name="L313" href="#L313">313</a> List<String> goals = Arrays.asList( <span class="jxr_string">"clean"</span>, <span class="jxr_string">"install"</span> ); +<a class="jxr_linenumber" name="L314" href="#L314">314</a> File log = <strong class="jxr_keyword">new</strong> File( pom.getParentFile(), <span class="jxr_string">"build.log"</span> ); +<a class="jxr_linenumber" name="L315" href="#L315">315</a> +<a class="jxr_linenumber" name="L316" href="#L316">316</a> <em class="jxr_comment">// TODO: don't install test artifacts to local repository</em> +<a class="jxr_linenumber" name="L317" href="#L317">317</a> InvocationRequest request = buildTool.createBasicInvocationRequest( pom, properties, goals, log ); +<a class="jxr_linenumber" name="L318" href="#L318">318</a> request.setLocalRepositoryDirectory( localRepo ); +<a class="jxr_linenumber" name="L319" href="#L319">319</a> InvocationResult result = buildTool.executeMaven( request ); +<a class="jxr_linenumber" name="L320" href="#L320">320</a> +<a class="jxr_linenumber" name="L321" href="#L321">321</a> assertNull( <span class="jxr_string">"Error compiling test project"</span>, result.getExecutionException() ); +<a class="jxr_linenumber" name="L322" href="#L322">322</a> assertEquals( <span class="jxr_string">"Error compiling test project"</span>, 0, result.getExitCode() ); +<a class="jxr_linenumber" name="L323" href="#L323">323</a> } +<a class="jxr_linenumber" name="L324" href="#L324">324</a> +<a class="jxr_linenumber" name="L325" href="#L325">325</a> <strong class="jxr_keyword">private</strong> MavenProject getProject( String pomPath ) +<a class="jxr_linenumber" name="L326" href="#L326">326</a> <strong class="jxr_keyword">throws</strong> TestToolsException +<a class="jxr_linenumber" name="L327" href="#L327">327</a> { +<a class="jxr_linenumber" name="L328" href="#L328">328</a> File pom = getTestFile( <span class="jxr_string">"target/test-classes/"</span>, pomPath ); +<a class="jxr_linenumber" name="L329" href="#L329">329</a> +<a class="jxr_linenumber" name="L330" href="#L330">330</a> <strong class="jxr_keyword">return</strong> projectTool.readProjectWithDependencies( pom ); +<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">private</strong> Artifact createArtifact( String groupId, String artifactId, String type, String version, String scope ) +<a class="jxr_linenumber" name="L334" href="#L334">334</a> { +<a class="jxr_linenumber" name="L335" href="#L335">335</a> VersionRange versionRange = VersionRange.createFromVersion( version ); +<a class="jxr_linenumber" name="L336" href="#L336">336</a> ArtifactHandler handler = <strong class="jxr_keyword">new</strong> DefaultArtifactHandler(); +<a class="jxr_linenumber" name="L337" href="#L337">337</a> +<a class="jxr_linenumber" name="L338" href="#L338">338</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> DefaultArtifact( groupId, artifactId, versionRange, scope, type, <strong class="jxr_keyword">null</strong>, handler ); +<a class="jxr_linenumber" name="L339" href="#L339">339</a> } +<a class="jxr_linenumber" name="L340" href="#L340">340</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2017 <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-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/InputStreamConstraint.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/InputStreamConstraint.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/InputStreamConstraint.html Sat Apr 29 16:06:50 2017 @@ -108,6 +108,6 @@ <a class="jxr_linenumber" name="L100" href="#L100">100</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2017 <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-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysisTest.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysisTest.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysisTest.html Sat Apr 29 16:06:50 2017 @@ -62,6 +62,6 @@ <a class="jxr_linenumber" name="L54" href="#L54">54</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2017 <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-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalyzerExceptionTest.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalyzerExceptionTest.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalyzerExceptionTest.html Sat Apr 29 16:06:50 2017 @@ -58,6 +58,6 @@ <a class="jxr_linenumber" name="L50" href="#L50">50</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2017 <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-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.html Sat Apr 29 16:06:50 2017 @@ -737,6 +737,6 @@ <a class="jxr_linenumber" name="L729" href="#L729">729</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2017 <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-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/asm/MockAttribute.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/asm/MockAttribute.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/asm/MockAttribute.html Sat Apr 29 16:06:50 2017 @@ -46,6 +46,6 @@ <a class="jxr_linenumber" name="L38" href="#L38">38</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2017 <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-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/asm/package-frame.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/asm/package-frame.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/asm/package-frame.html Sat Apr 29 16:06:50 2017 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <title>Apache Maven Dependency Analyzer 1.6 Reference Package org.apache.maven.shared.dependency.analyzer.asm</title> + <title>Apache Maven Dependency Analyzer 1.7 Reference Package org.apache.maven.shared.dependency.analyzer.asm</title> <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="style" /> </head> <body> Modified: websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/asm/package-summary.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/asm/package-summary.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/asm/package-summary.html Sat Apr 29 16:06:50 2017 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <title>Apache Maven Dependency Analyzer 1.6 Reference Package org.apache.maven.shared.dependency.analyzer.asm</title> + <title>Apache Maven Dependency Analyzer 1.7 Reference Package org.apache.maven.shared.dependency.analyzer.asm</title> <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="style" /> </head> <body> @@ -68,7 +68,7 @@ </div> <hr /> <div id="footer"> - Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved. + Copyright © 2002–2017 <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-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/package-frame.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/package-frame.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/package-frame.html Sat Apr 29 16:06:50 2017 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <title>Apache Maven Dependency Analyzer 1.6 Reference Package org.apache.maven.shared.dependency.analyzer</title> + <title>Apache Maven Dependency Analyzer 1.7 Reference Package org.apache.maven.shared.dependency.analyzer</title> <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" /> </head> <body> Modified: websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/package-summary.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/package-summary.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/org/apache/maven/shared/dependency/analyzer/package-summary.html Sat Apr 29 16:06:50 2017 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <title>Apache Maven Dependency Analyzer 1.6 Reference Package org.apache.maven.shared.dependency.analyzer</title> + <title>Apache Maven Dependency Analyzer 1.7 Reference Package org.apache.maven.shared.dependency.analyzer</title> <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" /> </head> <body> @@ -98,7 +98,7 @@ </div> <hr /> <div id="footer"> - Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved. + Copyright © 2002–2017 <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-dependency-analyzer-LATEST/xref-test/overview-frame.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/overview-frame.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/overview-frame.html Sat Apr 29 16:06:50 2017 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <title>Apache Maven Dependency Analyzer 1.6 Reference</title> + <title>Apache Maven Dependency Analyzer 1.7 Reference</title> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" /> </head> <body> Modified: websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/overview-summary.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/overview-summary.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref-test/overview-summary.html Sat Apr 29 16:06:50 2017 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <title>Apache Maven Dependency Analyzer 1.6 Reference</title> + <title>Apache Maven Dependency Analyzer 1.7 Reference</title> <link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" /> </head> <body> @@ -24,7 +24,7 @@ </ul> </div> - <h2>Apache Maven Dependency Analyzer 1.6 Reference</h2> + <h2>Apache Maven Dependency Analyzer 1.7 Reference</h2> <table class="summary"> <thead> @@ -65,7 +65,7 @@ <hr /> <div id="footer"> - Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved. + Copyright © 2002–2017 <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-dependency-analyzer-LATEST/xref/allclasses-frame.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/allclasses-frame.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/allclasses-frame.html Sat Apr 29 16:06:50 2017 @@ -27,6 +27,9 @@ <a href="org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitor.html" target="classFrame">CollectorClassFileVisitor</a> </li> <li> + <a href="org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.html" target="classFrame">ConstantPoolParser</a> + </li> + <li> <a href="org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.html" target="classFrame">DefaultAnnotationVisitor</a> </li> <li> Modified: websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/index.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/index.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/index.html Sat Apr 29 16:06:50 2017 @@ -4,7 +4,7 @@ <!-- this is a JXR report set --> <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <title>Apache Maven Dependency Analyzer 1.6 Reference</title> + <title>Apache Maven Dependency Analyzer 1.7 Reference</title> </head> <frameset cols="20%,80%"> <frameset rows="30%,70%"> Modified: websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/ClassAnalyzer.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/ClassAnalyzer.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/ClassAnalyzer.html Sat Apr 29 16:06:50 2017 @@ -50,6 +50,6 @@ <a class="jxr_linenumber" name="L42" href="#L42">42</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2017 <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-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/ClassFileVisitor.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/ClassFileVisitor.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/ClassFileVisitor.html Sat Apr 29 16:06:50 2017 @@ -41,6 +41,6 @@ <a class="jxr_linenumber" name="L33" href="#L33">33</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2017 <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-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.html Sat Apr 29 16:06:50 2017 @@ -173,6 +173,6 @@ <a class="jxr_linenumber" name="L165" href="#L165">165</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2017 <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-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitor.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitor.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitor.html Sat Apr 29 16:06:50 2017 @@ -72,6 +72,6 @@ <a class="jxr_linenumber" name="L64" href="#L64">64</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2017 <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-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.html ============================================================================== --- websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.html (original) +++ websites/production/maven/components/shared-archives/maven-dependency-analyzer-LATEST/xref/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.html Sat Apr 29 16:06:50 2017 @@ -70,6 +70,6 @@ <a class="jxr_linenumber" name="L62" href="#L62">62</a> } </pre> <hr/> -<div id="footer">Copyright © 2002–2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> +<div id="footer">Copyright © 2002–2017 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div> </body> </html> \ No newline at end of file