Skip to content

[MPMD-308] Set Maven 3.1.0 as minimum version #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
adangel wants to merge 2 commits into from
Closed

[MPMD-308] Set Maven 3.1.0 as minimum version #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd894e8
[MPMD-308] Set Maven 3.1.0 as minimum version
adangel Sep 3, 2021
2a2e143
Remove now unnecessary maven-compat, fix test
adangel Sep 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ under the License.
</distributionManagement>

<properties>
<mavenVersion>3.0</mavenVersion>
<mavenVersion>3.1.0</mavenVersion>
<doxiaVersion>1.9.1</doxiaVersion>
<doxiaSitetoolsVersion>1.9.2</doxiaSitetoolsVersion>
<javaVersion>8</javaVersion><!-- Because PMD 6.35.0+ requires Java 8 -->
Expand Down Expand Up @@ -131,12 +131,18 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
<version>3.1.0</version>
<version>${mavenVersion}</version>
<exclusions>
<exclusion>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
<version>3.1.0</version>
<version>${mavenVersion}</version>
<scope>provided</scope>
<exclusions>
<!-- exclude old asm:asm, as pmd brings in a newer version (org.ow2.asm:asm) -->
Expand Down Expand Up @@ -238,22 +244,20 @@ under the License.
</dependency>

<!-- test -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>2.1</version>
<version>${mavenVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
<version>2.9.0</version>
<!-- that's a very old version, but it's the newest one that brings in
a old guava version, that is compatible with maven 3.1.0.
maven 3.1.0 uses guava 10, wiremock 1.49 uses guava 13.0.1
-->
<version>1.49</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
15 changes: 12 additions & 3 deletions src/test/java/org/apache/maven/plugins/pmd/CpdViolationCheckMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,22 @@ protected void setUp()
public void testDefaultConfiguration()
throws Exception
{
File testPom =
new File( getBasedir(),
"src/test/resources/unit/default-configuration/cpd-default-configuration-plugin-config.xml" );
final CpdReport mojo = (CpdReport) lookupMojo( "cpd", testPom );
mojo.execute();

// clear the output from previous pmd:cpd execution
CapturingPrintStream.init( true );

try
{
final File testPom =
testPom =
new File( getBasedir(),
"src/test/resources/unit/default-configuration/pmd-check-default-configuration-plugin-config.xml" );
final CpdViolationCheckMojo mojo = (CpdViolationCheckMojo) lookupMojo( "cpd-check", testPom );
mojo.execute();
final CpdViolationCheckMojo cpdViolationMojo = (CpdViolationCheckMojo) lookupMojo( "cpd-check", testPom );
cpdViolationMojo.execute();

fail( "MojoFailureException should be thrown." );
}
Expand Down
10 changes: 6 additions & 4 deletions src/test/java/org/apache/maven/plugins/pmd/PmdReportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,11 @@ public void testFileURL()
final String sonarProfileUrl = sonarBaseUrl + "/export?format=pmd&language=java&name=Sonar%2520way";
final String sonarExportRulesetUrl = "http://localhost:" + mockServer.port() + sonarProfileUrl;

mockServer.stubFor( WireMock.get( WireMock.urlEqualTo( sonarBaseUrl ) ).willReturn( WireMock.aResponse().withStatus( 200 ).withHeader( "Content-Type",
WireMock.configureFor( "localhost", port );
WireMock.stubFor( WireMock.get( WireMock.urlEqualTo( sonarBaseUrl ) ).willReturn( WireMock.aResponse().withStatus( 200 ).withHeader( "Content-Type",
"text/html" ).withBody( sonarMainPageHtml ) ) );

mockServer.stubFor( WireMock.get( WireMock.urlEqualTo( sonarProfileUrl ) ).willReturn( WireMock.aResponse().withStatus( 200 ).withHeader( "Content-Type",
WireMock.stubFor( WireMock.get( WireMock.urlEqualTo( sonarProfileUrl ) ).willReturn( WireMock.aResponse().withStatus( 200 ).withHeader( "Content-Type",
"text/xml" ).withBody( sonarRuleset ) ) );

URL url = getClass().getClassLoader().getResource( "rulesets/java/basic.xml" );
Expand Down Expand Up @@ -719,10 +720,11 @@ public void testPmdReportResolveRulesets()
final String myRulesetBaseUrl = "/config/my-ruleset.xml";
final String myRulesetUrl = "http://localhost:" + mockServer.port() + myRulesetBaseUrl;

mockServer.stubFor( WireMock.get( WireMock.urlEqualTo( sonarProfileUrl ) )
WireMock.configureFor( "localhost", port );
WireMock.stubFor( WireMock.get( WireMock.urlEqualTo( sonarProfileUrl ) )
.willReturn( WireMock.aResponse().withStatus( 200 ).withHeader( "Content-Type",
"text/xml" ).withBody( sonarRuleset ) ) );
mockServer.stubFor( WireMock.get( WireMock.urlEqualTo( myRulesetBaseUrl ) )
WireMock.stubFor( WireMock.get( WireMock.urlEqualTo( myRulesetBaseUrl ) )
.willReturn( WireMock.aResponse().withStatus( 200 ).withHeader( "Content-Type",
"text/xml" ).withBody( sonarRuleset ) ) );

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/apache/maven/plugins/pmd/exec/ExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import java.net.URLClassLoader;

import org.apache.commons.lang3.SystemUtils;
import org.junit.Assert;

import junit.framework.Assert;
import junit.framework.TestCase;

public class ExecutorTest extends TestCase
Expand Down