Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions apache-maven/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">

<edit>${project.scm.url}</edit>
</project>
</site>
6 changes: 3 additions & 3 deletions maven-artifact/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">

<edit>${project.scm.url}</edit>

Expand All @@ -32,4 +32,4 @@ under the License.
<!--item name="FAQ" href="faq.html"/-->
</menu>
</body>
</project>
</site>
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,11 @@ private void checkVersionsEqual(String v1, String v2) {

private void checkVersionsArrayEqual(String[] array) {
// compare against each other (including itself)
for (int i = 0; i < array.length; ++i)
for (int j = i; j < array.length; ++j) checkVersionsEqual(array[i], array[j]);
for (int i = 0; i < array.length; ++i) {
for (int j = i; j < array.length; ++j) {
checkVersionsEqual(array[i], array[j]);
}
}
}

private void checkVersionsOrder(String v1, String v2) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ public void testInvalidRanges() {
checkInvalidRange("(1.1,1.2],[1.0,1.1)");
}

@SuppressWarnings("checkstyle:MethodLength")
public void testIntersections() throws InvalidVersionSpecificationException {
VersionRange range1 = VersionRange.createFromVersionSpec("1.0");
VersionRange range2 = VersionRange.createFromVersionSpec("1.1");
Expand Down
6 changes: 3 additions & 3 deletions maven-builder-support/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">

<edit>${project.scm.url}</edit>

Expand All @@ -32,4 +32,4 @@ under the License.
<!--item name="FAQ" href="faq.html"/-->
</menu>
</body>
</project>
</site>
6 changes: 3 additions & 3 deletions maven-compat/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">

<edit>${project.scm.url}</edit>

Expand All @@ -32,4 +32,4 @@ under the License.
<!--item name="FAQ" href="faq.html"/-->
</menu>
</body>
</project>
</site>
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class MavenArtifactRepositoryTest extends TestCase {
private static class MavenArtifactRepositorySubclass extends MavenArtifactRepository {
String id;

public MavenArtifactRepositorySubclass(String id) {
MavenArtifactRepositorySubclass(String id) {
this.id = id;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ public void testMNG4738() throws Exception {
}

public void testLookup() throws Exception {
ArtifactResolver resolver = lookup(ArtifactResolver.class, "default");
lookup(ArtifactResolver.class, "default");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ private Artifact newArtifact(String scope) {
return new DefaultArtifact("g", "a", "1.0", scope, "jar", "", null);
}

public void testInclude_Compile() {
public void testIncludeCompile() {
ScopeArtifactFilter filter = new ScopeArtifactFilter(Artifact.SCOPE_COMPILE);

assertTrue(filter.include(newArtifact(Artifact.SCOPE_COMPILE)));
Expand All @@ -43,7 +43,7 @@ public void testInclude_Compile() {
assertFalse(filter.include(newArtifact(Artifact.SCOPE_TEST)));
}

public void testInclude_CompilePlusRuntime() {
public void testIncludeCompilePlusRuntime() {
ScopeArtifactFilter filter = new ScopeArtifactFilter(Artifact.SCOPE_COMPILE_PLUS_RUNTIME);

assertTrue(filter.include(newArtifact(Artifact.SCOPE_COMPILE)));
Expand All @@ -53,7 +53,7 @@ public void testInclude_CompilePlusRuntime() {
assertFalse(filter.include(newArtifact(Artifact.SCOPE_TEST)));
}

public void testInclude_Runtime() {
public void testIncludeRuntime() {
ScopeArtifactFilter filter = new ScopeArtifactFilter(Artifact.SCOPE_RUNTIME);

assertTrue(filter.include(newArtifact(Artifact.SCOPE_COMPILE)));
Expand All @@ -63,7 +63,7 @@ public void testInclude_Runtime() {
assertFalse(filter.include(newArtifact(Artifact.SCOPE_TEST)));
}

public void testInclude_RuntimePlusSystem() {
public void testIncludeRuntimePlusSystem() {
ScopeArtifactFilter filter = new ScopeArtifactFilter(Artifact.SCOPE_RUNTIME_PLUS_SYSTEM);

assertTrue(filter.include(newArtifact(Artifact.SCOPE_COMPILE)));
Expand All @@ -73,7 +73,7 @@ public void testInclude_RuntimePlusSystem() {
assertFalse(filter.include(newArtifact(Artifact.SCOPE_TEST)));
}

public void testInclude_Test() {
public void testIncludeTest() {
ScopeArtifactFilter filter = new ScopeArtifactFilter(Artifact.SCOPE_TEST);

assertTrue(filter.include(newArtifact(Artifact.SCOPE_COMPILE)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public List<ArtifactResult> resolveArtifacts(

try {
artifact = artifact.setFile(ProjectClasspathTest.getFileForClasspathResource(
ProjectClasspathTest.dir + "transitive-" + scope + "-dep.xml"));
ProjectClasspathTest.DIR + "transitive-" + scope + "-dep.xml"));
result.setArtifact(artifact);
} catch (FileNotFoundException | URISyntaxException e) {
throw new IllegalStateException("Missing test POM for " + artifact, e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.eclipse.aether.impl.ArtifactResolver;

public class ProjectClasspathTest extends AbstractMavenProjectTestCase {
static final String dir = "projects/scope/";
static final String DIR = "projects/scope/";

public void setUp() throws Exception {
ArtifactResolver resolver = lookup(ArtifactResolver.class, "classpath");
Expand All @@ -49,7 +49,7 @@ protected String getCustomConfigurationName() {
}

public void testProjectClasspath() throws Exception {
File f = getFileForClasspathResource(dir + "project-with-scoped-dependencies.xml");
File f = getFileForClasspathResource(DIR + "project-with-scoped-dependencies.xml");

MavenProject project = getProjectWithDependencies(f);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public ProjectBuildingResult build(Artifact artifact, ProjectBuildingRequest req

try {
artifact.setFile(ProjectClasspathTest.getFileForClasspathResource(
ProjectClasspathTest.dir + "transitive-" + scope + "-dep.xml"));
ProjectClasspathTest.DIR + "transitive-" + scope + "-dep.xml"));
} catch (FileNotFoundException | URISyntaxException e) {
throw new IllegalStateException("Missing test POM for " + artifact);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ public void testProjectInheritance() throws Exception {
System.out.println("Location of project-4's POM: " + pom4.getPath());

// load everything...
MavenProject project0 = getProject(pom0);
MavenProject project1 = getProject(pom1);
MavenProject project2 = getProject(pom2);
MavenProject project3 = getProject(pom3);
getProject(pom0);
getProject(pom1);
getProject(pom2);
getProject(pom3);
MavenProject project4 = getProject(pom4);
MavenProject project5 = getProject(pom5);
getProject(pom5);

assertEquals("p4", project4.getName());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public void testProjectInheritance() throws Exception {
File pom1 = new File(pom0Basedir, "p1/pom.xml");

// load everything...
MavenProject project0 = getProject(pom0);
getProject(pom0);
MavenProject project1 = getProject(pom1);

assertEquals(pom0Basedir, project1.getParent().getBasedir());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public void testDependencyManagementOverridesTransitiveDependencyVersion() throw
File pom1 = new File(pom0Basedir, "p1/pom.xml");

// load the child project, which inherits from p0...
MavenProject project0 = getProjectWithDependencies(pom0);
getProjectWithDependencies(pom0);
MavenProject project1 = getProjectWithDependencies(pom1);

assertEquals(pom0Basedir, project1.getParent().getBasedir());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void testDependencyManagement() throws Exception {
File pom1 = new File(pom0Basedir, "p1/pom.xml");

// load everything...
MavenProject project0 = getProjectWithDependencies(pom0);
getProjectWithDependencies(pom0);
MavenProject project1 = getProjectWithDependencies(pom1);

assertEquals(pom0Basedir, project1.getParent().getBasedir());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void testDependencyManagement() throws Exception {
File pom1 = new File(pom0Basedir, "p1/pom.xml");

// load everything...
MavenProject project0 = getProjectWithDependencies(pom0);
getProjectWithDependencies(pom0);
MavenProject project1 = getProjectWithDependencies(pom1);

assertEquals(pom0Basedir, project1.getParent().getBasedir());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void testDependencyManagement() throws Exception {
File pom1 = new File(pom0Basedir, "p1/pom.xml");

// load everything...
MavenProject project0 = getProjectWithDependencies(pom0);
getProjectWithDependencies(pom0);
MavenProject project1 = getProjectWithDependencies(pom1);

assertEquals(pom0Basedir, project1.getParent().getBasedir());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void testDependencyManagementExclusionsExcludeTransitively() throws Excep
File pom1 = new File(pom0Basedir, "p1/pom.xml");

// load the child project, which inherits from p0...
MavenProject project0 = getProjectWithDependencies(pom0);
getProjectWithDependencies(pom0);
MavenProject project1 = getProjectWithDependencies(pom1);

assertNotNull("Parent is null", project1.getParent());
Expand Down Expand Up @@ -96,7 +96,7 @@ public void testDependencyManagementExclusionDoesNotOverrideGloballyForTransitiv
File pom2 = new File(pom0Basedir, "p2/pom.xml");

// load the child project, which inherits from p0...
MavenProject project0 = getProjectWithDependencies(pom0);
getProjectWithDependencies(pom0);
MavenProject project2 = getProjectWithDependencies(pom2);

assertEquals(pom0Basedir, project2.getParent().getBasedir());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ public void testDependencyManagementOverridesTransitiveDependencyVersion() throw
File pom1 = new File(pom0Basedir, "p1/pom.xml");

// load the child project, which inherits from p0...
MavenProject project0 = getProjectWithDependencies(pom0);
MavenProject project1 = getProjectWithDependencies(pom1);

assertEquals(pom0Basedir, project1.getParent().getBasedir());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ public void testDependencyManagementDoesNotOverrideScopeOfCurrentArtifact() thro
File pom1 = new File(pom0Basedir, "p1/pom.xml");

// load the child project, which inherits from p0...
MavenProject project0 = getProjectWithDependencies(pom0);
MavenProject project1 = getProjectWithDependencies(pom1);

assertEquals(pom0Basedir, project1.getParent().getBasedir());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void testUnnecessaryRepositoryLookup() throws Exception {
wagon.addExpectedContent(repos.get(1).getLayout().pathOf(artifact), "expected");

class TransferListener extends AbstractTransferListener {
public List<TransferEvent> events = new ArrayList<>();
private List<TransferEvent> events = new ArrayList<>();

@Override
public void transferInitiated(TransferEvent transferEvent) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ public void testResolveNearestWithRanges()
public void testResolveRangeWithManagedVersion()
throws ArtifactResolutionException, InvalidVersionSpecificationException {
ArtifactSpec a = createArtifactSpec("a", "1.0");
ArtifactSpec b = a.addDependency("b", "[1.0,3.0]");
a.addDependency("b", "[1.0,3.0]");

ArtifactSpec managedB = createArtifactSpec("b", "5.0");

Expand Down Expand Up @@ -680,10 +680,10 @@ public void testOverConstrainedVersionException()
ArtifactSpec b = createArtifactSpec("b", "1.0.0");
b.addDependency("c", "3.3.0-v3346");

ArtifactSpec c = createArtifactSpec("c", "3.2.1-v3235e");
// ArtifactSpec c = createArtifactSpec("c", "3.2.1-v3235e");

try {
ArtifactResolutionResult res = collect(createSet(new Object[] {a.artifact}));
collect(createSet(new Object[] {a.artifact}));
} catch (OverConstrainedVersionException e) {
assertTrue("Versions unordered", e.getMessage().contains("[3.2.1-v3235e, 3.3.0-v3346]"));
assertTrue("DependencyTrail unresolved", e.getMessage().contains("Path to dependency:"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ protected Artifact createArtifact(String id, String version, String scope, Strin
GROUP_ID, id, versionRange, "jar", null, scope, inheritedScope, optional);
}

protected ResolutionNode createResolutionNode(Artifact Artifact) {
return new ResolutionNode(Artifact, Collections.<ArtifactRepository>emptyList());
protected ResolutionNode createResolutionNode(Artifact artifact) {
return new ResolutionNode(artifact, Collections.<ArtifactRepository>emptyList());
}

protected ResolutionNode createResolutionNode(Artifact Artifact, ResolutionNode parent) {
return new ResolutionNode(Artifact, Collections.<ArtifactRepository>emptyList(), parent);
protected ResolutionNode createResolutionNode(Artifact artifact, ResolutionNode parent) {
return new ResolutionNode(artifact, Collections.<ArtifactRepository>emptyList(), parent);
}
}
6 changes: 3 additions & 3 deletions maven-core/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">

<edit>${project.scm.url}</edit>

Expand All @@ -36,4 +36,4 @@ under the License.
<item name="Core Extensions" href="core-extensions.html"/>
</menu>
</body>
</project>
</site>
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void testEnsureResolverSessionHasMavenWorkspaceReader() throws Exception
MavenExecutionRequest request =
createMavenExecutionRequest(getProject("simple")).setGoals(asList("validate"));

MavenExecutionResult result = maven.execute(request);
maven.execute(request);

Class<?> wsrClass = wsrClassCatcher.wsrClassRef.get();
assertTrue("is null", wsrClass != null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,8 @@
* @author Kristian Rosenvold
*/
public class LifecycleTaskSegmentCalculatorStub extends DefaultLifecycleTaskSegmentCalculator {
public static final String clean = "clean";

public static final String aggr = "aggr";

public static final String install = "install";
public static final String AGGR = "aggr";

public List<TaskSegment> calculateTaskSegments(MavenSession session, List<String> tasks)
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
Expand All @@ -53,7 +50,7 @@ public List<TaskSegment> calculateTaskSegments(MavenSession session, List<String
TaskSegment currentSegment = null;

for (String task : tasks) {
if (aggr.equals(task)) {
if (AGGR.equals(task)) {
boolean aggregating = true;

if (currentSegment == null || currentSegment.isAggregating() != aggregating) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
*/
public class MojoExecutorStub extends MojoExecutor { // This is being lazy instead of making interface

public List<MojoExecution> executions = Collections.synchronizedList(new ArrayList<MojoExecution>());
private final List<MojoExecution> executions = Collections.synchronizedList(new ArrayList<MojoExecution>());

@Override
public void execute(MavenSession session, List<MojoExecution> mojoExecutions, ProjectIndex projectIndex)
Expand Down
Loading
Loading