Drop unused screenshot funtionality
and outdated Selenium dependency
diff --git a/pom.xml b/pom.xml
index fc63bea..fdfb0d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>34</version>
- <relativePath>../../../pom/maven/pom.xml</relativePath>
+ <relativePath/>
</parent>
<groupId>org.apache.maven.dist.tools</groupId>
@@ -114,28 +114,11 @@
<version>${mvnversion}</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-firefox-driver</artifactId>
- <version>2.33.0</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.2.5</version>
- </dependency>
</dependencies>
<build>
diff --git a/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java b/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java
index 14c6c63..56111ec 100644
--- a/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java
+++ b/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java
@@ -19,12 +19,10 @@
* under the License.
*/
-import java.io.File;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
-import org.apache.commons.io.FileUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -32,7 +30,6 @@
import org.apache.maven.dist.tools.ConfigurationLineInfo;
import org.apache.maven.dist.tools.JsoupRetry;
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
@@ -42,11 +39,6 @@
import org.apache.maven.reporting.MavenReportException;
import org.jsoup.HttpStatusException;
import org.jsoup.nodes.Document;
-import org.openqa.selenium.OutputType;
-import org.openqa.selenium.TakesScreenshot;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.firefox.FirefoxDriver;
-
/**
*
* @author skygo
@@ -80,13 +72,7 @@
*/
@Component
protected MavenProjectBuilder mavenProjectBuilder;
-
- /**
- * Take screenshot with web browser
- */
- @Parameter( property = "screenshot", defaultValue = "false" )
- protected boolean screenShot;
-
+
/**
* Http status ok code.
*/
@@ -118,7 +104,6 @@
// keep result
private List<CheckSiteResult> results = new LinkedList<>();
private final List<HTMLChecker> checker = HTMLCheckerFactory.getCheckers();
- private WebDriver driver;
@Override
protected void executeReport( Locale locale )
@@ -168,12 +153,6 @@
sink.lineBreak();
sink.rawText( "Comments on top of html" );
sink.tableHeaderCell_();
- if ( screenShot )
- {
- sink.tableHeaderCell();
- sink.rawText( "Screen" );
- sink.tableHeaderCell_();
- }
sink.tableHeaderCell();
sink.rawText( "Artifact version displayed" );
sink.tableHeaderCell_();
@@ -211,7 +190,7 @@
sink.tableCell();
sink.rawText( csr.getVersion() );
sink.tableCell_();
-
+
sink.tableCell();
sink.rawText( cli.getReleaseDateFromMetadata() );
sink.tableCell_();
@@ -227,19 +206,7 @@
sink.lineBreak();
csr.getSkins( sink );
sink.tableCell_();
- if ( screenShot )
- {
- sink.tableCell();
- sink.figure( null );
- SinkEventAttributeSet atts = new SinkEventAttributeSet();
- // no direct attribute, override style only
- atts.addAttribute( "style", "height:200px;width:200px" );
- atts.addAttribute( "alt", getSimplifiedUrl( csr.getUrl() ) );
- sink.figureGraphics( csr.getScreenShot(), atts );
- sink.figure_();
- sink.tableCell_();
- }
-
+
sink.tableCell();
csr.getOverall( sink );
sink.tableCell_();
@@ -280,21 +247,12 @@
result.setUrl( siteUrl );
Document doc = JsoupRetry.get( siteUrl );
- if ( screenShot )
- {
- driver.get( artifactProject.getUrl() );
- File scrFile = ( ( TakesScreenshot ) driver ).getScreenshotAs( OutputType.FILE );
- String fileName = "images" + File.separator
- + cli.getGroupId() + "_" + cli.getArtifactId() + ".png";
- result.setScreenShot( fileName );
- FileUtils.copyFile( scrFile, new File( getReportOutputDirectory(), fileName ) );
- }
for ( HTMLChecker c : checker )
{
result.getCheckMap().put( c, c.isOk( doc, version ) );
}
result.setDocument( doc );
-
+
}
catch ( HttpStatusException hes )
{
@@ -319,27 +277,4 @@
{
checkSite( configLine, latestVersion );
}
-
- @Override
- public void execute()
- throws MojoExecutionException
- {
- try
- {
- //resolve only to what we set
- if ( screenShot )
- {
- // create driver once reduce time to complete mojo
- driver = new FirefoxDriver();
- }
- super.execute();
- }
- finally
- {
- if ( screenShot )
- {
- driver.close();
- }
- }
- }
}
