From eb51d671a22e13f41a843bd57410c26eacf319ba Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Tue, 16 Dec 2014 13:14:14 -0500 Subject: [PATCH] adding test to check if we can resolve parent-poms with -SNAPSHOTs correctly. Test for #1616 --- .../pom-parent-pom/build.sbt | 24 ++++++++++++++++++ .../1.0-SNAPSHOT/_maven.repositories | 4 +++ .../example-child-1.0-SNAPSHOT.jar | Bin 0 -> 1460 bytes .../example-child-1.0-SNAPSHOT.pom | 16 ++++++++++++ .../1.0-SNAPSHOT/maven-metadata-local.xml | 24 ++++++++++++++++++ .../example-child/maven-metadata-local.xml | 11 ++++++++ .../1.0-SNAPSHOT/_maven.repositories | 3 +++ .../example-parent-1.0-SNAPSHOT.pom | 10 ++++++++ .../1.0-SNAPSHOT/maven-metadata-local.xml | 19 ++++++++++++++ .../example-parent/maven-metadata-local.xml | 11 ++++++++ .../dependency-management/pom-parent-pom/test | 2 ++ 11 files changed, 124 insertions(+) create mode 100644 sbt/src/sbt-test/dependency-management/pom-parent-pom/build.sbt create mode 100644 sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/_maven.repositories create mode 100644 sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/example-child-1.0-SNAPSHOT.jar create mode 100644 sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/example-child-1.0-SNAPSHOT.pom create mode 100644 sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/maven-metadata-local.xml create mode 100644 sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/maven-metadata-local.xml create mode 100644 sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/1.0-SNAPSHOT/_maven.repositories create mode 100644 sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/1.0-SNAPSHOT/example-parent-1.0-SNAPSHOT.pom create mode 100644 sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/1.0-SNAPSHOT/maven-metadata-local.xml create mode 100644 sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/maven-metadata-local.xml create mode 100644 sbt/src/sbt-test/dependency-management/pom-parent-pom/test diff --git a/sbt/src/sbt-test/dependency-management/pom-parent-pom/build.sbt b/sbt/src/sbt-test/dependency-management/pom-parent-pom/build.sbt new file mode 100644 index 000000000..673771bf7 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/pom-parent-pom/build.sbt @@ -0,0 +1,24 @@ +name := "test-parent-pom" + +val localMavenRepo = file("local-repo") + val cleanExampleCache = taskKey[Unit]("Cleans the example cache.") + +resolvers += + MavenRepository("Maven2 Local Test", localMavenRepo.toURI.toString) + + +libraryDependencies += + "com.example" % "example-child" % "1.0-SNAPSHOT" + +version := "1.0-SNAPSHOT" + + +cleanExampleCache := { + ivySbt.value.withIvy(streams.value.log) { ivy => + val cacheDir = ivy.getSettings.getDefaultRepositoryCacheBasedir + // TODO - Is this actually ok? + IO.delete(cacheDir / "com.example") + } +} + + diff --git a/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/_maven.repositories b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/_maven.repositories new file mode 100644 index 000000000..461d5e15d --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/_maven.repositories @@ -0,0 +1,4 @@ +#NOTE: This is an internal implementation file, its format can be changed without prior notice. +#Tue Dec 16 09:06:35 EST 2014 +example-child-1.0-SNAPSHOT.jar>= +example-child-1.0-SNAPSHOT.pom>= diff --git a/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/example-child-1.0-SNAPSHOT.jar b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/example-child-1.0-SNAPSHOT.jar new file mode 100644 index 0000000000000000000000000000000000000000..a2a5e09d23a49c1e914ac35a69383622bd285587 GIT binary patch literal 1460 zcmWIWW@h1H0D(&$6I{UzD8UJ&eO*Hwbv^yu^aG&EI2bMhm3bRsgZ*3~+9=KSU$gDb`lo)+nNojal9t?R_W{$xqm6fx}s zDiu5DbO#B02L+eR)mkee!!0z~I7qZc_;k=`pp2JsvDbk|kw=%VbX}<`DX>u_cKwu` z39M;VY#-H@?TOhF!vJ#{rVsd$otB$emYN6m2c}|aOvTChxq7J;iMa(isdzMM;@1c@ zKsPxfGbaUZ3sMXo-lUf`h9K@&T z8(QG$8)jetKMrp&gh=-eCnm6b<)S%M~{)qxwT}nu~Bi*4qy^yWD;S{QrLl$b_2!%S$lpvF9d)=J%MIQS%mV zgFv|p0zj_N0A?06S0EdNp4VW;V$W?bgSRy1lVU71?;(N?d&)zYeh`?uiFP!|bVND~ T@MdKL8N?2Rl0aixnL#`N)>5<_ literal 0 HcmV?d00001 diff --git a/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/example-child-1.0-SNAPSHOT.pom b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/example-child-1.0-SNAPSHOT.pom new file mode 100644 index 000000000..1912aef83 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/example-child-1.0-SNAPSHOT.pom @@ -0,0 +1,16 @@ + + + 4.0.0 + + + com.example + example-parent + 1.0-SNAPSHOT + + + com.example + example-child + 1.0-SNAPSHOT + jar + + diff --git a/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/maven-metadata-local.xml b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/maven-metadata-local.xml new file mode 100644 index 000000000..bbe40373c --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/1.0-SNAPSHOT/maven-metadata-local.xml @@ -0,0 +1,24 @@ + + + com.example + example-child + 1.0-SNAPSHOT + + + true + + 20141216140635 + + + jar + 1.0-SNAPSHOT + 20141216140635 + + + pom + 1.0-SNAPSHOT + 20141216140635 + + + + diff --git a/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/maven-metadata-local.xml b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/maven-metadata-local.xml new file mode 100644 index 000000000..2facbd8e1 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-child/maven-metadata-local.xml @@ -0,0 +1,11 @@ + + + com.example + example-child + + + 1.0-SNAPSHOT + + 20141216140635 + + diff --git a/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/1.0-SNAPSHOT/_maven.repositories b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/1.0-SNAPSHOT/_maven.repositories new file mode 100644 index 000000000..ccab5d80d --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/1.0-SNAPSHOT/_maven.repositories @@ -0,0 +1,3 @@ +#NOTE: This is an internal implementation file, its format can be changed without prior notice. +#Tue Dec 16 09:01:47 EST 2014 +example-parent-1.0-SNAPSHOT.pom>= diff --git a/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/1.0-SNAPSHOT/example-parent-1.0-SNAPSHOT.pom b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/1.0-SNAPSHOT/example-parent-1.0-SNAPSHOT.pom new file mode 100644 index 000000000..364d37255 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/1.0-SNAPSHOT/example-parent-1.0-SNAPSHOT.pom @@ -0,0 +1,10 @@ + + + 4.0.0 + + com.example + example-parent + 1.0-SNAPSHOT + pom + + diff --git a/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/1.0-SNAPSHOT/maven-metadata-local.xml b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/1.0-SNAPSHOT/maven-metadata-local.xml new file mode 100644 index 000000000..4ead096b3 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/1.0-SNAPSHOT/maven-metadata-local.xml @@ -0,0 +1,19 @@ + + + com.example + example-parent + 1.0-SNAPSHOT + + + true + + 20141216140147 + + + pom + 1.0-SNAPSHOT + 20141216140147 + + + + diff --git a/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/maven-metadata-local.xml b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/maven-metadata-local.xml new file mode 100644 index 000000000..7f9f36778 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/pom-parent-pom/local-repo/com/example/example-parent/maven-metadata-local.xml @@ -0,0 +1,11 @@ + + + com.example + example-parent + + + 1.0-SNAPSHOT + + 20141216140147 + + diff --git a/sbt/src/sbt-test/dependency-management/pom-parent-pom/test b/sbt/src/sbt-test/dependency-management/pom-parent-pom/test new file mode 100644 index 000000000..c0f560f2f --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/pom-parent-pom/test @@ -0,0 +1,2 @@ +> cleanExampleCache +> update \ No newline at end of file