Skip to content

Commit

Permalink
[MNG-4463] Dependency management import should support version ranges
Browse files Browse the repository at this point in the history 
This closes apache#28
  • Loading branch information
@ChristianSchulte @michael-o
ChristianSchulte authored and michael-o committed Sep 18, 2021
1 parent f1c00d9 commit d066437
Show file tree
Hide file tree
Showing 5 changed files with 318 additions and 0 deletions.
1 change: 1 addition & 0 deletions its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ public static Test suite()
// Tests that don't run stable and need to be fixed
// -------------------------------------------------------------------------------------------------------------
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
suite.addTestSuite( MavenITmng4463DependencyManagementImportVersionRanges.class );
suite.addTestSuite( MavenITmng7112ProjectsWithNonRecursiveTest.class );
suite.addTestSuite( MavenITmng7128BlockExternalHttpReactorTest.class );
suite.addTestSuite( MavenITmng6511OptionalProjectSelectionTest.class );
Expand Down
111 changes: 111 additions & 0 deletions .../test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.maven.it;

import java.io.File;
import java.util.List;
import java.util.regex.Pattern;
import org.apache.maven.it.util.ResourceExtractor;
import static junit.framework.Assert.assertTrue;

/**
* Integration tests for <a href="https://issues.apache.org/jira/browse/MNG-4463">MNG-4463</a>.
*
* @author Christian Schulte
*/
public class MavenITmng4463DependencyManagementImportVersionRanges
extends AbstractMavenIntegrationTestCase
{

public MavenITmng4463DependencyManagementImportVersionRanges()
{
super( "[4.0.0-alpha-1,)" );
}

public void testInclusiveUpperBoundResolvesToHighestVersion()
throws Exception
{
final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4463/inclusive-upper-bound" );
final Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

final List<String> artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven:maven-plugin-api:jar:3.0" ) );
}

public void testExclusiveUpperBoundResolvesToHighestVersion()
throws Exception
{
final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4463/exclusive-upper-bound" );
final Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

List<String> artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven:maven-plugin-api:jar:3.0" ) );
}

public void testFailureWithoutUpperBound()
throws Exception
{
final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4463/no-upper-bound" );
final Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );

try
{
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
fail( "Expected 'VerificationException' not thrown." );
}
catch ( final VerificationException e )
{
final List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
assertTrue( "Expected error message not found.",
indexOf( lines, ".*dependency version range.*does not specify an upper bound.*" ) >= 0 );
}
finally
{
verifier.resetStreams();
}
}

private static int indexOf( final List<String> logLines, final String regex )
{
final Pattern pattern = Pattern.compile( regex );

for ( int i = 0, l0 = logLines.size(); i < l0; i++ )
{
if ( pattern.matcher( logLines.get( i ) ).matches() )
{
return i;
}
}

return -1;
}

}
76 changes: 76 additions & 0 deletions its/core-it-suite/src/test/resources/mng-4463/exclusive-upper-bound/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->

<project>
<modelVersion>4.0.0</modelVersion>

<groupId>org.apache.maven.its.mng4463</groupId>
<artifactId>test</artifactId>
<version>1.0</version>
<packaging>jar</packaging>

<name>Maven Integration Test :: MNG-4463</name>
<description>
Tests that importing dependency management using version ranges
with exclusive upper bound resolves to the highest version.
</description>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>(,3.0.1)</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-dependency-resolution</artifactId>
<version>2.1-SNAPSHOT</version>
<configuration>
<compileArtifacts>target/compile.txt</compileArtifacts>
</configuration>
<executions>
<execution>
<id>test</id>
<phase>validate</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
76 changes: 76 additions & 0 deletions its/core-it-suite/src/test/resources/mng-4463/inclusive-upper-bound/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->

<project>
<modelVersion>4.0.0</modelVersion>

<groupId>org.apache.maven.its.mng4463</groupId>
<artifactId>test</artifactId>
<version>1.0</version>
<packaging>jar</packaging>

<name>Maven Integration Test :: MNG-4463</name>
<description>
Tests that importing dependency management using version ranges
with inclusive upper bound resolves to the highest version.
</description>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>(,3.0]</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-dependency-resolution</artifactId>
<version>2.1-SNAPSHOT</version>
<configuration>
<compileArtifacts>target/compile.txt</compileArtifacts>
</configuration>
<executions>
<execution>
<id>test</id>
<phase>validate</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
54 changes: 54 additions & 0 deletions its/core-it-suite/src/test/resources/mng-4463/no-upper-bound/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->

<project>
<modelVersion>4.0.0</modelVersion>

<groupId>org.apache.maven.its.mng4463</groupId>
<artifactId>test</artifactId>
<version>1.0</version>
<packaging>jar</packaging>

<name>Maven Integration Test :: MNG-4463</name>
<description>
Tests that importing dependency management using version ranges
without upper bound fails.
</description>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>(3.0,)</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
</dependencies>
</project>

0 comments on commit d066437

Please sign in to comment.