diff --git a/core/shared/src/main/scala/coursier/core/Resolution.scala b/core/shared/src/main/scala/coursier/core/Resolution.scala index 8daaa7f4a..aa1de0772 100644 --- a/core/shared/src/main/scala/coursier/core/Resolution.scala +++ b/core/shared/src/main/scala/coursier/core/Resolution.scala @@ -379,7 +379,10 @@ object Resolution { Seq( "project.parent.groupId" -> parModule.organization, "project.parent.artifactId" -> parModule.name, - "project.parent.version" -> parVersion + "project.parent.version" -> parVersion, + "parent.groupId" -> parModule.organization, + "parent.artifactId" -> parModule.name, + "parent.version" -> parVersion ) } diff --git a/tests/metadata b/tests/metadata index bd9dc9a92..ed446075a 160000 --- a/tests/metadata +++ b/tests/metadata @@ -1 +1 @@ -Subproject commit bd9dc9a927e1c86f96b355309a9d0d59a4735291 +Subproject commit ed446075ace7914af71a39ac7b00f17fa5d9190b diff --git a/tests/shared/src/test/resources/resolutions/io.swagger.parser.v3/swagger-parser-v3/2.0.1 b/tests/shared/src/test/resources/resolutions/io.swagger.parser.v3/swagger-parser-v3/2.0.1 new file mode 100644 index 000000000..e1c8124c2 --- /dev/null +++ b/tests/shared/src/test/resources/resolutions/io.swagger.parser.v3/swagger-parser-v3/2.0.1 @@ -0,0 +1,15 @@ +com.fasterxml.jackson.core:jackson-annotations:2.9.5:compile +com.fasterxml.jackson.core:jackson-core:2.9.5:compile +com.fasterxml.jackson.core:jackson-databind:2.9.5:compile +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.5:compile +commons-io:commons-io:2.4:compile +io.swagger.core.v3:swagger-annotations:2.0.1:compile +io.swagger.core.v3:swagger-core:2.0.1:compile +io.swagger.core.v3:swagger-models:2.0.1:compile +io.swagger.parser.v3:swagger-parser-core:2.0.1:compile +io.swagger.parser.v3:swagger-parser-v3:2.0.1:compile +javax.validation:validation-api:1.1.0.Final:compile +javax.xml.bind:jaxb-api:2.3.0:compile +org.apache.commons:commons-lang3:3.7:compile +org.slf4j:slf4j-api:1.7.25:compile +org.yaml:snakeyaml:1.18:compile \ No newline at end of file diff --git a/tests/shared/src/test/scala/coursier/test/CentralTests.scala b/tests/shared/src/test/scala/coursier/test/CentralTests.scala index 970004948..30de96a15 100644 --- a/tests/shared/src/test/scala/coursier/test/CentralTests.scala +++ b/tests/shared/src/test/scala/coursier/test/CentralTests.scala @@ -790,8 +790,15 @@ abstract class CentralTests extends TestSuite { ) } + 'parentVersionInPom - { + resolutionCheck( + Module("io.swagger.parser.v3", "swagger-parser-v3"), + "2.0.1" + ) + } + 'parentBeforeImports - { - * - resolutionCheck( + resolutionCheck( Module("org.kie", "kie-api"), "6.5.0.Final", extraRepos = Seq(MavenRepository("https://repository.jboss.org/nexus/content/repositories/public")) diff --git a/tests/shared/src/test/scala/coursier/test/package.scala b/tests/shared/src/test/scala/coursier/test/package.scala index 302ae7eb2..9ed9fc479 100644 --- a/tests/shared/src/test/scala/coursier/test/package.scala +++ b/tests/shared/src/test/scala/coursier/test/package.scala @@ -19,7 +19,10 @@ package object test { "project.packaging", "project.parent.groupId", "project.parent.artifactId", - "project.parent.version" + "project.parent.version", + "parent.groupId", + "parent.artifactId", + "parent.version" ) implicit class ResolutionOps(val underlying: Resolution) extends AnyVal {