Skip to content

Commit 20ea986

Browse files
committed
Prepare for Doxia 2.0.0
1 parent de7751b commit 20ea986

File tree

3 files changed

+10
-22
lines changed

3 files changed

+10
-22
lines changed

pom.xml

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ under the License.
2828
</parent>
2929

3030
<artifactId>maven-dependency-plugin</artifactId>
31-
<version>3.6.2-SNAPSHOT</version>
31+
<version>3.7.0-SNAPSHOT</version>
3232
<packaging>maven-plugin</packaging>
3333

3434
<name>Apache Maven Dependency Plugin</name>
@@ -165,33 +165,23 @@ under the License.
165165
<scope>provided</scope>
166166
</dependency>
167167

168-
<!-- reporting -->
168+
<!-- doxia -->
169169
<dependency>
170170
<groupId>org.apache.maven.doxia</groupId>
171171
<artifactId>doxia-sink-api</artifactId>
172-
<version>1.11.1</version>
173-
<exclusions>
174-
<exclusion>
175-
<groupId>org.codehaus.plexus</groupId>
176-
<artifactId>plexus-container-default</artifactId>
177-
</exclusion>
178-
</exclusions>
172+
<version>2.0.0-M8</version>
179173
</dependency>
174+
175+
<!-- reporting -->
180176
<dependency>
181177
<groupId>org.apache.maven.reporting</groupId>
182178
<artifactId>maven-reporting-api</artifactId>
183-
<version>3.1.1</version>
179+
<version>4.0.0-M8</version>
184180
</dependency>
185181
<dependency>
186182
<groupId>org.apache.maven.reporting</groupId>
187183
<artifactId>maven-reporting-impl</artifactId>
188-
<version>3.2.0</version>
189-
<exclusions>
190-
<exclusion>
191-
<groupId>org.codehaus.plexus</groupId>
192-
<artifactId>plexus-container-default</artifactId>
193-
</exclusion>
194-
</exclusions>
184+
<version>4.0.0-M11</version>
195185
</dependency>
196186
<dependency>
197187
<groupId>commons-io</groupId>

src/it/projects/analyze-testDependencyWithNonTestScope/verify.bsh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if ( htmlFile.length() == 0 )
3737

3838
Document doc = Jsoup.parse( htmlFile, "UTF-8");
3939

40-
Elements entry = doc.select( "#contentBox > section > section:nth-child(5) > table > tbody > tr.b" );
40+
Elements entry = doc.select( "#bodyColumn > section > section:nth-child(5) > table > tbody > tr.b" );
4141

4242
if( entry.isEmpty() )
4343
{
@@ -50,7 +50,7 @@ else if ( entry.size() != 1 )
5050
}
5151

5252
Element groupIdElement = doc.select(
53-
"#contentBox > section > section:nth-child(5) > table > tbody > tr.b > td:nth-child(1)" ).first();
53+
"#bodyColumn > section > section:nth-child(5) > table > tbody > tr.b > td:nth-child(1)" ).first();
5454

5555
String groupId = groupIdElement.text();
5656

src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportMojo.java renamed to src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReport.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*/
4242
@Mojo(name = "analyze-report", requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true)
4343
@Execute(phase = LifecyclePhase.TEST_COMPILE)
44-
public class AnalyzeReportMojo extends AbstractMavenReport {
44+
public class AnalyzeReport extends AbstractMavenReport {
4545
// fields -----------------------------------------------------------------
4646

4747
/**
@@ -115,13 +115,11 @@ public void executeReport(Locale locale) throws MavenReportException {
115115
@Override
116116
public boolean canGenerateReport() {
117117
if (skip) {
118-
getLog().info("Skipping plugin execution");
119118
return false;
120119
}
121120

122121
// Step 0: Checking pom availability
123122
if ("pom".equals(project.getPackaging())) {
124-
getLog().info("Skipping pom project");
125123
return false;
126124
}
127125

0 commit comments

Comments
 (0)