This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch MDEP-835 in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 126c0fac26634e0b2618c30d800538b2321d0f21 Author: Slawomir Jaranowski <s.jaranow...@gmail.com> AuthorDate: Sun Jun 2 20:12:28 2024 +0200 [MDEP-835] Add optional dependency for tree IT --- src/it/projects/tree/expected.txt | 50 ++++++++++++++++------ src/it/projects/tree/pom.xml | 10 ++++- src/it/projects/tree/{verify.bsh => verify.groovy} | 20 ++------- 3 files changed, 49 insertions(+), 31 deletions(-) diff --git a/src/it/projects/tree/expected.txt b/src/it/projects/tree/expected.txt index 4f203877..91703010 100644 --- a/src/it/projects/tree/expected.txt +++ b/src/it/projects/tree/expected.txt @@ -1,14 +1,38 @@ org.apache.maven.its.dependency:test:jar:1.0-SNAPSHOT -\- org.apache.maven:maven-project:jar:2.0.6:compile - +- org.apache.maven:maven-settings:jar:2.0.6:compile - +- org.apache.maven:maven-profile:jar:2.0.6:compile - +- org.apache.maven:maven-model:jar:2.0.6:compile - +- org.apache.maven:maven-artifact-manager:jar:2.0.6:compile - | +- org.apache.maven:maven-repository-metadata:jar:2.0.6:compile - | \- org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-2:compile - +- org.apache.maven:maven-plugin-registry:jar:2.0.6:compile - +- org.codehaus.plexus:plexus-utils:jar:1.4.1:compile - +- org.apache.maven:maven-artifact:jar:2.0.6:compile - \- org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile - +- junit:junit:jar:3.8.1:compile - \- classworlds:classworlds:jar:1.1-alpha-2:compile ++- org.apache.maven:maven-core:jar:3.6.3:compile +| +- org.apache.maven:maven-model:jar:3.6.3:compile +| +- org.apache.maven:maven-settings:jar:3.6.3:compile +| +- org.apache.maven:maven-settings-builder:jar:3.6.3:compile +| | +- org.codehaus.plexus:plexus-interpolation:jar:1.25:compile +| | \- org.sonatype.plexus:plexus-sec-dispatcher:jar:1.4:compile +| | \- org.sonatype.plexus:plexus-cipher:jar:1.7:compile +| +- org.apache.maven:maven-builder-support:jar:3.6.3:compile +| +- org.apache.maven:maven-repository-metadata:jar:3.6.3:compile +| +- org.apache.maven:maven-artifact:jar:3.6.3:compile +| +- org.apache.maven:maven-plugin-api:jar:3.6.3:compile +| +- org.apache.maven:maven-model-builder:jar:3.6.3:compile +| +- org.apache.maven:maven-resolver-provider:jar:3.6.3:compile +| | \- org.slf4j:slf4j-api:jar:1.7.29:compile +| +- org.apache.maven.resolver:maven-resolver-impl:jar:1.4.1:compile +| +- org.apache.maven.resolver:maven-resolver-api:jar:1.4.1:compile +| +- org.apache.maven.resolver:maven-resolver-spi:jar:1.4.1:compile +| +- org.apache.maven.resolver:maven-resolver-util:jar:1.4.1:compile +| +- org.apache.maven.shared:maven-shared-utils:jar:3.2.1:compile +| | \- commons-io:commons-io:jar:2.5:compile +| +- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.4:compile +| | \- javax.enterprise:cdi-api:jar:1.0:compile +| | \- javax.annotation:jsr250-api:jar:1.0:compile +| +- org.eclipse.sisu:org.eclipse.sisu.inject:jar:0.3.4:compile +| +- com.google.inject:guice:jar:no_aop:4.2.1:compile +| | +- aopalliance:aopalliance:jar:1.0:compile +| | \- com.google.guava:guava:jar:25.1-android:compile +| | +- com.google.code.findbugs:jsr305:jar:3.0.1:compile +| | +- org.checkerframework:checker-compat-qual:jar:2.0.0:compile +| | +- com.google.errorprone:error_prone_annotations:jar:2.1.3:compile +| | +- com.google.j2objc:j2objc-annotations:jar:1.1:compile +| | \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.14:compile +| +- javax.inject:javax.inject:jar:1:compile +| +- org.codehaus.plexus:plexus-utils:jar:3.2.1:compile +| +- org.codehaus.plexus:plexus-classworlds:jar:2.6.0:compile +| \- org.codehaus.plexus:plexus-component-annotations:jar:2.1.0:compile +\- org.apache.commons:commons-lang3:jar:3.14.0:compile (optional) \ No newline at end of file diff --git a/src/it/projects/tree/pom.xml b/src/it/projects/tree/pom.xml index 30794e64..d18c8ffd 100644 --- a/src/it/projects/tree/pom.xml +++ b/src/it/projects/tree/pom.xml @@ -39,8 +39,14 @@ <dependencies> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.0.6</version> + <artifactId>maven-core</artifactId> + <version>3.6.3</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.14.0</version> + <optional>true</optional> </dependency> </dependencies> diff --git a/src/it/projects/tree/verify.bsh b/src/it/projects/tree/verify.groovy similarity index 63% rename from src/it/projects/tree/verify.bsh rename to src/it/projects/tree/verify.groovy index 39689aba..b79d25ba 100644 --- a/src/it/projects/tree/verify.bsh +++ b/src/it/projects/tree/verify.groovy @@ -17,21 +17,9 @@ * under the License. */ -import java.io.*; +import static org.assertj.core.api.Assertions.assertThat -import org.codehaus.plexus.util.*; +assertThat(new File(basedir, "target/tree.txt")) + .hasSameTextualContentAs(new File(basedir, "expected.txt")) -String actual = FileUtils.fileRead( new File( basedir, "target/tree.txt" ) ); -String expected = FileUtils.fileRead( new File( basedir, "expected.txt" ) ); - -actual = actual.replaceAll( "[\n\r]+", "\n" ); -expected = expected.replaceAll( "[\n\r]+", "\n" ); - -System.out.println( "Checking dependency tree..." ); - -if ( !actual.equals( expected ) ) -{ - throw new Exception( "Unexpected dependency tree" ); -} - -return true; +return true