From aba9f6e8662e0d6b22b5789487d9bdbb9da1514a Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 5 Aug 2019 12:24:02 +0200 Subject: [PATCH 1/3] Pass classpath order parameter around From CLI options to API. --- .../src/main/scala/coursier/cli/app/AppArtifacts.scala | 3 ++- .../main/scala/coursier/cli/bootstrap/Bootstrap.scala | 3 ++- .../cli/src/main/scala/coursier/cli/launch/Launch.scala | 9 ++++++--- .../coursier/jvm/src/main/scala/coursier/Artifacts.scala | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/cli/src/main/scala/coursier/cli/app/AppArtifacts.scala b/modules/cli/src/main/scala/coursier/cli/app/AppArtifacts.scala index 9d4a05d96b..8ead5da8e5 100644 --- a/modules/cli/src/main/scala/coursier/cli/app/AppArtifacts.scala +++ b/modules/cli/src/main/scala/coursier/cli/app/AppArtifacts.scala @@ -83,7 +83,8 @@ object AppArtifacts { subRes, desc.classifiers, Some(desc.mainArtifacts), - Some(desc.artifactTypes) + Some(desc.artifactTypes), + classpathOrder = true ).map(_._3) l.map { a => val f = artifactMap.get(a) match { diff --git a/modules/cli/src/main/scala/coursier/cli/bootstrap/Bootstrap.scala b/modules/cli/src/main/scala/coursier/cli/bootstrap/Bootstrap.scala index 40f8a94278..c3ee4e8c8c 100644 --- a/modules/cli/src/main/scala/coursier/cli/bootstrap/Bootstrap.scala +++ b/modules/cli/src/main/scala/coursier/cli/bootstrap/Bootstrap.scala @@ -221,7 +221,8 @@ object Bootstrap extends CaseApp[BootstrapOptions] { subRes, params.sharedLaunch.artifact.classifiers, Option(params.sharedLaunch.artifact.mainArtifacts).map(x => x), - Option(params.sharedLaunch.artifact.artifactTypes) + Option(params.sharedLaunch.artifact.artifactTypes), + params.sharedLaunch.resolve.classpathOrder ).map(_._3) val m0 = m.filter(a => !done(a.url)).map(a => a.url -> artifacts.getOrElse(a, sys.error("should not happen"))) diff --git a/modules/cli/src/main/scala/coursier/cli/launch/Launch.scala b/modules/cli/src/main/scala/coursier/cli/launch/Launch.scala index 91df13170c..7d464e3d2b 100644 --- a/modules/cli/src/main/scala/coursier/cli/launch/Launch.scala +++ b/modules/cli/src/main/scala/coursier/cli/launch/Launch.scala @@ -200,7 +200,8 @@ object Launch extends CaseApp[LaunchOptions] { files: Seq[(Artifact, File)], sharedLoaderParams: SharedLoaderParams, artifactParams: ArtifactParams, - extraJars: Seq[File] + extraJars: Seq[File], + classpathOrder: Boolean ): Seq[(Option[String], Array[File])] = { val fileMap = files.toMap val alreadyAdded = Set.empty[File] // unused??? @@ -211,7 +212,8 @@ object Launch extends CaseApp[LaunchOptions] { subRes, artifactParams.classifiers, Option(artifactParams.mainArtifacts).map(x => x), - Option(artifactParams.artifactTypes) + Option(artifactParams.artifactTypes), + classpathOrder ).map(_._3) val files0 = artifacts .map(a => fileMap.getOrElse(a, sys.error("should not happen"))) @@ -314,7 +316,8 @@ object Launch extends CaseApp[LaunchOptions] { files, params.shared.sharedLoader, params.shared.artifact, - params.shared.extraJars.map(_.toFile) + params.shared.extraJars.map(_.toFile), + params.shared.resolve.classpathOrder ) val jcp = diff --git a/modules/coursier/jvm/src/main/scala/coursier/Artifacts.scala b/modules/coursier/jvm/src/main/scala/coursier/Artifacts.scala index 648310b0a4..62bc427385 100644 --- a/modules/coursier/jvm/src/main/scala/coursier/Artifacts.scala +++ b/modules/coursier/jvm/src/main/scala/coursier/Artifacts.scala @@ -272,7 +272,7 @@ object Artifacts { classifiers: Set[Classifier], mainArtifactsOpt: Option[Boolean], artifactTypesOpt: Option[Set[Type]], - classpathOrder: Boolean = false + classpathOrder: Boolean ): Seq[(Dependency, Publication, Artifact)] = { val mainArtifacts0 = mainArtifactsOpt.getOrElse(classifiers.isEmpty) From 1b82736fd156f9290805ba104bc74f6c89019624 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 5 Aug 2019 13:14:28 +0200 Subject: [PATCH 2/3] Adjust default config in tests Same one as via the API or the CLI. Makes it easier to compare results / debug things. --- .../main/scala/coursier/core/Resolution.scala | 4 +- .../src/test/scala/coursier/TestHelpers.scala | 8 +- modules/tests/metadata | 2 +- .../extensions/1.0.0-alpha3 | 20 +- .../resolutions/bouncycastle/bctsp-jdk14/138 | 8 +- .../resolutions/cc.factorie/factorie_2.11/1.2 | 52 ++-- .../com.chuusai/shapeless_2.11/2.2.+ | 4 +- .../com.chuusai/shapeless_2.11/[2.2.0,2.3-a1) | 4 +- .../argonaut-shapeless_6.1_2.11/0.2.0 | 20 +- .../com.github.fommil.netlib/all/1.1.2 | 36 +-- .../libphonenumber/7.0.+ | 2 +- .../libphonenumber/[7.0,7.1) | 2 +- .../jnaerator-runtime/0.12 | 6 +- .../dk.brics.automaton/automaton/1.11-8 | 2 +- .../illinois-pos/2.0.2_compile | 9 +- .../coursier-cli_2.12/1.1.0-M10 | 38 +-- .../resolutions/io.grpc/grpc-netty/0.14.1 | 24 +- .../resolutions/io.monix/monix_2.12/2.3.0 | 16 +- .../swagger-parser-v3/2.0.1 | 30 +- .../org.apache.commons/commons-io/1.3.2 | 4 +- .../shared-ldap/0.9.19 | 16 +- .../org.apache.maven/apache-maven/3.3.9 | 88 +++--- .../org.apache.spark/spark-core_2.10/2.1.1 | 272 +++++++++--------- .../org.apache.spark/spark-core_2.11/1.3.1 | 230 +++++++-------- .../resolutions/org.apache.tika/tika-app/1.13 | 216 +++++++------- .../org.apache.ws.commons/XmlSchema/1.1 | 4 +- .../opencv/3.0.0-1.1 | 4 +- .../org.codehaus.plexus/plexus/1.0.4 | 2 +- .../resolutions/org.datavec/datavec-api/0.9.1 | 54 ++-- .../deeplearning4j-core/0.8.0 | 118 ++++---- .../org.drools/drools-compiler/7.0.0.Final | 26 +- .../sbtVersion_0.13_scalaVersion_2.10/1.12.+ | 18 +- .../jersey-client/2.19 | 26 +- .../resteasy-jaxrs/3.0.9.Final | 20 +- .../org.jitsi/jitsi-videobridge/1.0-SNAPSHOT | 189 ++++++------ .../resolutions/org.kie/kie-api/6.5.0.Final | 4 +- .../resolutions/org.nd4j/nd4j-native/0.5.0 | 34 +-- .../org.scala-lang/scala-compiler/2.11.8 | 10 +- .../scala-compiler/2.11.8_optional | 10 +- .../org.talend.daikon/daikon/0.19.0-SNAPSHOT | 34 +-- .../resolutions/org.webjars.bower/dgrid/1.0.0 | 6 +- .../malihu-custom-scrollbar-plugin/3.1.5 | 6 +- .../resolutions/org.yaml/snakeyaml/1.17 | 2 +- .../test/scala/coursier/test/TestRunner.scala | 9 +- .../test/scala/coursier/test/package.scala | 2 +- 45 files changed, 845 insertions(+), 846 deletions(-) diff --git a/modules/core/shared/src/main/scala/coursier/core/Resolution.scala b/modules/core/shared/src/main/scala/coursier/core/Resolution.scala index 6355e7cbe5..673bd7a858 100644 --- a/modules/core/shared/src/main/scala/coursier/core/Resolution.scala +++ b/modules/core/shared/src/main/scala/coursier/core/Resolution.scala @@ -677,7 +677,7 @@ object Resolution { mapDependencies, extraProperties, forceProperties, - Configuration.compile + Configuration.defaultCompile ) def apply(): Resolution = @@ -697,7 +697,7 @@ object Resolution { None, Nil, Map.empty, - Configuration.compile + Configuration.defaultCompile ) private def fallbackConfigIfNecessary(dep: Dependency, configs: Set[Configuration]): Dependency = diff --git a/modules/coursier/shared/src/test/scala/coursier/TestHelpers.scala b/modules/coursier/shared/src/test/scala/coursier/TestHelpers.scala index 8e6537ba64..9dc0bb0a72 100644 --- a/modules/coursier/shared/src/test/scala/coursier/TestHelpers.scala +++ b/modules/coursier/shared/src/test/scala/coursier/TestHelpers.scala @@ -96,13 +96,7 @@ object TestHelpers extends PlatformTestHelpers { maybeWriteTextResource(path, result0.mkString("\n")) tryRead } - ).split('\n').toSeq.map { s => - // hack not to have to edit / review lots of test fixtures - if (s.endsWith(":compile")) - s.stripSuffix(":compile") + ":default" - else - s - }.filter(_.nonEmpty) + ).split('\n').toSeq.filter(_.nonEmpty) for (((e, r), idx) <- expected.zip(result0).zipWithIndex if e != r) println(s"Line ${idx + 1}:\n expected: $e\n got: $r") diff --git a/modules/tests/metadata b/modules/tests/metadata index 5d1d9a78a8..ce90f3559c 160000 --- a/modules/tests/metadata +++ b/modules/tests/metadata @@ -1 +1 @@ -Subproject commit 5d1d9a78a8b578d0dafe31c4ddb7438c32bcbad5 +Subproject commit ce90f3559c3986b8d08b0c5b514e5617e2033f9f diff --git a/modules/tests/shared/src/test/resources/resolutions/android.arch.lifecycle/extensions/1.0.0-alpha3 b/modules/tests/shared/src/test/resources/resolutions/android.arch.lifecycle/extensions/1.0.0-alpha3 index 4438340beb..b8c7404ae2 100644 --- a/modules/tests/shared/src/test/resources/resolutions/android.arch.lifecycle/extensions/1.0.0-alpha3 +++ b/modules/tests/shared/src/test/resources/resolutions/android.arch.lifecycle/extensions/1.0.0-alpha3 @@ -1,10 +1,10 @@ -com.android.support:support-annotations:25.3.1:compile -android.arch.lifecycle:common:1.0.0-alpha3:compile -android.arch.core:core:1.0.0-alpha3:compile -android.arch.lifecycle:runtime:1.0.0-alpha3:compile -com.android.support:support-compat:25.3.1:compile -com.android.support:support-media-compat:25.3.1:compile -com.android.support:support-core-ui:25.3.1:compile -com.android.support:support-core-utils:25.3.1:compile -com.android.support:support-fragment:25.3.1:compile -android.arch.lifecycle:extensions:1.0.0-alpha3:compile \ No newline at end of file +com.android.support:support-annotations:25.3.1:default +android.arch.lifecycle:common:1.0.0-alpha3:default +android.arch.core:core:1.0.0-alpha3:default +android.arch.lifecycle:runtime:1.0.0-alpha3:default +com.android.support:support-compat:25.3.1:default +com.android.support:support-media-compat:25.3.1:default +com.android.support:support-core-ui:25.3.1:default +com.android.support:support-core-utils:25.3.1:default +com.android.support:support-fragment:25.3.1:default +android.arch.lifecycle:extensions:1.0.0-alpha3:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/bouncycastle/bctsp-jdk14/138 b/modules/tests/shared/src/test/resources/resolutions/bouncycastle/bctsp-jdk14/138 index a3ad235ceb..fd473e42a3 100644 --- a/modules/tests/shared/src/test/resources/resolutions/bouncycastle/bctsp-jdk14/138 +++ b/modules/tests/shared/src/test/resources/resolutions/bouncycastle/bctsp-jdk14/138 @@ -1,4 +1,4 @@ -org.bouncycastle:bcprov-jdk14:1.38:compile -org.bouncycastle:bcmail-jdk14:1.38:compile -org.bouncycastle:bctsp-jdk14:1.38:compile -bouncycastle:bctsp-jdk14:138:compile \ No newline at end of file +org.bouncycastle:bcprov-jdk14:1.38:default +org.bouncycastle:bcmail-jdk14:1.38:default +org.bouncycastle:bctsp-jdk14:1.38:default +bouncycastle:bctsp-jdk14:138:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/cc.factorie/factorie_2.11/1.2 b/modules/tests/shared/src/test/resources/resolutions/cc.factorie/factorie_2.11/1.2 index c75b21517d..e1c543e8e3 100644 --- a/modules/tests/shared/src/test/resources/resolutions/cc.factorie/factorie_2.11/1.2 +++ b/modules/tests/shared/src/test/resources/resolutions/cc.factorie/factorie_2.11/1.2 @@ -1,26 +1,26 @@ -org.scala-lang:scala-library:2.11.7:compile -org.scala-lang:scala-reflect:2.11.7:compile -org.scala-lang.modules:scala-xml_2.11:1.0.4:compile -org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4:compile -org.scala-lang:scala-compiler:2.11.7:compile -org.tukaani:xz:1.5:compile -org.apache.commons:commons-compress:1.8:compile -commons-lang:commons-lang:2.6:compile -org.xerial.snappy:snappy-java:1.1.1.3:compile -commons-logging:commons-logging:1.0.4:compile -commons-codec:commons-codec:1.2:compile -commons-httpclient:commons-httpclient:3.1:compile -info.bliki.wiki:bliki-core:3.0.19:compile -org.mongodb:mongo-java-driver:2.12.3:compile -org.json4s:json4s-ast_2.11:3.2.9:compile -com.thoughtworks.paranamer:paranamer:2.6:compile -org.scala-lang:scalap:2.11.0:compile -org.json4s:json4s-core_2.11:3.2.9:compile -com.fasterxml.jackson.core:jackson-annotations:2.3.0:compile -com.fasterxml.jackson.core:jackson-core:2.3.1:compile -com.fasterxml.jackson.core:jackson-databind:2.3.1:compile -org.json4s:json4s-jackson_2.11:3.2.9:compile -org.jblas:jblas:1.2.3:compile -com.google.code.findbugs:jsr305:1.3.9:compile -com.google.guava:guava:12.0:compile -cc.factorie:factorie_2.11:1.2:compile \ No newline at end of file +org.scala-lang:scala-library:2.11.7:default +org.scala-lang:scala-reflect:2.11.7:default +org.scala-lang.modules:scala-xml_2.11:1.0.4:default +org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4:default +org.scala-lang:scala-compiler:2.11.7:default +org.tukaani:xz:1.5:default +org.apache.commons:commons-compress:1.8:default +commons-lang:commons-lang:2.6:default +org.xerial.snappy:snappy-java:1.1.1.3:default +commons-logging:commons-logging:1.0.4:default +commons-codec:commons-codec:1.2:default +commons-httpclient:commons-httpclient:3.1:default +info.bliki.wiki:bliki-core:3.0.19:default +org.mongodb:mongo-java-driver:2.12.3:default +org.json4s:json4s-ast_2.11:3.2.9:default +com.thoughtworks.paranamer:paranamer:2.6:default +org.scala-lang:scalap:2.11.0:default +org.json4s:json4s-core_2.11:3.2.9:default +com.fasterxml.jackson.core:jackson-annotations:2.3.0:default +com.fasterxml.jackson.core:jackson-core:2.3.1:default +com.fasterxml.jackson.core:jackson-databind:2.3.1:default +org.json4s:json4s-jackson_2.11:3.2.9:default +org.jblas:jblas:1.2.3:default +com.google.code.findbugs:jsr305:1.3.9:default +com.google.guava:guava:12.0:default +cc.factorie:factorie_2.11:1.2:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/com.chuusai/shapeless_2.11/2.2.+ b/modules/tests/shared/src/test/resources/resolutions/com.chuusai/shapeless_2.11/2.2.+ index 1fec003250..3d68daa413 100644 --- a/modules/tests/shared/src/test/resources/resolutions/com.chuusai/shapeless_2.11/2.2.+ +++ b/modules/tests/shared/src/test/resources/resolutions/com.chuusai/shapeless_2.11/2.2.+ @@ -1,2 +1,2 @@ -org.scala-lang:scala-library:2.11.7:compile -com.chuusai:shapeless_2.11:2.2.5:compile \ No newline at end of file +org.scala-lang:scala-library:2.11.7:default +com.chuusai:shapeless_2.11:2.2.5:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/com.chuusai/shapeless_2.11/[2.2.0,2.3-a1) b/modules/tests/shared/src/test/resources/resolutions/com.chuusai/shapeless_2.11/[2.2.0,2.3-a1) index 1fec003250..3d68daa413 100644 --- a/modules/tests/shared/src/test/resources/resolutions/com.chuusai/shapeless_2.11/[2.2.0,2.3-a1) +++ b/modules/tests/shared/src/test/resources/resolutions/com.chuusai/shapeless_2.11/[2.2.0,2.3-a1) @@ -1,2 +1,2 @@ -org.scala-lang:scala-library:2.11.7:compile -com.chuusai:shapeless_2.11:2.2.5:compile \ No newline at end of file +org.scala-lang:scala-library:2.11.7:default +com.chuusai:shapeless_2.11:2.2.5:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0 b/modules/tests/shared/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0 index 0914e5a304..8283763ca3 100644 --- a/modules/tests/shared/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0 +++ b/modules/tests/shared/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0 @@ -1,10 +1,10 @@ -org.scala-lang:scala-library:2.11.6:compile -org.scala-lang.modules:scala-parser-combinators_2.11:1.0.2:compile -org.scala-lang.modules:scala-xml_2.11:1.0.2:compile -org.scalaz:scalaz-core_2.11:7.1.1:compile -com.github.julien-truffaut:monocle-core_2.11:1.1.0:compile -org.scala-lang:scala-reflect:2.11.6:compile -com.github.julien-truffaut:monocle-macro_2.11:1.1.0:compile -io.argonaut:argonaut_2.11:6.1:compile -com.chuusai:shapeless_2.11:2.2.0:compile -com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0:compile \ No newline at end of file +org.scala-lang:scala-library:2.11.6:default +org.scala-lang.modules:scala-parser-combinators_2.11:1.0.2:default +org.scala-lang.modules:scala-xml_2.11:1.0.2:default +org.scalaz:scalaz-core_2.11:7.1.1:default +com.github.julien-truffaut:monocle-core_2.11:1.1.0:default +org.scala-lang:scala-reflect:2.11.6:default +com.github.julien-truffaut:monocle-macro_2.11:1.1.0:default +io.argonaut:argonaut_2.11:6.1:default +com.chuusai:shapeless_2.11:2.2.0:default +com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/com.github.fommil.netlib/all/1.1.2 b/modules/tests/shared/src/test/resources/resolutions/com.github.fommil.netlib/all/1.1.2 index 1d52e91feb..6dec97eb51 100644 --- a/modules/tests/shared/src/test/resources/resolutions/com.github.fommil.netlib/all/1.1.2 +++ b/modules/tests/shared/src/test/resources/resolutions/com.github.fommil.netlib/all/1.1.2 @@ -1,18 +1,18 @@ -net.sourceforge.f2j:arpack_combined_all:0.1:compile -com.github.fommil.netlib:core:1.1.2:compile -com.github.fommil:jniloader:1.1:compile -com.github.fommil.netlib:native_ref-java:1.1:compile -com.github.fommil.netlib:netlib-native_ref-osx-x86_64:1.1:compile -com.github.fommil.netlib:netlib-native_ref-linux-x86_64:1.1:compile -com.github.fommil.netlib:netlib-native_ref-linux-i686:1.1:compile -com.github.fommil.netlib:netlib-native_ref-win-x86_64:1.1:compile -com.github.fommil.netlib:netlib-native_ref-win-i686:1.1:compile -com.github.fommil.netlib:netlib-native_ref-linux-armhf:1.1:compile -com.github.fommil.netlib:native_system-java:1.1:compile -com.github.fommil.netlib:netlib-native_system-osx-x86_64:1.1:compile -com.github.fommil.netlib:netlib-native_system-linux-x86_64:1.1:compile -com.github.fommil.netlib:netlib-native_system-linux-i686:1.1:compile -com.github.fommil.netlib:netlib-native_system-linux-armhf:1.1:compile -com.github.fommil.netlib:netlib-native_system-win-x86_64:1.1:compile -com.github.fommil.netlib:netlib-native_system-win-i686:1.1:compile -com.github.fommil.netlib:all:1.1.2:compile \ No newline at end of file +net.sourceforge.f2j:arpack_combined_all:0.1:default +com.github.fommil.netlib:core:1.1.2:default +com.github.fommil:jniloader:1.1:default +com.github.fommil.netlib:native_ref-java:1.1:default +com.github.fommil.netlib:netlib-native_ref-osx-x86_64:1.1:default +com.github.fommil.netlib:netlib-native_ref-linux-x86_64:1.1:default +com.github.fommil.netlib:netlib-native_ref-linux-i686:1.1:default +com.github.fommil.netlib:netlib-native_ref-win-x86_64:1.1:default +com.github.fommil.netlib:netlib-native_ref-win-i686:1.1:default +com.github.fommil.netlib:netlib-native_ref-linux-armhf:1.1:default +com.github.fommil.netlib:native_system-java:1.1:default +com.github.fommil.netlib:netlib-native_system-osx-x86_64:1.1:default +com.github.fommil.netlib:netlib-native_system-linux-x86_64:1.1:default +com.github.fommil.netlib:netlib-native_system-linux-i686:1.1:default +com.github.fommil.netlib:netlib-native_system-linux-armhf:1.1:default +com.github.fommil.netlib:netlib-native_system-win-x86_64:1.1:default +com.github.fommil.netlib:netlib-native_system-win-i686:1.1:default +com.github.fommil.netlib:all:1.1.2:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/com.googlecode.libphonenumber/libphonenumber/7.0.+ b/modules/tests/shared/src/test/resources/resolutions/com.googlecode.libphonenumber/libphonenumber/7.0.+ index 61da55d469..ae8ac9fcf1 100644 --- a/modules/tests/shared/src/test/resources/resolutions/com.googlecode.libphonenumber/libphonenumber/7.0.+ +++ b/modules/tests/shared/src/test/resources/resolutions/com.googlecode.libphonenumber/libphonenumber/7.0.+ @@ -1 +1 @@ -com.googlecode.libphonenumber:libphonenumber:7.0.11:compile \ No newline at end of file +com.googlecode.libphonenumber:libphonenumber:7.0.11:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/com.googlecode.libphonenumber/libphonenumber/[7.0,7.1) b/modules/tests/shared/src/test/resources/resolutions/com.googlecode.libphonenumber/libphonenumber/[7.0,7.1) index 61da55d469..ae8ac9fcf1 100644 --- a/modules/tests/shared/src/test/resources/resolutions/com.googlecode.libphonenumber/libphonenumber/[7.0,7.1) +++ b/modules/tests/shared/src/test/resources/resolutions/com.googlecode.libphonenumber/libphonenumber/[7.0,7.1) @@ -1 +1 @@ -com.googlecode.libphonenumber:libphonenumber:7.0.11:compile \ No newline at end of file +com.googlecode.libphonenumber:libphonenumber:7.0.11:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/com.nativelibs4java/jnaerator-runtime/0.12 b/modules/tests/shared/src/test/resources/resolutions/com.nativelibs4java/jnaerator-runtime/0.12 index 8bd29207aa..ed7b943f6b 100644 --- a/modules/tests/shared/src/test/resources/resolutions/com.nativelibs4java/jnaerator-runtime/0.12 +++ b/modules/tests/shared/src/test/resources/resolutions/com.nativelibs4java/jnaerator-runtime/0.12 @@ -1,3 +1,3 @@ -com.nativelibs4java:ochafik-util:0.12:compile -net.java.dev.jna:jna:4.1.0:compile -com.nativelibs4java:jnaerator-runtime:0.12:compile \ No newline at end of file +com.nativelibs4java:ochafik-util:0.12:default +net.java.dev.jna:jna:4.1.0:default +com.nativelibs4java:jnaerator-runtime:0.12:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/dk.brics.automaton/automaton/1.11-8 b/modules/tests/shared/src/test/resources/resolutions/dk.brics.automaton/automaton/1.11-8 index f2752ea778..c2c6a52ee7 100644 --- a/modules/tests/shared/src/test/resources/resolutions/dk.brics.automaton/automaton/1.11-8 +++ b/modules/tests/shared/src/test/resources/resolutions/dk.brics.automaton/automaton/1.11-8 @@ -1 +1 @@ -dk.brics.automaton:automaton:1.11-8:compile \ No newline at end of file +dk.brics.automaton:automaton:1.11-8:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/edu.illinois.cs.cogcomp/illinois-pos/2.0.2_compile b/modules/tests/shared/src/test/resources/resolutions/edu.illinois.cs.cogcomp/illinois-pos/2.0.2_compile index 1e4c2215f2..63f95abc30 100644 --- a/modules/tests/shared/src/test/resources/resolutions/edu.illinois.cs.cogcomp/illinois-pos/2.0.2_compile +++ b/modules/tests/shared/src/test/resources/resolutions/edu.illinois.cs.cogcomp/illinois-pos/2.0.2_compile @@ -1,5 +1,6 @@ -net.sf.squirrel-sql.thirdparty-non-maven:java-cup:0.11a:compile -nz.ac.waikato.cms.weka:weka-stable:3.6.10:compile -de.bwaldvogel:liblinear:1.94:compile -edu.illinois.cs.cogcomp:LBJava:1.0.3:compile +net.sf.squirrel-sql.thirdparty-non-maven:java-cup:0.11a:default +nz.ac.waikato.cms.weka:weka-stable:3.6.10:default +de.bwaldvogel:liblinear:1.94:default +edu.illinois.cs.cogcomp:LBJava:1.0.3:default +edu.illinois.cs.cogcomp:illinois-pos:2.0.2:default edu.illinois.cs.cogcomp:illinois-pos:2.0.2:compile \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier-cli_2.12/1.1.0-M10 b/modules/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier-cli_2.12/1.1.0-M10 index 49acb62860..72ee13a6d0 100644 --- a/modules/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier-cli_2.12/1.1.0-M10 +++ b/modules/tests/shared/src/test/resources/resolutions/io.get-coursier/coursier-cli_2.12/1.1.0-M10 @@ -1,19 +1,19 @@ -org.scala-lang:scala-library:2.12.8:compile -io.get-coursier:coursier-bootstrap_2.12:1.1.0-M10:compile -org.scala-lang.modules:scala-xml_2.12:1.1.1:compile -io.get-coursier:coursier-core_2.12:1.1.0-M10:compile -io.get-coursier:coursier-cache_2.12:1.1.0-M10:compile -io.get-coursier:coursier-extra_2.12:1.1.0-M10:compile -com.github.alexarchambault:case-app-annotations_2.12:2.0.0-M5:compile -org.typelevel:macro-compat_2.12:1.1.1:compile -com.chuusai:shapeless_2.12:2.3.3:compile -com.github.alexarchambault:case-app-util_2.12:2.0.0-M5:compile -com.github.alexarchambault:case-app_2.12:2.0.0-M5:compile -org.scala-lang:scala-reflect:2.12.6:compile -org.typelevel:machinist_2.12:0.6.6:compile -org.typelevel:cats-macros_2.12:1.5.0:compile -org.typelevel:cats-kernel_2.12:1.5.0:compile -org.typelevel:cats-core_2.12:1.5.0:compile -io.argonaut:argonaut_2.12:6.2.1:compile -com.github.alexarchambault:argonaut-shapeless_6.2_2.12:1.2.0-M8:compile -io.get-coursier:coursier-cli_2.12:1.1.0-M10:compile \ No newline at end of file +org.scala-lang:scala-library:2.12.8:default +io.get-coursier:coursier-bootstrap_2.12:1.1.0-M10:default +org.scala-lang.modules:scala-xml_2.12:1.1.1:default +io.get-coursier:coursier-core_2.12:1.1.0-M10:default +io.get-coursier:coursier-cache_2.12:1.1.0-M10:default +io.get-coursier:coursier-extra_2.12:1.1.0-M10:default +com.github.alexarchambault:case-app-annotations_2.12:2.0.0-M5:default +org.typelevel:macro-compat_2.12:1.1.1:default +com.chuusai:shapeless_2.12:2.3.3:default +com.github.alexarchambault:case-app-util_2.12:2.0.0-M5:default +com.github.alexarchambault:case-app_2.12:2.0.0-M5:default +org.scala-lang:scala-reflect:2.12.6:default +org.typelevel:machinist_2.12:0.6.6:default +org.typelevel:cats-macros_2.12:1.5.0:default +org.typelevel:cats-kernel_2.12:1.5.0:default +org.typelevel:cats-core_2.12:1.5.0:default +io.argonaut:argonaut_2.12:6.2.1:default +com.github.alexarchambault:argonaut-shapeless_6.2_2.12:1.2.0-M8:default +io.get-coursier:coursier-cli_2.12:1.1.0-M10:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/io.grpc/grpc-netty/0.14.1 b/modules/tests/shared/src/test/resources/resolutions/io.grpc/grpc-netty/0.14.1 index e42423dbf4..7e7cfb045d 100644 --- a/modules/tests/shared/src/test/resources/resolutions/io.grpc/grpc-netty/0.14.1 +++ b/modules/tests/shared/src/test/resources/resolutions/io.grpc/grpc-netty/0.14.1 @@ -1,12 +1,12 @@ -com.google.guava:guava:19.0:compile -com.google.code.findbugs:jsr305:3.0.0:compile -io.grpc:grpc-core:0.14.1:compile -io.netty:netty-common:4.1.1.Final:compile -io.netty:netty-buffer:4.1.1.Final:compile -io.netty:netty-resolver:4.1.1.Final:compile -io.netty:netty-transport:4.1.1.Final:compile -io.netty:netty-codec:4.1.1.Final:compile -io.netty:netty-codec-http:4.1.1.Final:compile -io.netty:netty-handler:4.1.1.Final:compile -io.netty:netty-codec-http2:4.1.1.Final:compile -io.grpc:grpc-netty:0.14.1:compile \ No newline at end of file +com.google.guava:guava:19.0:default +com.google.code.findbugs:jsr305:3.0.0:default +io.grpc:grpc-core:0.14.1:default +io.netty:netty-common:4.1.1.Final:default +io.netty:netty-buffer:4.1.1.Final:default +io.netty:netty-resolver:4.1.1.Final:default +io.netty:netty-transport:4.1.1.Final:default +io.netty:netty-codec:4.1.1.Final:default +io.netty:netty-codec-http:4.1.1.Final:default +io.netty:netty-handler:4.1.1.Final:default +io.netty:netty-codec-http2:4.1.1.Final:default +io.grpc:grpc-netty:0.14.1:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/io.monix/monix_2.12/2.3.0 b/modules/tests/shared/src/test/resources/resolutions/io.monix/monix_2.12/2.3.0 index 262773e469..f2431d7580 100644 --- a/modules/tests/shared/src/test/resources/resolutions/io.monix/monix_2.12/2.3.0 +++ b/modules/tests/shared/src/test/resources/resolutions/io.monix/monix_2.12/2.3.0 @@ -1,8 +1,8 @@ -org.scala-lang:scala-library:2.12.2:compile -io.monix:monix-types_2.12:2.3.0:compile -org.reactivestreams:reactive-streams:1.0.0:compile -io.monix:monix-execution_2.12:2.3.0:compile -io.monix:monix-eval_2.12:2.3.0:compile -org.jctools:jctools-core:2.0.1:compile -io.monix:monix-reactive_2.12:2.3.0:compile -io.monix:monix_2.12:2.3.0:compile \ No newline at end of file +org.scala-lang:scala-library:2.12.2:default +io.monix:monix-types_2.12:2.3.0:default +org.reactivestreams:reactive-streams:1.0.0:default +io.monix:monix-execution_2.12:2.3.0:default +io.monix:monix-eval_2.12:2.3.0:default +org.jctools:jctools-core:2.0.1:default +io.monix:monix-reactive_2.12:2.3.0:default +io.monix:monix_2.12:2.3.0:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/io.swagger.parser.v3/swagger-parser-v3/2.0.1 b/modules/tests/shared/src/test/resources/resolutions/io.swagger.parser.v3/swagger-parser-v3/2.0.1 index 712307af33..813d67befd 100644 --- a/modules/tests/shared/src/test/resources/resolutions/io.swagger.parser.v3/swagger-parser-v3/2.0.1 +++ b/modules/tests/shared/src/test/resources/resolutions/io.swagger.parser.v3/swagger-parser-v3/2.0.1 @@ -1,15 +1,15 @@ -com.fasterxml.jackson.core:jackson-annotations:2.9.5:compile -io.swagger.core.v3:swagger-models:2.0.1: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 -com.fasterxml.jackson.core:jackson-core:2.9.5:compile -com.fasterxml.jackson.core:jackson-databind:2.9.5:compile -org.yaml:snakeyaml:1.18:compile -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.5:compile -io.swagger.core.v3:swagger-annotations:2.0.1:compile -javax.validation:validation-api:1.1.0.Final:compile -io.swagger.core.v3:swagger-core:2.0.1:compile -io.swagger.parser.v3:swagger-parser-core:2.0.1:compile -commons-io:commons-io:2.4:compile -io.swagger.parser.v3:swagger-parser-v3:2.0.1:compile \ No newline at end of file +com.fasterxml.jackson.core:jackson-annotations:2.9.5:default +io.swagger.core.v3:swagger-models:2.0.1:default +javax.xml.bind:jaxb-api:2.3.0:default +org.apache.commons:commons-lang3:3.7:default +org.slf4j:slf4j-api:1.7.25:default +com.fasterxml.jackson.core:jackson-core:2.9.5:default +com.fasterxml.jackson.core:jackson-databind:2.9.5:default +org.yaml:snakeyaml:1.18:default +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.5:default +io.swagger.core.v3:swagger-annotations:2.0.1:default +javax.validation:validation-api:1.1.0.Final:default +io.swagger.core.v3:swagger-core:2.0.1:default +io.swagger.parser.v3:swagger-parser-core:2.0.1:default +commons-io:commons-io:2.4:default +io.swagger.parser.v3:swagger-parser-v3:2.0.1:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.apache.commons/commons-io/1.3.2 b/modules/tests/shared/src/test/resources/resolutions/org.apache.commons/commons-io/1.3.2 index 05c6cf8e18..33fae5df48 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.apache.commons/commons-io/1.3.2 +++ b/modules/tests/shared/src/test/resources/resolutions/org.apache.commons/commons-io/1.3.2 @@ -1,2 +1,2 @@ -commons-io:commons-io:1.3.2:compile -org.apache.commons:commons-io:1.3.2:compile \ No newline at end of file +commons-io:commons-io:1.3.2:default +org.apache.commons:commons-io:1.3.2:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.apache.directory.shared/shared-ldap/0.9.19 b/modules/tests/shared/src/test/resources/resolutions/org.apache.directory.shared/shared-ldap/0.9.19 index 8821a566f4..591f0f92bd 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.apache.directory.shared/shared-ldap/0.9.19 +++ b/modules/tests/shared/src/test/resources/resolutions/org.apache.directory.shared/shared-ldap/0.9.19 @@ -1,8 +1,8 @@ -commons-lang:commons-lang:2.4:compile -commons-collections:commons-collections:3.2.1:compile -org.slf4j:slf4j-api:1.5.10:compile -org.apache.directory.shared:shared-i18n:0.9.19:compile -org.apache.directory.shared:shared-asn1:0.9.19:compile -org.apache.directory.shared:shared-ldap-constants:0.9.19:compile -antlr:antlr:2.7.7:compile -org.apache.directory.shared:shared-ldap:0.9.19:compile \ No newline at end of file +commons-lang:commons-lang:2.4:default +commons-collections:commons-collections:3.2.1:default +org.slf4j:slf4j-api:1.5.10:default +org.apache.directory.shared:shared-i18n:0.9.19:default +org.apache.directory.shared:shared-asn1:0.9.19:default +org.apache.directory.shared:shared-ldap-constants:0.9.19:default +antlr:antlr:2.7.7:default +org.apache.directory.shared:shared-ldap:0.9.19:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.apache.maven/apache-maven/3.3.9 b/modules/tests/shared/src/test/resources/resolutions/org.apache.maven/apache-maven/3.3.9 index 8e95866116..b630792a21 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.apache.maven/apache-maven/3.3.9 +++ b/modules/tests/shared/src/test/resources/resolutions/org.apache.maven/apache-maven/3.3.9 @@ -1,44 +1,44 @@ -org.codehaus.plexus:plexus-utils:3.0.22:compile -org.apache.maven:maven-settings:3.3.9:compile -org.apache.commons:commons-lang3:3.4:compile -org.apache.maven:maven-model:3.3.9:compile -org.apache.maven:maven-builder-support:3.3.9:compile -org.codehaus.plexus:plexus-interpolation:1.21:compile -org.codehaus.plexus:plexus-component-annotations:1.6:compile -org.sonatype.plexus:plexus-cipher:1.7:compile -org.sonatype.plexus:plexus-sec-dispatcher:1.3:compile -org.apache.maven:maven-settings-builder:3.3.9:compile -org.apache.maven:maven-repository-metadata:3.3.9:compile -org.apache.maven:maven-artifact:3.3.9:compile -javax.annotation:jsr250-api:1.0:compile -javax.inject:javax.inject:1:compile -javax.enterprise:cdi-api:1.0:compile -org.eclipse.sisu:org.eclipse.sisu.inject:0.3.2:compile -org.codehaus.plexus:plexus-classworlds:2.5.2:compile -org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.2:compile -org.apache.maven:maven-plugin-api:3.3.9:compile -com.google.guava:guava:18.0:compile -org.apache.maven:maven-model-builder:3.3.9:compile -org.eclipse.aether:aether-api:1.0.2.v20150114:compile -org.eclipse.aether:aether-spi:1.0.2.v20150114:compile -org.eclipse.aether:aether-util:1.0.2.v20150114:compile -org.eclipse.aether:aether-impl:1.0.2.v20150114:compile -org.apache.maven:maven-aether-provider:3.3.9:compile -aopalliance:aopalliance:1.0:compile -com.google.inject:guice:4.0:compile -org.apache.maven:maven-core:3.3.9:compile -org.slf4j:slf4j-api:1.7.5:compile -commons-cli:commons-cli:1.2:compile -org.apache.maven:maven-embedder:3.3.9:compile -org.apache.maven.wagon:wagon-provider-api:2.10:compile -org.apache.maven:maven-compat:3.3.9:compile -org.jsoup:jsoup:1.7.2:compile -commons-lang:commons-lang:2.6:compile -commons-io:commons-io:2.2:compile -org.apache.maven.wagon:wagon-http-shared:2.10:compile -commons-logging:commons-logging:1.1.3:compile -org.apache.maven.wagon:wagon-http:2.10:compile -org.apache.maven.wagon:wagon-file:2.10:compile -org.eclipse.aether:aether-connector-basic:1.0.2.v20150114:compile -org.eclipse.aether:aether-transport-wagon:1.0.2.v20150114:compile -org.apache.maven:apache-maven:3.3.9:compile \ No newline at end of file +org.codehaus.plexus:plexus-utils:3.0.22:default +org.apache.maven:maven-settings:3.3.9:default +org.apache.commons:commons-lang3:3.4:default +org.apache.maven:maven-model:3.3.9:default +org.apache.maven:maven-builder-support:3.3.9:default +org.codehaus.plexus:plexus-interpolation:1.21:default +org.codehaus.plexus:plexus-component-annotations:1.6:default +org.sonatype.plexus:plexus-cipher:1.7:default +org.sonatype.plexus:plexus-sec-dispatcher:1.3:default +org.apache.maven:maven-settings-builder:3.3.9:default +org.apache.maven:maven-repository-metadata:3.3.9:default +org.apache.maven:maven-artifact:3.3.9:default +javax.annotation:jsr250-api:1.0:default +javax.inject:javax.inject:1:default +javax.enterprise:cdi-api:1.0:default +org.eclipse.sisu:org.eclipse.sisu.inject:0.3.2:default +org.codehaus.plexus:plexus-classworlds:2.5.2:default +org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.2:default +org.apache.maven:maven-plugin-api:3.3.9:default +com.google.guava:guava:18.0:default +org.apache.maven:maven-model-builder:3.3.9:default +org.eclipse.aether:aether-api:1.0.2.v20150114:default +org.eclipse.aether:aether-spi:1.0.2.v20150114:default +org.eclipse.aether:aether-util:1.0.2.v20150114:default +org.eclipse.aether:aether-impl:1.0.2.v20150114:default +org.apache.maven:maven-aether-provider:3.3.9:default +aopalliance:aopalliance:1.0:default +com.google.inject:guice:4.0:default +org.apache.maven:maven-core:3.3.9:default +org.apache.maven.wagon:wagon-provider-api:2.10:default +org.apache.maven:maven-compat:3.3.9:default +org.slf4j:slf4j-api:1.7.5:default +commons-cli:commons-cli:1.2:default +org.apache.maven:maven-embedder:3.3.9:default +org.jsoup:jsoup:1.7.2:default +commons-lang:commons-lang:2.6:default +commons-io:commons-io:2.2:default +org.apache.maven.wagon:wagon-http-shared:2.10:default +commons-logging:commons-logging:1.1.3:default +org.apache.maven.wagon:wagon-http:2.10:default +org.apache.maven.wagon:wagon-file:2.10:default +org.eclipse.aether:aether-connector-basic:1.0.2.v20150114:default +org.eclipse.aether:aether-transport-wagon:1.0.2.v20150114:default +org.apache.maven:apache-maven:3.3.9:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.apache.spark/spark-core_2.10/2.1.1 b/modules/tests/shared/src/test/resources/resolutions/org.apache.spark/spark-core_2.10/2.1.1 index a09fdca4c6..8952ee04b6 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.apache.spark/spark-core_2.10/2.1.1 +++ b/modules/tests/shared/src/test/resources/resolutions/org.apache.spark/spark-core_2.10/2.1.1 @@ -1,136 +1,136 @@ -org.codehaus.jackson:jackson-core-asl:1.9.13:compile -org.codehaus.jackson:jackson-mapper-asl:1.9.13:compile -com.thoughtworks.paranamer:paranamer:2.6:compile -org.xerial.snappy:snappy-java:1.1.2.6:compile -org.tukaani:xz:1.0:compile -org.apache.commons:commons-compress:1.4.1:compile -org.slf4j:slf4j-api:1.7.16:compile -org.apache.avro:avro:1.7.7:compile -org.apache.avro:avro-ipc:1.7.7:compile -org.apache.avro:avro-mapred:1.7.7:compile -org.scala-lang:scala-library:2.10.6:compile -com.esotericsoftware:minlog:1.3.0:compile -org.objenesis:objenesis:2.1:compile -com.esotericsoftware:kryo-shaded:3.0.3:compile -com.twitter:chill-java:0.8.0:compile -com.twitter:chill_2.10:0.8.0:compile -org.apache.xbean:xbean-asm5-shaded:4.4:compile -org.apache.hadoop:hadoop-annotations:2.6.4:compile -com.google.guava:guava:16.0.1:compile -commons-cli:commons-cli:1.2:compile -org.apache.commons:commons-math3:3.4.1:compile -xmlenc:xmlenc:0.52:compile -commons-codec:commons-codec:1.8:compile -commons-httpclient:commons-httpclient:3.1:compile -commons-io:commons-io:2.4:compile -commons-net:commons-net:3.1:compile -commons-collections:commons-collections:3.2.2:compile -log4j:log4j:1.2.17:compile -commons-lang:commons-lang:2.6:compile -commons-beanutils:commons-beanutils:1.7.0:compile -commons-digester:commons-digester:1.8:compile -commons-beanutils:commons-beanutils-core:1.8.0:compile -commons-configuration:commons-configuration:1.6:compile -com.google.protobuf:protobuf-java:2.5.0:compile -com.google.code.gson:gson:2.2.4:compile -org.apache.httpcomponents:httpcore:4.3.3:compile -org.apache.httpcomponents:httpclient:4.3.6:compile -org.apache.directory.server:apacheds-i18n:2.0.0-M15:compile -org.apache.directory.api:api-asn1-api:1.0.0-M20:compile -org.apache.directory.api:api-util:1.0.0-M20:compile -org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15:compile -org.slf4j:slf4j-log4j12:1.7.16:compile -jline:jline:0.9.94:compile -io.netty:netty:3.8.0.Final:compile -org.apache.zookeeper:zookeeper:3.4.6:compile -org.apache.curator:curator-client:2.6.0:compile -org.apache.curator:curator-framework:2.6.0:compile -org.apache.hadoop:hadoop-auth:2.6.4:compile -org.apache.curator:curator-recipes:2.6.0:compile -com.google.code.findbugs:jsr305:1.3.9:compile -org.htrace:htrace-core:3.0.4:compile -org.apache.hadoop:hadoop-common:2.6.4:compile -org.mortbay.jetty:jetty-util:6.1.26:compile -xml-apis:xml-apis:1.3.04:compile -xerces:xercesImpl:2.9.1:compile -org.apache.hadoop:hadoop-hdfs:2.6.4:compile -org.apache.hadoop:hadoop-yarn-api:2.6.4:compile -javax.xml.stream:stax-api:1.0-2:compile -javax.activation:activation:1.1.1:compile -javax.xml.bind:jaxb-api:2.2.2:compile -org.codehaus.jackson:jackson-jaxrs:1.9.13:compile -org.codehaus.jackson:jackson-xc:1.9.13:compile -javax.inject:javax.inject:1:compile -aopalliance:aopalliance:1.0:compile -com.google.inject:guice:3.0:compile -org.apache.hadoop:hadoop-yarn-common:2.6.4:compile -org.apache.hadoop:hadoop-yarn-client:2.6.4:compile -org.apache.hadoop:hadoop-mapreduce-client-core:2.6.4:compile -org.fusesource.leveldbjni:leveldbjni-all:1.8:compile -org.apache.hadoop:hadoop-yarn-server-common:2.6.4:compile -org.apache.hadoop:hadoop-mapreduce-client-common:2.6.4:compile -org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.6.4:compile -org.apache.hadoop:hadoop-mapreduce-client-app:2.6.4:compile -org.codehaus.jettison:jettison:1.1:compile -org.apache.hadoop:hadoop-yarn-server-nodemanager:2.6.4:compile -org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.6.4:compile -org.apache.hadoop:hadoop-client:2.6.4:compile -org.spark-project.spark:unused:1.0.0:compile -org.apache.spark:spark-tags_2.10:2.1.1:compile -org.apache.spark:spark-launcher_2.10:2.1.1:compile -io.netty:netty-all:4.0.42.Final:compile -org.apache.commons:commons-lang3:3.5:compile -com.fasterxml.jackson.core:jackson-annotations:2.6.5:compile -com.fasterxml.jackson.core:jackson-core:2.6.5:compile -com.fasterxml.jackson.core:jackson-databind:2.6.5:compile -org.apache.spark:spark-network-common_2.10:2.1.1:compile -io.dropwizard.metrics:metrics-core:3.1.2:compile -org.apache.spark:spark-network-shuffle_2.10:2.1.1:compile -org.apache.spark:spark-unsafe_2.10:2.1.1:compile -mx4j:mx4j:3.0.2:compile -javax.mail:mail:1.4.7:compile -org.bouncycastle:bcprov-jdk15on:1.51:compile -net.iharder:base64:2.3.8:compile -com.jamesmurty.utils:java-xmlbuilder:1.0:compile -net.java.dev.jets3t:jets3t:0.9.3:compile -javax.servlet:javax.servlet-api:3.1.0:compile -org.slf4j:jul-to-slf4j:1.7.16:compile -org.slf4j:jcl-over-slf4j:1.7.16:compile -com.ning:compress-lzf:1.0.3:compile -net.jpountz.lz4:lz4:1.3.0:compile -org.roaringbitmap:RoaringBitmap:0.5.11:compile -org.json4s:json4s-ast_2.10:3.2.11:compile -org.scala-lang:scala-reflect:2.10.6:compile -org.scala-lang:scala-compiler:2.10.0:compile -org.scala-lang:scalap:2.10.0:compile -org.json4s:json4s-core_2.10:3.2.11:compile -org.json4s:json4s-jackson_2.10:3.2.11:compile -javax.ws.rs:javax.ws.rs-api:2.0.1:compile -javax.annotation:javax.annotation-api:1.2:compile -org.glassfish.jersey.bundles.repackaged:jersey-guava:2.22.2:compile -org.glassfish.hk2:hk2-utils:2.4.0-b34:compile -org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b34:compile -org.glassfish.hk2:hk2-api:2.4.0-b34:compile -org.glassfish.hk2.external:javax.inject:2.4.0-b34:compile -org.javassist:javassist:3.18.1-GA:compile -org.glassfish.hk2:hk2-locator:2.4.0-b34:compile -org.glassfish.hk2:osgi-resource-locator:1.0.1:compile -org.glassfish.jersey.core:jersey-common:2.22.2:compile -org.glassfish.jersey.core:jersey-client:2.22.2:compile -org.glassfish.jersey.media:jersey-media-jaxb:2.22.2:compile -javax.validation:validation-api:1.1.0.Final:compile -org.glassfish.jersey.core:jersey-server:2.22.2:compile -org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.2:compile -org.glassfish.jersey.containers:jersey-container-servlet:2.22.2:compile -com.clearspring.analytics:stream:2.7.0:compile -io.dropwizard.metrics:metrics-jvm:3.1.2:compile -io.dropwizard.metrics:metrics-json:3.1.2:compile -io.dropwizard.metrics:metrics-graphite:3.1.2:compile -com.fasterxml.jackson.module:jackson-module-paranamer:2.6.5:compile -com.fasterxml.jackson.module:jackson-module-scala_2.10:2.6.5:compile -org.apache.ivy:ivy:2.4.0:compile -oro:oro:2.0.8:compile -net.razorvine:pyrolite:4.13:compile -net.sf.py4j:py4j:0.10.4:compile -org.apache.commons:commons-crypto:1.0.0:compile -org.apache.spark:spark-core_2.10:2.1.1:compile \ No newline at end of file +org.codehaus.jackson:jackson-core-asl:1.9.13:default +org.codehaus.jackson:jackson-mapper-asl:1.9.13:default +com.thoughtworks.paranamer:paranamer:2.6:default +org.xerial.snappy:snappy-java:1.1.2.6:default +org.tukaani:xz:1.0:default +org.apache.commons:commons-compress:1.4.1:default +org.slf4j:slf4j-api:1.7.16:default +org.apache.avro:avro:1.7.7:default +org.apache.avro:avro-ipc:1.7.7:default +org.apache.avro:avro-mapred:1.7.7:default +org.scala-lang:scala-library:2.10.6:default +com.esotericsoftware:minlog:1.3.0:default +org.objenesis:objenesis:2.1:default +com.esotericsoftware:kryo-shaded:3.0.3:default +com.twitter:chill-java:0.8.0:default +com.twitter:chill_2.10:0.8.0:default +org.apache.xbean:xbean-asm5-shaded:4.4:default +org.apache.hadoop:hadoop-annotations:2.6.4:default +com.google.guava:guava:16.0.1:default +commons-cli:commons-cli:1.2:default +org.apache.commons:commons-math3:3.4.1:default +xmlenc:xmlenc:0.52:default +commons-codec:commons-codec:1.8:default +commons-httpclient:commons-httpclient:3.1:default +commons-io:commons-io:2.4:default +commons-net:commons-net:3.1:default +commons-collections:commons-collections:3.2.2:default +log4j:log4j:1.2.17:default +commons-lang:commons-lang:2.6:default +commons-beanutils:commons-beanutils:1.7.0:default +commons-digester:commons-digester:1.8:default +commons-beanutils:commons-beanutils-core:1.8.0:default +commons-configuration:commons-configuration:1.6:default +org.slf4j:slf4j-log4j12:1.7.16:default +com.google.protobuf:protobuf-java:2.5.0:default +com.google.code.gson:gson:2.2.4:default +org.apache.httpcomponents:httpcore:4.3.3:default +org.apache.httpcomponents:httpclient:4.3.6:default +org.apache.directory.server:apacheds-i18n:2.0.0-M15:default +org.apache.directory.api:api-asn1-api:1.0.0-M20:default +org.apache.directory.api:api-util:1.0.0-M20:default +org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15:default +jline:jline:0.9.94:default +io.netty:netty:3.8.0.Final:default +org.apache.zookeeper:zookeeper:3.4.6:default +org.apache.curator:curator-client:2.6.0:default +org.apache.curator:curator-framework:2.6.0:default +org.apache.hadoop:hadoop-auth:2.6.4:default +org.apache.curator:curator-recipes:2.6.0:default +com.google.code.findbugs:jsr305:1.3.9:default +org.htrace:htrace-core:3.0.4:default +org.apache.hadoop:hadoop-common:2.6.4:default +org.mortbay.jetty:jetty-util:6.1.26:default +xml-apis:xml-apis:1.3.04:default +xerces:xercesImpl:2.9.1:default +org.apache.hadoop:hadoop-hdfs:2.6.4:default +org.apache.hadoop:hadoop-yarn-api:2.6.4:default +javax.xml.stream:stax-api:1.0-2:default +javax.activation:activation:1.1.1:default +javax.xml.bind:jaxb-api:2.2.2:default +org.codehaus.jackson:jackson-jaxrs:1.9.13:default +org.codehaus.jackson:jackson-xc:1.9.13:default +javax.inject:javax.inject:1:default +aopalliance:aopalliance:1.0:default +com.google.inject:guice:3.0:default +org.apache.hadoop:hadoop-yarn-common:2.6.4:default +org.apache.hadoop:hadoop-yarn-client:2.6.4:default +org.apache.hadoop:hadoop-mapreduce-client-core:2.6.4:default +org.fusesource.leveldbjni:leveldbjni-all:1.8:default +org.apache.hadoop:hadoop-yarn-server-common:2.6.4:default +org.apache.hadoop:hadoop-mapreduce-client-common:2.6.4:default +org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.6.4:default +org.apache.hadoop:hadoop-mapreduce-client-app:2.6.4:default +org.codehaus.jettison:jettison:1.1:default +org.apache.hadoop:hadoop-yarn-server-nodemanager:2.6.4:default +org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.6.4:default +org.apache.hadoop:hadoop-client:2.6.4:default +org.spark-project.spark:unused:1.0.0:default +org.apache.spark:spark-tags_2.10:2.1.1:default +org.apache.spark:spark-launcher_2.10:2.1.1:default +io.netty:netty-all:4.0.42.Final:default +org.apache.commons:commons-lang3:3.5:default +com.fasterxml.jackson.core:jackson-annotations:2.6.5:default +com.fasterxml.jackson.core:jackson-core:2.6.5:default +com.fasterxml.jackson.core:jackson-databind:2.6.5:default +org.apache.spark:spark-network-common_2.10:2.1.1:default +io.dropwizard.metrics:metrics-core:3.1.2:default +org.apache.spark:spark-network-shuffle_2.10:2.1.1:default +org.apache.spark:spark-unsafe_2.10:2.1.1:default +mx4j:mx4j:3.0.2:default +javax.mail:mail:1.4.7:default +org.bouncycastle:bcprov-jdk15on:1.51:default +net.iharder:base64:2.3.8:default +com.jamesmurty.utils:java-xmlbuilder:1.0:default +net.java.dev.jets3t:jets3t:0.9.3:default +javax.servlet:javax.servlet-api:3.1.0:default +org.slf4j:jul-to-slf4j:1.7.16:default +org.slf4j:jcl-over-slf4j:1.7.16:default +com.ning:compress-lzf:1.0.3:default +net.jpountz.lz4:lz4:1.3.0:default +org.roaringbitmap:RoaringBitmap:0.5.11:default +org.json4s:json4s-ast_2.10:3.2.11:default +org.scala-lang:scala-reflect:2.10.6:default +org.scala-lang:scala-compiler:2.10.0:default +org.scala-lang:scalap:2.10.0:default +org.json4s:json4s-core_2.10:3.2.11:default +org.json4s:json4s-jackson_2.10:3.2.11:default +javax.ws.rs:javax.ws.rs-api:2.0.1:default +javax.annotation:javax.annotation-api:1.2:default +org.glassfish.jersey.bundles.repackaged:jersey-guava:2.22.2:default +org.glassfish.hk2:hk2-utils:2.4.0-b34:default +org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b34:default +org.glassfish.hk2:hk2-api:2.4.0-b34:default +org.glassfish.hk2.external:javax.inject:2.4.0-b34:default +org.javassist:javassist:3.18.1-GA:default +org.glassfish.hk2:hk2-locator:2.4.0-b34:default +org.glassfish.hk2:osgi-resource-locator:1.0.1:default +org.glassfish.jersey.core:jersey-common:2.22.2:default +org.glassfish.jersey.core:jersey-client:2.22.2:default +org.glassfish.jersey.media:jersey-media-jaxb:2.22.2:default +javax.validation:validation-api:1.1.0.Final:default +org.glassfish.jersey.core:jersey-server:2.22.2:default +org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.2:default +org.glassfish.jersey.containers:jersey-container-servlet:2.22.2:default +com.clearspring.analytics:stream:2.7.0:default +io.dropwizard.metrics:metrics-jvm:3.1.2:default +io.dropwizard.metrics:metrics-json:3.1.2:default +io.dropwizard.metrics:metrics-graphite:3.1.2:default +com.fasterxml.jackson.module:jackson-module-paranamer:2.6.5:default +com.fasterxml.jackson.module:jackson-module-scala_2.10:2.6.5:default +org.apache.ivy:ivy:2.4.0:default +oro:oro:2.0.8:default +net.razorvine:pyrolite:4.13:default +net.sf.py4j:py4j:0.10.4:default +org.apache.commons:commons-crypto:1.0.0:default +org.apache.spark:spark-core_2.10:2.1.1:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1 b/modules/tests/shared/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1 index 9f6e36712d..1591dcbb41 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1 +++ b/modules/tests/shared/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1 @@ -1,115 +1,115 @@ -org.scala-lang:scala-library:2.11.2:compile -com.esotericsoftware.reflectasm:reflectasm:1.07:compile -com.esotericsoftware.minlog:minlog:1.2:compile -org.objenesis:objenesis:1.2:compile -com.esotericsoftware.kryo:kryo:2.21:compile -com.twitter:chill-java:0.5.0:compile -com.twitter:chill_2.11:0.5.0:compile -org.apache.hadoop:hadoop-annotations:2.2.0:compile -com.google.guava:guava:14.0.1:compile -commons-cli:commons-cli:1.2:compile -org.apache.commons:commons-math:2.1:compile -xmlenc:xmlenc:0.52:compile -commons-logging:commons-logging:1.1.1:compile -commons-codec:commons-codec:1.4:compile -commons-httpclient:commons-httpclient:3.1:compile -commons-io:commons-io:2.4:compile -commons-net:commons-net:3.1:compile -log4j:log4j:1.2.17:compile -commons-lang:commons-lang:2.5:compile -commons-collections:commons-collections:3.2.1:compile -commons-beanutils:commons-beanutils:1.7.0:compile -commons-digester:commons-digester:1.8:compile -commons-beanutils:commons-beanutils-core:1.8.0:compile -commons-configuration:commons-configuration:1.6:compile -org.slf4j:slf4j-api:1.7.10:compile -org.codehaus.jackson:jackson-core-asl:1.8.8:compile -org.codehaus.jackson:jackson-mapper-asl:1.8.8:compile -com.thoughtworks.paranamer:paranamer:2.6:compile -org.xerial.snappy:snappy-java:1.1.1.6:compile -org.tukaani:xz:1.0:compile -org.apache.commons:commons-compress:1.4.1:compile -org.apache.avro:avro:1.7.4:compile -com.google.protobuf:protobuf-java:2.5.0:compile -org.apache.hadoop:hadoop-auth:2.2.0:compile -org.slf4j:slf4j-log4j12:1.7.10:compile -org.apache.zookeeper:zookeeper:3.4.5:compile -org.apache.hadoop:hadoop-common:2.2.0:compile -org.mortbay.jetty:jetty-util:6.1.26:compile -org.apache.hadoop:hadoop-hdfs:2.2.0:compile -javax.inject:javax.inject:1:compile -aopalliance:aopalliance:1.0:compile -com.google.inject:guice:3.0:compile -com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:1.9:compile -asm:asm:3.1:compile -com.sun.jersey:jersey-server:1.9:compile -stax:stax-api:1.0.1:compile -org.codehaus.jettison:jettison:1.1:compile -javax.activation:activation:1.1:compile -javax.xml.bind:jaxb-api:2.2.2:compile -com.sun.xml.bind:jaxb-impl:2.2.3-1:compile -org.codehaus.jackson:jackson-jaxrs:1.8.3:compile -org.codehaus.jackson:jackson-xc:1.8.3:compile -com.sun.jersey:jersey-json:1.9:compile -com.sun.jersey.contribs:jersey-guice:1.9:compile -org.apache.hadoop:hadoop-yarn-api:2.2.0:compile -org.apache.hadoop:hadoop-yarn-common:2.2.0:compile -org.apache.hadoop:hadoop-yarn-client:2.2.0:compile -org.apache.hadoop:hadoop-mapreduce-client-core:2.2.0:compile -org.apache.hadoop:hadoop-yarn-server-common:2.2.0:compile -org.apache.hadoop:hadoop-mapreduce-client-common:2.2.0:compile -org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.2.0:compile -org.apache.hadoop:hadoop-mapreduce-client-app:2.2.0:compile -jline:jline:0.9.94:compile -org.apache.hadoop:hadoop-yarn-server-nodemanager:2.2.0:compile -org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.2.0:compile -org.apache.hadoop:hadoop-client:2.2.0:compile -io.netty:netty-all:4.0.23.Final:compile -org.spark-project.spark:unused:1.0.0:compile -org.apache.spark:spark-network-common_2.11:1.3.1:compile -org.apache.spark:spark-network-shuffle_2.11:1.3.1:compile -net.java.dev.jets3t:jets3t:0.7.1:compile -org.apache.curator:curator-client:2.4.0:compile -org.apache.curator:curator-framework:2.4.0:compile -org.apache.curator:curator-recipes:2.4.0:compile -org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016:compile -org.apache.commons:commons-lang3:3.3.2:compile -org.apache.commons:commons-math3:3.1.1:compile -com.google.code.findbugs:jsr305:2.0.1:compile -org.slf4j:jul-to-slf4j:1.7.10:compile -org.slf4j:jcl-over-slf4j:1.7.10:compile -com.ning:compress-lzf:1.0.0:compile -net.jpountz.lz4:lz4:1.2.0:compile -org.roaringbitmap:RoaringBitmap:0.4.5:compile -com.typesafe:config:1.2.1:compile -org.spark-project.akka:akka-actor_2.11:2.3.4-spark:compile -io.netty:netty:3.8.0.Final:compile -org.spark-project.protobuf:protobuf-java:2.5.0-spark:compile -org.uncommons.maths:uncommons-maths:1.2.2a:compile -org.spark-project.akka:akka-remote_2.11:2.3.4-spark:compile -org.spark-project.akka:akka-slf4j_2.11:2.3.4-spark:compile -org.json4s:json4s-ast_2.11:3.2.10:compile -org.scala-lang:scala-reflect:2.11.2:compile -org.scala-lang.modules:scala-xml_2.11:1.0.1:compile -org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1:compile -org.scala-lang:scala-compiler:2.11.0:compile -org.scala-lang:scalap:2.11.0:compile -org.json4s:json4s-core_2.11:3.2.10:compile -com.fasterxml.jackson.core:jackson-annotations:2.4.4:compile -com.fasterxml.jackson.core:jackson-core:2.4.4:compile -com.fasterxml.jackson.core:jackson-databind:2.4.4:compile -org.json4s:json4s-jackson_2.11:3.2.10:compile -org.apache.mesos:mesos:0.21.0:compile -com.clearspring.analytics:stream:2.7.0:compile -io.dropwizard.metrics:metrics-core:3.1.0:compile -io.dropwizard.metrics:metrics-jvm:3.1.0:compile -io.dropwizard.metrics:metrics-json:3.1.0:compile -io.dropwizard.metrics:metrics-graphite:3.1.0:compile -com.fasterxml.jackson.module:jackson-module-scala_2.11:2.4.4:compile -org.apache.ivy:ivy:2.4.0:compile -oro:oro:2.0.8:compile -org.tachyonproject:tachyon:0.5.0:compile -org.tachyonproject:tachyon-client:0.5.0:compile -org.spark-project:pyrolite:2.0.1:compile -net.sf.py4j:py4j:0.8.2.1:compile -org.apache.spark:spark-core_2.11:1.3.1:compile \ No newline at end of file +org.scala-lang:scala-library:2.11.2:default +com.esotericsoftware.reflectasm:reflectasm:1.07:default +com.esotericsoftware.minlog:minlog:1.2:default +org.objenesis:objenesis:1.2:default +com.esotericsoftware.kryo:kryo:2.21:default +com.twitter:chill-java:0.5.0:default +com.twitter:chill_2.11:0.5.0:default +org.apache.hadoop:hadoop-annotations:2.2.0:default +com.google.guava:guava:14.0.1:default +commons-cli:commons-cli:1.2:default +org.apache.commons:commons-math:2.1:default +xmlenc:xmlenc:0.52:default +commons-logging:commons-logging:1.1.1:default +commons-codec:commons-codec:1.4:default +commons-httpclient:commons-httpclient:3.1:default +commons-io:commons-io:2.4:default +commons-net:commons-net:3.1:default +log4j:log4j:1.2.17:default +commons-lang:commons-lang:2.5:default +commons-collections:commons-collections:3.2.1:default +commons-beanutils:commons-beanutils:1.7.0:default +commons-digester:commons-digester:1.8:default +commons-beanutils:commons-beanutils-core:1.8.0:default +commons-configuration:commons-configuration:1.6:default +org.slf4j:slf4j-api:1.7.10:default +org.slf4j:slf4j-log4j12:1.7.10:default +org.codehaus.jackson:jackson-core-asl:1.8.8:default +org.codehaus.jackson:jackson-mapper-asl:1.8.8:default +com.thoughtworks.paranamer:paranamer:2.6:default +org.xerial.snappy:snappy-java:1.1.1.6:default +org.tukaani:xz:1.0:default +org.apache.commons:commons-compress:1.4.1:default +org.apache.avro:avro:1.7.4:default +com.google.protobuf:protobuf-java:2.5.0:default +org.apache.hadoop:hadoop-auth:2.2.0:default +org.apache.zookeeper:zookeeper:3.4.5:default +org.apache.hadoop:hadoop-common:2.2.0:default +org.mortbay.jetty:jetty-util:6.1.26:default +org.apache.hadoop:hadoop-hdfs:2.2.0:default +javax.inject:javax.inject:1:default +aopalliance:aopalliance:1.0:default +com.google.inject:guice:3.0:default +com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:1.9:default +asm:asm:3.1:default +com.sun.jersey:jersey-server:1.9:default +stax:stax-api:1.0.1:default +org.codehaus.jettison:jettison:1.1:default +javax.activation:activation:1.1:default +javax.xml.bind:jaxb-api:2.2.2:default +com.sun.xml.bind:jaxb-impl:2.2.3-1:default +org.codehaus.jackson:jackson-jaxrs:1.8.3:default +org.codehaus.jackson:jackson-xc:1.8.3:default +com.sun.jersey:jersey-json:1.9:default +com.sun.jersey.contribs:jersey-guice:1.9:default +org.apache.hadoop:hadoop-yarn-api:2.2.0:default +org.apache.hadoop:hadoop-yarn-common:2.2.0:default +org.apache.hadoop:hadoop-yarn-client:2.2.0:default +org.apache.hadoop:hadoop-mapreduce-client-core:2.2.0:default +org.apache.hadoop:hadoop-yarn-server-common:2.2.0:default +org.apache.hadoop:hadoop-mapreduce-client-common:2.2.0:default +org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.2.0:default +org.apache.hadoop:hadoop-mapreduce-client-app:2.2.0:default +jline:jline:0.9.94:default +org.apache.hadoop:hadoop-yarn-server-nodemanager:2.2.0:default +org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.2.0:default +org.apache.hadoop:hadoop-client:2.2.0:default +io.netty:netty-all:4.0.23.Final:default +org.spark-project.spark:unused:1.0.0:default +org.apache.spark:spark-network-common_2.11:1.3.1:default +org.apache.spark:spark-network-shuffle_2.11:1.3.1:default +net.java.dev.jets3t:jets3t:0.7.1:default +org.apache.curator:curator-client:2.4.0:default +org.apache.curator:curator-framework:2.4.0:default +org.apache.curator:curator-recipes:2.4.0:default +org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016:default +org.apache.commons:commons-lang3:3.3.2:default +org.apache.commons:commons-math3:3.1.1:default +com.google.code.findbugs:jsr305:2.0.1:default +org.slf4j:jul-to-slf4j:1.7.10:default +org.slf4j:jcl-over-slf4j:1.7.10:default +com.ning:compress-lzf:1.0.0:default +net.jpountz.lz4:lz4:1.2.0:default +org.roaringbitmap:RoaringBitmap:0.4.5:default +com.typesafe:config:1.2.1:default +org.spark-project.akka:akka-actor_2.11:2.3.4-spark:default +io.netty:netty:3.8.0.Final:default +org.spark-project.protobuf:protobuf-java:2.5.0-spark:default +org.uncommons.maths:uncommons-maths:1.2.2a:default +org.spark-project.akka:akka-remote_2.11:2.3.4-spark:default +org.spark-project.akka:akka-slf4j_2.11:2.3.4-spark:default +org.json4s:json4s-ast_2.11:3.2.10:default +org.scala-lang:scala-reflect:2.11.2:default +org.scala-lang.modules:scala-xml_2.11:1.0.1:default +org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1:default +org.scala-lang:scala-compiler:2.11.0:default +org.scala-lang:scalap:2.11.0:default +org.json4s:json4s-core_2.11:3.2.10:default +com.fasterxml.jackson.core:jackson-annotations:2.4.4:default +com.fasterxml.jackson.core:jackson-core:2.4.4:default +com.fasterxml.jackson.core:jackson-databind:2.4.4:default +org.json4s:json4s-jackson_2.11:3.2.10:default +org.apache.mesos:mesos:0.21.0:default +com.clearspring.analytics:stream:2.7.0:default +io.dropwizard.metrics:metrics-core:3.1.0:default +io.dropwizard.metrics:metrics-jvm:3.1.0:default +io.dropwizard.metrics:metrics-json:3.1.0:default +io.dropwizard.metrics:metrics-graphite:3.1.0:default +com.fasterxml.jackson.module:jackson-module-scala_2.11:2.4.4:default +org.apache.ivy:ivy:2.4.0:default +oro:oro:2.0.8:default +org.tachyonproject:tachyon:0.5.0:default +org.tachyonproject:tachyon-client:0.5.0:default +org.spark-project:pyrolite:2.0.1:default +net.sf.py4j:py4j:0.8.2.1:default +org.apache.spark:spark-core_2.11:1.3.1:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.apache.tika/tika-app/1.13 b/modules/tests/shared/src/test/resources/resolutions/org.apache.tika/tika-app/1.13 index d66d0f12d2..83f3ab6afb 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.apache.tika/tika-app/1.13 +++ b/modules/tests/shared/src/test/resources/resolutions/org.apache.tika/tika-app/1.13 @@ -1,108 +1,108 @@ -org.apache.tika:tika-core:1.13:compile -org.gagravarr:vorbis-java-tika:0.8:compile -commons-lang:commons-lang:2.6:compile -com.healthmarketscience.jackcess:jackcess:2.1.3:compile -com.healthmarketscience.jackcess:jackcess-encrypt:2.1.1:compile -net.sourceforge.jmatio:jmatio:1.0:compile -org.apache.james:apache-mime4j-core:0.7.2:compile -org.apache.james:apache-mime4j-dom:0.7.2:compile -org.apache.commons:commons-compress:1.11:compile -org.tukaani:xz:1.5:compile -commons-codec:commons-codec:1.10:compile -org.apache.pdfbox:fontbox:2.0.1:compile -org.apache.pdfbox:pdfbox:2.0.1:compile -org.apache.pdfbox:pdfbox-debugger:2.0.1:compile -org.apache.pdfbox:pdfbox-tools:2.0.1:compile -org.apache.pdfbox:jempbox:1.8.12:compile -org.bouncycastle:bcprov-jdk15on:1.54:compile -org.bouncycastle:bcpkix-jdk15on:1.54:compile -org.bouncycastle:bcmail-jdk15on:1.54:compile -org.apache.poi:poi:3.15-beta1:compile -org.apache.poi:poi-scratchpad:3.15-beta1:compile -org.apache.xmlbeans:xmlbeans:2.6.0:compile -org.apache.poi:poi-ooxml-schemas:3.15-beta1:compile -com.github.virtuald:curvesapi:1.03:compile -org.apache.poi:poi-ooxml:3.15-beta1:compile -org.ccil.cowan.tagsoup:tagsoup:1.2.1:compile -org.ow2.asm:asm:5.0.4:compile -com.googlecode.mp4parser:isoparser:1.1.18:compile -com.adobe.xmp:xmpcore:5.1.2:compile -com.drewnoakes:metadata-extractor:2.8.1:compile -de.l3s.boilerpipe:boilerpipe:1.1.0:compile -com.rometools:rome-utils:1.5.1:compile -org.slf4j:slf4j-api:1.7.12:compile -com.rometools:rome:1.5.1:compile -org.gagravarr:vorbis-java-core:0.8:compile -com.googlecode.juniversalchardet:juniversalchardet:1.0.3:compile -org.codelibs:jhighlight:1.0.2:compile -com.pff:java-libpst:0.8.1:compile -org.codehaus.plexus:plexus-utils:1.5.6:compile -org.apache.maven.scm:maven-scm-api:1.4:compile -org.apache.maven.scm:maven-scm-provider-svn-commons:1.4:compile -regexp:regexp:1.3:compile -org.apache.maven.scm:maven-scm-provider-svnexe:1.4:compile -org.apache.commons:commons-vfs2:2.0:compile -com.github.junrar:junrar:0.7:compile -org.codehaus.woodstox:stax2-api:3.1.4:compile -org.codehaus.woodstox:woodstox-core-asl:4.4.1:compile -org.apache.ws.xmlschema:xmlschema-core:2.1.0:compile -org.apache.cxf:cxf-core:3.0.3:compile -org.apache.cxf:cxf-rt-transports-http:3.0.3:compile -javax.ws.rs:javax.ws.rs-api:2.0.1:compile -javax.annotation:javax.annotation-api:1.2:compile -org.apache.cxf:cxf-rt-frontend-jaxrs:3.0.3:compile -org.apache.cxf:cxf-rt-rs-client:3.0.3:compile -org.apache.opennlp:opennlp-maxent:3.0.3:compile -net.sf.jwordnet:jwnl:1.3.3:compile -org.apache.opennlp:opennlp-tools:1.5.3:compile -commons-io:commons-io:2.4:compile -org.apache.commons:commons-exec:1.3:compile -com.googlecode.json-simple:json-simple:1.1.1:compile -org.json:json:20140107:compile -com.google.code.gson:gson:2.6.2:compile -joda-time:joda-time:2.2:compile -net.jcip:jcip-annotations:1.0:compile -edu.ucar:udunits:4.5.5:compile -org.apache.httpcomponents:httpcore:4.2.5:compile -org.apache.httpcomponents:httpclient:4.2.6:compile -org.apache.httpcomponents:httpmime:4.2.6:compile -edu.ucar:httpservices:4.5.5:compile -org.jdom:jdom2:2.0.4:compile -c3p0:c3p0:0.9.1.1:compile -org.quartz-scheduler:quartz:2.2.0:compile -com.google.protobuf:protobuf-java:2.5.0:compile -net.sf.ehcache:ehcache-core:2.6.2:compile -com.google.guava:guava:17.0:compile -org.itadaki:bzip2:0.9.1:compile -com.beust:jcommander:1.35:compile -edu.ucar:cdm:4.5.5:compile -net.java.dev.jna:jna:4.1.0:compile -edu.ucar:netcdf4:4.5.5:compile -org.jsoup:jsoup:1.7.2:compile -edu.ucar:jj2000:5.2:compile -edu.ucar:grib:4.5.5:compile -org.apache.commons:commons-csv:1.0:compile -javax.measure:jsr-275:0.9.3:compile -org.opengis:geoapi:3.0.0:compile -org.apache.sis.core:sis-utility:0.6:compile -org.apache.sis.core:sis-metadata:0.6:compile -org.apache.sis.core:sis-referencing:0.6:compile -org.apache.sis.storage:sis-storage:0.6:compile -org.apache.sis.storage:sis-netcdf:0.6:compile -com.fasterxml.jackson.core:jackson-core:2.7.1:compile -org.apache.tika:tika-parsers:1.13:compile -net.arnx:jsonic:1.2.11:compile -com.intellij:annotations:12.0:compile -com.optimaize.languagedetector:language-detector:0.5:compile -org.apache.tika:tika-langdetect:1.13:compile -org.apache.tika:tika-serialization:1.13:compile -commons-logging:commons-logging:1.2:compile -commons-logging:commons-logging-api:1.1:compile -org.apache.tika:tika-xmp:1.13:compile -log4j:log4j:1.2.17:compile -org.slf4j:slf4j-log4j12:1.7.12:compile -commons-cli:commons-cli:1.3.1:compile -org.apache.tika:tika-batch:1.13:compile -org.slf4j:jul-to-slf4j:1.7.12:compile -org.slf4j:jcl-over-slf4j:1.7.12:compile -org.apache.tika:tika-app:1.13:compile \ No newline at end of file +org.apache.tika:tika-core:1.13:default +org.gagravarr:vorbis-java-tika:0.8:default +commons-lang:commons-lang:2.6:default +com.healthmarketscience.jackcess:jackcess:2.1.3:default +com.healthmarketscience.jackcess:jackcess-encrypt:2.1.1:default +net.sourceforge.jmatio:jmatio:1.0:default +org.apache.james:apache-mime4j-core:0.7.2:default +org.apache.james:apache-mime4j-dom:0.7.2:default +org.apache.commons:commons-compress:1.11:default +org.tukaani:xz:1.5:default +commons-codec:commons-codec:1.10:default +org.apache.pdfbox:fontbox:2.0.1:default +org.apache.pdfbox:pdfbox:2.0.1:default +org.apache.pdfbox:pdfbox-debugger:2.0.1:default +org.apache.pdfbox:pdfbox-tools:2.0.1:default +org.apache.pdfbox:jempbox:1.8.12:default +org.bouncycastle:bcprov-jdk15on:1.54:default +org.bouncycastle:bcpkix-jdk15on:1.54:default +org.bouncycastle:bcmail-jdk15on:1.54:default +org.apache.poi:poi:3.15-beta1:default +org.apache.poi:poi-scratchpad:3.15-beta1:default +org.apache.xmlbeans:xmlbeans:2.6.0:default +org.apache.poi:poi-ooxml-schemas:3.15-beta1:default +com.github.virtuald:curvesapi:1.03:default +org.apache.poi:poi-ooxml:3.15-beta1:default +org.ccil.cowan.tagsoup:tagsoup:1.2.1:default +org.ow2.asm:asm:5.0.4:default +com.googlecode.mp4parser:isoparser:1.1.18:default +com.adobe.xmp:xmpcore:5.1.2:default +com.drewnoakes:metadata-extractor:2.8.1:default +de.l3s.boilerpipe:boilerpipe:1.1.0:default +com.rometools:rome-utils:1.5.1:default +org.slf4j:slf4j-api:1.7.12:default +com.rometools:rome:1.5.1:default +org.gagravarr:vorbis-java-core:0.8:default +com.googlecode.juniversalchardet:juniversalchardet:1.0.3:default +org.codelibs:jhighlight:1.0.2:default +com.pff:java-libpst:0.8.1:default +org.codehaus.plexus:plexus-utils:1.5.6:default +org.apache.maven.scm:maven-scm-api:1.4:default +org.apache.maven.scm:maven-scm-provider-svn-commons:1.4:default +regexp:regexp:1.3:default +org.apache.maven.scm:maven-scm-provider-svnexe:1.4:default +org.apache.commons:commons-vfs2:2.0:default +com.github.junrar:junrar:0.7:default +org.codehaus.woodstox:stax2-api:3.1.4:default +org.codehaus.woodstox:woodstox-core-asl:4.4.1:default +org.apache.ws.xmlschema:xmlschema-core:2.1.0:default +org.apache.cxf:cxf-core:3.0.3:default +org.apache.cxf:cxf-rt-transports-http:3.0.3:default +javax.ws.rs:javax.ws.rs-api:2.0.1:default +javax.annotation:javax.annotation-api:1.2:default +org.apache.cxf:cxf-rt-frontend-jaxrs:3.0.3:default +org.apache.cxf:cxf-rt-rs-client:3.0.3:default +org.apache.opennlp:opennlp-maxent:3.0.3:default +net.sf.jwordnet:jwnl:1.3.3:default +org.apache.opennlp:opennlp-tools:1.5.3:default +commons-io:commons-io:2.4:default +org.apache.commons:commons-exec:1.3:default +com.googlecode.json-simple:json-simple:1.1.1:default +org.json:json:20140107:default +com.google.code.gson:gson:2.6.2:default +joda-time:joda-time:2.2:default +net.jcip:jcip-annotations:1.0:default +edu.ucar:udunits:4.5.5:default +org.apache.httpcomponents:httpcore:4.2.5:default +org.apache.httpcomponents:httpclient:4.2.6:default +org.apache.httpcomponents:httpmime:4.2.6:default +edu.ucar:httpservices:4.5.5:default +org.slf4j:jcl-over-slf4j:1.7.12:default +org.jdom:jdom2:2.0.4:default +c3p0:c3p0:0.9.1.1:default +org.quartz-scheduler:quartz:2.2.0:default +com.google.protobuf:protobuf-java:2.5.0:default +net.sf.ehcache:ehcache-core:2.6.2:default +com.google.guava:guava:17.0:default +org.itadaki:bzip2:0.9.1:default +com.beust:jcommander:1.35:default +edu.ucar:cdm:4.5.5:default +net.java.dev.jna:jna:4.1.0:default +edu.ucar:netcdf4:4.5.5:default +org.jsoup:jsoup:1.7.2:default +edu.ucar:jj2000:5.2:default +edu.ucar:grib:4.5.5:default +org.apache.commons:commons-csv:1.0:default +javax.measure:jsr-275:0.9.3:default +org.opengis:geoapi:3.0.0:default +org.apache.sis.core:sis-utility:0.6:default +org.apache.sis.core:sis-metadata:0.6:default +org.apache.sis.core:sis-referencing:0.6:default +org.apache.sis.storage:sis-storage:0.6:default +org.apache.sis.storage:sis-netcdf:0.6:default +com.fasterxml.jackson.core:jackson-core:2.7.1:default +org.apache.tika:tika-parsers:1.13:default +net.arnx:jsonic:1.2.11:default +com.intellij:annotations:12.0:default +com.optimaize.languagedetector:language-detector:0.5:default +org.apache.tika:tika-langdetect:1.13:default +org.apache.tika:tika-serialization:1.13:default +commons-logging:commons-logging:1.2:default +commons-logging:commons-logging-api:1.1:default +org.apache.tika:tika-xmp:1.13:default +log4j:log4j:1.2.17:default +org.slf4j:slf4j-log4j12:1.7.12:default +commons-cli:commons-cli:1.3.1:default +org.apache.tika:tika-batch:1.13:default +org.slf4j:jul-to-slf4j:1.7.12:default +org.apache.tika:tika-app:1.13:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.apache.ws.commons/XmlSchema/1.1 b/modules/tests/shared/src/test/resources/resolutions/org.apache.ws.commons/XmlSchema/1.1 index 31944e2578..9d609e615e 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.apache.ws.commons/XmlSchema/1.1 +++ b/modules/tests/shared/src/test/resources/resolutions/org.apache.ws.commons/XmlSchema/1.1 @@ -1,2 +1,2 @@ -stax:stax-api:1.0:compile -org.apache.ws.commons:XmlSchema:1.1:compile \ No newline at end of file +stax:stax-api:1.0:default +org.apache.ws.commons:XmlSchema:1.1:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.bytedeco.javacpp-presets/opencv/3.0.0-1.1 b/modules/tests/shared/src/test/resources/resolutions/org.bytedeco.javacpp-presets/opencv/3.0.0-1.1 index 227790ceb5..c5ce7a9dde 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.bytedeco.javacpp-presets/opencv/3.0.0-1.1 +++ b/modules/tests/shared/src/test/resources/resolutions/org.bytedeco.javacpp-presets/opencv/3.0.0-1.1 @@ -1,2 +1,2 @@ -org.bytedeco:javacpp:1.1:compile -org.bytedeco.javacpp-presets:opencv:3.0.0-1.1:compile \ No newline at end of file +org.bytedeco:javacpp:1.1:default +org.bytedeco.javacpp-presets:opencv:3.0.0-1.1:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.codehaus.plexus/plexus/1.0.4 b/modules/tests/shared/src/test/resources/resolutions/org.codehaus.plexus/plexus/1.0.4 index d2b345eca2..4190cd283b 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.codehaus.plexus/plexus/1.0.4 +++ b/modules/tests/shared/src/test/resources/resolutions/org.codehaus.plexus/plexus/1.0.4 @@ -1 +1 @@ -org.codehaus.plexus:plexus:1.0.4:compile \ No newline at end of file +org.codehaus.plexus:plexus:1.0.4:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.datavec/datavec-api/0.9.1 b/modules/tests/shared/src/test/resources/resolutions/org.datavec/datavec-api/0.9.1 index 3945047f55..e570f510ea 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.datavec/datavec-api/0.9.1 +++ b/modules/tests/shared/src/test/resources/resolutions/org.datavec/datavec-api/0.9.1 @@ -1,27 +1,27 @@ -org.apache.commons:commons-compress:1.8.1:compile -org.apache.commons:commons-lang3:3.3.1:compile -org.apache.commons:commons-math3:3.4.1:compile -commons-io:commons-io:2.4:compile -org.slf4j:slf4j-api:1.7.10:compile -joda-time:joda-time:2.9.2:compile -org.yaml:snakeyaml:1.12:compile -org.codehaus.woodstox:stax2-api:3.1.4:compile -org.nd4j:jackson:0.9.1:compile -org.projectlombok:lombok:1.16.16:compile -org.freemarker:freemarker:2.3.23:compile -com.google.guava:guava:18.0:compile -org.javassist:javassist:3.18.2-GA:compile -org.reflections:reflections:0.9.10:compile -com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1:compile -org.nd4j:nd4j-common:0.9.1:compile -org.nd4j:nd4j-context:0.9.1:compile -org.bytedeco:javacpp:1.3.3:compile -org.nd4j:nd4j-buffer:0.9.1:compile -junit:junit:4.8.2:compile -net.ericaro:neoitertools:1.0.0:compile -com.google.code.findbugs:annotations:2.0.1:compile -org.nd4j:nd4j-api:0.9.1:compile -it.unimi.dsi:fastutil:6.5.7:compile -com.clearspring.analytics:stream:2.7.0:compile -net.sf.opencsv:opencsv:2.3:compile -org.datavec:datavec-api:0.9.1:compile \ No newline at end of file +org.apache.commons:commons-compress:1.8.1:default +org.apache.commons:commons-lang3:3.3.1:default +org.apache.commons:commons-math3:3.4.1:default +commons-io:commons-io:2.4:default +org.slf4j:slf4j-api:1.7.10:default +joda-time:joda-time:2.9.2:default +org.yaml:snakeyaml:1.12:default +org.codehaus.woodstox:stax2-api:3.1.4:default +org.nd4j:jackson:0.9.1:default +org.projectlombok:lombok:1.16.16:default +org.freemarker:freemarker:2.3.23:default +com.google.guava:guava:18.0:default +org.javassist:javassist:3.18.2-GA:default +org.reflections:reflections:0.9.10:default +com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1:default +org.nd4j:nd4j-common:0.9.1:default +org.nd4j:nd4j-context:0.9.1:default +org.bytedeco:javacpp:1.3.3:default +org.nd4j:nd4j-buffer:0.9.1:default +junit:junit:4.8.2:default +net.ericaro:neoitertools:1.0.0:default +com.google.code.findbugs:annotations:2.0.1:default +org.nd4j:nd4j-api:0.9.1:default +it.unimi.dsi:fastutil:6.5.7:default +com.clearspring.analytics:stream:2.7.0:default +net.sf.opencsv:opencsv:2.3:default +org.datavec:datavec-api:0.9.1:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.deeplearning4j/deeplearning4j-core/0.8.0 b/modules/tests/shared/src/test/resources/resolutions/org.deeplearning4j/deeplearning4j-core/0.8.0 index afe3cb191e..11622ea08a 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.deeplearning4j/deeplearning4j-core/0.8.0 +++ b/modules/tests/shared/src/test/resources/resolutions/org.deeplearning4j/deeplearning4j-core/0.8.0 @@ -1,59 +1,59 @@ -org.slf4j:slf4j-api:1.7.12:compile -org.yaml:snakeyaml:1.12:compile -org.codehaus.woodstox:stax2-api:3.1.4:compile -joda-time:joda-time:2.9.2:compile -org.nd4j:jackson:0.8.0:compile -org.projectlombok:lombok:1.16.10:compile -com.google.guava:guava:18.0:compile -org.javassist:javassist:3.18.2-GA:compile -com.google.code.findbugs:annotations:2.0.1:compile -org.reflections:reflections:0.9.10:compile -commons-io:commons-io:2.4:compile -org.apache.commons:commons-math3:3.4.1:compile -org.apache.commons:commons-lang3:3.3.1:compile -org.nd4j:nd4j-common:0.8.0:compile -org.nd4j:nd4j-context:0.8.0:compile -org.bytedeco:javacpp:1.3.2:compile -org.nd4j:nd4j-buffer:0.8.0:compile -junit:junit:4.8.2:compile -net.ericaro:neoitertools:1.0.0:compile -org.nd4j:nd4j-api:0.8.0:compile -org.apache.commons:commons-compress:1.8.1:compile -org.deeplearning4j:deeplearning4j-nn:0.8.0:compile -org.bytedeco.javacpp-presets:hdf5:1.10.0-patch1-1.3:compile -org.bytedeco.javacpp-presets:hdf5-platform:1.10.0-patch1-1.3:compile -org.deeplearning4j:deeplearning4j-modelimport:0.8.0:compile -org.json:json:20131018:compile -org.freemarker:freemarker:2.3.23:compile -it.unimi.dsi:fastutil:6.5.7:compile -com.clearspring.analytics:stream:2.7.0:compile -org.datavec:datavec-api:0.8.0:compile -org.datavec:datavec-nd4j-common:0.8.0:compile -com.github.jai-imageio:jai-imageio-core:1.3.0:compile -com.twelvemonkeys.common:common-lang:3.1.1:compile -com.twelvemonkeys.common:common-io:3.1.1:compile -com.twelvemonkeys.common:common-image:3.1.1:compile -com.twelvemonkeys.imageio:imageio-core:3.1.1:compile -com.twelvemonkeys.imageio:imageio-metadata:3.1.1:compile -com.twelvemonkeys.imageio:imageio-jpeg:3.1.1:compile -com.twelvemonkeys.imageio:imageio-tiff:3.1.1:compile -com.twelvemonkeys.imageio:imageio-psd:3.1.1:compile -com.twelvemonkeys.imageio:imageio-bmp:3.1.1:compile -org.bytedeco.javacpp-presets:opencv:3.1.0-1.3:compile -org.bytedeco.javacpp-presets:ffmpeg:3.2.1-1.3:compile -org.bytedeco.javacpp-presets:flycapture:2.9.3.43-1.3:compile -org.bytedeco.javacpp-presets:libdc1394:2.2.4-1.3:compile -org.bytedeco.javacpp-presets:libfreenect:0.5.3-1.3:compile -org.bytedeco.javacpp-presets:libfreenect2:0.2.0-1.3:compile -org.bytedeco.javacpp-presets:librealsense:1.9.6-1.3:compile -org.bytedeco.javacpp-presets:videoinput:0.200-1.3:compile -org.bytedeco.javacpp-presets:artoolkitplus:2.3.1-1.3:compile -org.bytedeco.javacpp-presets:flandmark:1.07-1.3:compile -org.bytedeco:javacv:1.3.1:compile -org.bytedeco.javacpp-presets:opencv-platform:3.1.0-1.3:compile -org.bytedeco.javacpp-presets:leptonica:1.73-1.3:compile -org.bytedeco.javacpp-presets:leptonica-platform:1.73-1.3:compile -org.datavec:datavec-data-image:0.8.0:compile -org.deeplearning4j:deeplearning4j-ui-components:0.8.0:compile -commons-codec:commons-codec:1.10:compile -org.deeplearning4j:deeplearning4j-core:0.8.0:compile \ No newline at end of file +org.slf4j:slf4j-api:1.7.12:default +org.yaml:snakeyaml:1.12:default +org.codehaus.woodstox:stax2-api:3.1.4:default +joda-time:joda-time:2.9.2:default +org.nd4j:jackson:0.8.0:default +org.projectlombok:lombok:1.16.10:default +com.google.guava:guava:18.0:default +org.javassist:javassist:3.18.2-GA:default +com.google.code.findbugs:annotations:2.0.1:default +org.reflections:reflections:0.9.10:default +commons-io:commons-io:2.4:default +org.apache.commons:commons-math3:3.4.1:default +org.apache.commons:commons-lang3:3.3.1:default +org.nd4j:nd4j-common:0.8.0:default +org.nd4j:nd4j-context:0.8.0:default +org.bytedeco:javacpp:1.3.2:default +org.nd4j:nd4j-buffer:0.8.0:default +junit:junit:4.8.2:default +net.ericaro:neoitertools:1.0.0:default +org.nd4j:nd4j-api:0.8.0:default +org.apache.commons:commons-compress:1.8.1:default +org.deeplearning4j:deeplearning4j-nn:0.8.0:default +org.bytedeco.javacpp-presets:hdf5:1.10.0-patch1-1.3:default +org.bytedeco.javacpp-presets:hdf5-platform:1.10.0-patch1-1.3:default +org.deeplearning4j:deeplearning4j-modelimport:0.8.0:default +org.json:json:20131018:default +org.freemarker:freemarker:2.3.23:default +it.unimi.dsi:fastutil:6.5.7:default +com.clearspring.analytics:stream:2.7.0:default +org.datavec:datavec-api:0.8.0:default +org.datavec:datavec-nd4j-common:0.8.0:default +com.github.jai-imageio:jai-imageio-core:1.3.0:default +com.twelvemonkeys.common:common-lang:3.1.1:default +com.twelvemonkeys.common:common-io:3.1.1:default +com.twelvemonkeys.common:common-image:3.1.1:default +com.twelvemonkeys.imageio:imageio-core:3.1.1:default +com.twelvemonkeys.imageio:imageio-metadata:3.1.1:default +com.twelvemonkeys.imageio:imageio-jpeg:3.1.1:default +com.twelvemonkeys.imageio:imageio-tiff:3.1.1:default +com.twelvemonkeys.imageio:imageio-psd:3.1.1:default +com.twelvemonkeys.imageio:imageio-bmp:3.1.1:default +org.bytedeco.javacpp-presets:opencv:3.1.0-1.3:default +org.bytedeco.javacpp-presets:ffmpeg:3.2.1-1.3:default +org.bytedeco.javacpp-presets:flycapture:2.9.3.43-1.3:default +org.bytedeco.javacpp-presets:libdc1394:2.2.4-1.3:default +org.bytedeco.javacpp-presets:libfreenect:0.5.3-1.3:default +org.bytedeco.javacpp-presets:libfreenect2:0.2.0-1.3:default +org.bytedeco.javacpp-presets:librealsense:1.9.6-1.3:default +org.bytedeco.javacpp-presets:videoinput:0.200-1.3:default +org.bytedeco.javacpp-presets:artoolkitplus:2.3.1-1.3:default +org.bytedeco.javacpp-presets:flandmark:1.07-1.3:default +org.bytedeco:javacv:1.3.1:default +org.bytedeco.javacpp-presets:opencv-platform:3.1.0-1.3:default +org.bytedeco.javacpp-presets:leptonica:1.73-1.3:default +org.bytedeco.javacpp-presets:leptonica-platform:1.73-1.3:default +org.datavec:datavec-data-image:0.8.0:default +org.deeplearning4j:deeplearning4j-ui-components:0.8.0:default +commons-codec:commons-codec:1.10:default +org.deeplearning4j:deeplearning4j-core:0.8.0:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.drools/drools-compiler/7.0.0.Final b/modules/tests/shared/src/test/resources/resolutions/org.drools/drools-compiler/7.0.0.Final index f06451ba04..ca5714ebf4 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.drools/drools-compiler/7.0.0.Final +++ b/modules/tests/shared/src/test/resources/resolutions/org.drools/drools-compiler/7.0.0.Final @@ -1,13 +1,13 @@ -org.mvel:mvel2:2.3.0.Final:compile -org.slf4j:slf4j-api:1.7.7:compile -org.kie:kie-api:7.0.0.Final:compile -org.kie:kie-internal:7.0.0.Final:compile -commons-codec:commons-codec:1.10:compile -org.drools:drools-core:7.0.0.Final:compile -org.antlr:antlr-runtime:3.5:compile -org.eclipse.jdt.core.compiler:ecj:4.4.2:compile -xmlpull:xmlpull:1.1.3.1:compile -xpp3:xpp3_min:1.1.4c:compile -com.thoughtworks.xstream:xstream:1.4.9:compile -com.google.protobuf:protobuf-java:2.6.0:compile -org.drools:drools-compiler:7.0.0.Final:compile \ No newline at end of file +org.mvel:mvel2:2.3.0.Final:default +org.slf4j:slf4j-api:1.7.7:default +org.kie:kie-api:7.0.0.Final:default +org.kie:kie-internal:7.0.0.Final:default +commons-codec:commons-codec:1.10:default +org.drools:drools-core:7.0.0.Final:default +org.antlr:antlr-runtime:3.5:default +org.eclipse.jdt.core.compiler:ecj:4.4.2:default +xmlpull:xmlpull:1.1.3.1:default +xpp3:xpp3_min:1.1.4c:default +com.thoughtworks.xstream:xstream:1.4.9:default +com.google.protobuf:protobuf-java:2.6.0:default +org.drools:drools-compiler:7.0.0.Final:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.ensime/sbt-ensime/sbtVersion_0.13_scalaVersion_2.10/1.12.+ b/modules/tests/shared/src/test/resources/resolutions/org.ensime/sbt-ensime/sbtVersion_0.13_scalaVersion_2.10/1.12.+ index cf600ad0bd..1a343773b5 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.ensime/sbt-ensime/sbtVersion_0.13_scalaVersion_2.10/1.12.+ +++ b/modules/tests/shared/src/test/resources/resolutions/org.ensime/sbt-ensime/sbtVersion_0.13_scalaVersion_2.10/1.12.+ @@ -1,9 +1,9 @@ -org.scala-lang:scala-library:2.10.6:compile -org.scalariform:scalariform_2.10:0.1.4:compile -org.scala-lang:scala-reflect:2.10.4:compile -org.scalamacros:quasiquotes_2.10:2.1.0:compile -org.scalaz:scalaz-core_2.10:7.2.12:compile -org.scalaz:scalaz-effect_2.10:7.2.12:compile -org.scalaz:scalaz-concurrent_2.10:7.2.12:compile -org.jsoup:jsoup:1.10.2:compile -org.ensime:sbt-ensime;sbtVersion=0.13;scalaVersion=2.10:1.12.12:compile \ No newline at end of file +org.scala-lang:scala-library:2.10.6:default +org.scalariform:scalariform_2.10:0.1.4:default +org.scala-lang:scala-reflect:2.10.4:default +org.scalamacros:quasiquotes_2.10:2.1.0:default +org.scalaz:scalaz-core_2.10:7.2.12:default +org.scalaz:scalaz-effect_2.10:7.2.12:default +org.scalaz:scalaz-concurrent_2.10:7.2.12:default +org.jsoup:jsoup:1.10.2:default +org.ensime:sbt-ensime;sbtVersion=0.13;scalaVersion=2.10:1.12.12:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.glassfish.jersey.core/jersey-client/2.19 b/modules/tests/shared/src/test/resources/resolutions/org.glassfish.jersey.core/jersey-client/2.19 index 00702a21b5..32af864721 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.glassfish.jersey.core/jersey-client/2.19 +++ b/modules/tests/shared/src/test/resources/resolutions/org.glassfish.jersey.core/jersey-client/2.19 @@ -1,13 +1,13 @@ -javax.ws.rs:javax.ws.rs-api:2.0.1:compile -javax.annotation:javax.annotation-api:1.2:compile -org.glassfish.jersey.bundles.repackaged:jersey-guava:2.19:compile -org.glassfish.hk2:hk2-utils:2.4.0-b25:compile -org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b25:compile -org.glassfish.hk2:hk2-api:2.4.0-b25:compile -org.glassfish.hk2.external:javax.inject:2.4.0-b25:compile -javax.inject:javax.inject:1:compile -org.javassist:javassist:3.18.1-GA:compile -org.glassfish.hk2:hk2-locator:2.4.0-b25:compile -org.glassfish.hk2:osgi-resource-locator:1.0.1:compile -org.glassfish.jersey.core:jersey-common:2.19:compile -org.glassfish.jersey.core:jersey-client:2.19:compile \ No newline at end of file +javax.ws.rs:javax.ws.rs-api:2.0.1:default +javax.annotation:javax.annotation-api:1.2:default +org.glassfish.jersey.bundles.repackaged:jersey-guava:2.19:default +org.glassfish.hk2:hk2-utils:2.4.0-b25:default +org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b25:default +org.glassfish.hk2:hk2-api:2.4.0-b25:default +org.glassfish.hk2.external:javax.inject:2.4.0-b25:default +javax.inject:javax.inject:1:default +org.javassist:javassist:3.18.1-GA:default +org.glassfish.hk2:hk2-locator:2.4.0-b25:default +org.glassfish.hk2:osgi-resource-locator:1.0.1:default +org.glassfish.jersey.core:jersey-common:2.19:default +org.glassfish.jersey.core:jersey-client:2.19:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.jboss.resteasy/resteasy-jaxrs/3.0.9.Final b/modules/tests/shared/src/test/resources/resolutions/org.jboss.resteasy/resteasy-jaxrs/3.0.9.Final index 7abbfbfb21..219d640e53 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.jboss.resteasy/resteasy-jaxrs/3.0.9.Final +++ b/modules/tests/shared/src/test/resources/resolutions/org.jboss.resteasy/resteasy-jaxrs/3.0.9.Final @@ -1,10 +1,10 @@ -org.jboss.resteasy:jaxrs-api:3.0.9.Final:compile -org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:1.0.1.Final:compile -javax.activation:activation:1.1:compile -org.apache.httpcomponents:httpcore:4.2.5:compile -commons-logging:commons-logging:1.1.1:compile -commons-codec:commons-codec:1.6:compile -org.apache.httpcomponents:httpclient:4.2.6:compile -commons-io:commons-io:2.1:compile -net.jcip:jcip-annotations:1.0:compile -org.jboss.resteasy:resteasy-jaxrs:3.0.9.Final:compile \ No newline at end of file +org.jboss.resteasy:jaxrs-api:3.0.9.Final:default +org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:1.0.1.Final:default +javax.activation:activation:1.1:default +org.apache.httpcomponents:httpcore:4.2.5:default +commons-logging:commons-logging:1.1.1:default +commons-codec:commons-codec:1.6:default +org.apache.httpcomponents:httpclient:4.2.6:default +commons-io:commons-io:2.1:default +net.jcip:jcip-annotations:1.0:default +org.jboss.resteasy:resteasy-jaxrs:3.0.9.Final:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.jitsi/jitsi-videobridge/1.0-SNAPSHOT b/modules/tests/shared/src/test/resources/resolutions/org.jitsi/jitsi-videobridge/1.0-SNAPSHOT index d73b19b339..007d72645b 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.jitsi/jitsi-videobridge/1.0-SNAPSHOT +++ b/modules/tests/shared/src/test/resources/resolutions/org.jitsi/jitsi-videobridge/1.0-SNAPSHOT @@ -1,94 +1,95 @@ -org.apache.httpcomponents:httpcore:4.4.1:compile -org.apache.httpcomponents:httpcore-nio:4.4.1:compile -commons-logging:commons-logging:1.2:compile -commons-codec:commons-codec:1.6:compile -org.apache.httpcomponents:httpclient:4.4.1:compile -org.apache.httpcomponents:httpasyncclient:4.1:compile -org.apache.commons:commons-lang3:3.3.2:compile -org.hamcrest:hamcrest-core:1.1:compile -junit:junit:4.10:compile -com.googlecode.json-simple:json-simple:1.1.1:compile -com.google.code.gson:gson:2.3.1:compile -io.netty:netty:3.10.4.Final:compile -org.slf4j:slf4j-api:1.7.12:compile -com.ning:async-http-client:1.9.31:compile -org.apache.logging.log4j:log4j-api:2.3:compile -org.apache.logging.log4j:log4j-core:2.3:compile -org.slf4j:slf4j-simple:1.6.1:compile -org.bitbucket.b_c:jose4j:0.5.1:compile -io.callstats:callstats-java-sdk:4.1.1:compile -xml-apis:xml-apis:1.0.b2:compile -dom4j:dom4j:1.6.1:compile -javax.servlet:javax.servlet-api:3.1.0:compile -org.eclipse.jetty:jetty-util:9.2.10.v20150310:compile -org.eclipse.jetty:jetty-http:9.2.10.v20150310:compile -org.eclipse.jetty:jetty-io:9.2.10.v20150310:compile -org.eclipse.jetty:jetty-server:9.2.10.v20150310:compile -org.eclipse.jetty:jetty-client:9.2.10.v20150310:compile -org.eclipse.jetty:jetty-rewrite:9.2.10.v20150310:compile -org.eclipse.jetty.websocket:websocket-api:9.2.10.v20150310:compile -org.eclipse.jetty.websocket:websocket-common:9.2.10.v20150310:compile -org.eclipse.jetty.websocket:websocket-client:9.2.10.v20150310:compile -org.eclipse.jetty.websocket:websocket-servlet:9.2.10.v20150310:compile -org.eclipse.jetty:jetty-security:9.2.10.v20150310:compile -org.eclipse.jetty:jetty-servlet:9.2.10.v20150310:compile -org.eclipse.jetty.websocket:websocket-server:9.2.10.v20150310:compile -log4j:log4j:1.2.15:compile -org.fusesource:sigar:1.6.4:compile -net.jcip:jcip-annotations:1.0:compile -org.gnu.inet:libidn:1.15:compile -com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.0_jdk5:compile -org.igniterealtime:tinder:1.2.3:compile -xpp3:xpp3:1.1.4c:compile -com.github.igniterealtime:jbosh:06ee5a43a0:compile -org.igniterealtime.smack:smack:3.2.2-jitsi-2-20170425.180420-2:compile -com.jcraft:jzlib:1.1.3:compile -org.igniterealtime.smack:smackx:3.2.2-jitsi-2-20170425.180420-2:compile -xmlpull:xmlpull:1.1.3.4a:compile -org.eclipse.jetty:jetty-xml:7.0.1.v20091125:compile -org.eclipse.jetty:jetty-webapp:7.0.1.v20091125:compile -org.igniterealtime.whack:core:2.0.0:compile -org.jitsi:fmj:1.0-20160121.172939-10:compile -org.opentelecoms.sdp:sdp-api:1.0:compile -org.jitsi:jain-sip-ri-ossonly:1.2.98c7f8c-jitsi-oss1:compile -org.opentelecoms.sdp:java-sdp-nist-bridge:1.1:compile -org.bitlet:weupnp:0.1.4:compile -org.jitsi:ice4j:1.0:compile -org.eclipse.jetty:jetty-proxy:9.2.10.v20150310:compile -org.osgi:org.osgi.core:4.3.1:compile -org.jitsi:jitsi-android-osgi:1.0-20150723.002702-1:compile -ch.imvs:sdes4j:1.1.3:compile -net.java.dev.jna:jna:4.1.0:compile -org.bouncycastle:bcprov-jdk15on:1.54:compile -org.bouncycastle:bcpkix-jdk15on:1.54:compile -org.jitsi:bccontrib:1.0:compile -org.jitsi:zrtp4j-light:3.2.0-jitsi-1-20150723.002345-1:compile -org.jitsi:libjitsi:1.0-20170606.180648-284:compile -org.jitsi:jitsi-protocol:2.9-20151211.202410-3:compile -dnsjava:dnsjava:2.1.7:compile -org.jitsi:jitsi-dnsservice:2.9-20150723.181644-1:compile -org.jitsi:jitsi-netaddr:2.9-20150723.181645-1:compile -org.jitsi:jitsi-protocol-media:2.9-20150723.181646-1:compile -javax.activation:activation:1.1:compile -javax.mail:mail:1.4:compile -javax.jms:jms:1.1:compile -com.sun.jdmk:jmxtools:1.2.1:compile -com.sun.jmx:jmxri:1.2.1:compile -commons-lang:commons-lang:2.4:compile -org.xmpp:jnsapi:0.0.3-jitsi-1-20151013.145326-2:compile -org.jitsi:jitsi-protocol-jabber:2.9-20161228.174152-22:compile -org.apache.felix:org.apache.felix.framework:4.4.0:compile -org.apache.felix:org.apache.felix.main:4.4.0:compile -com.yuvimasory:orange-extensions:1.3.0:compile -org.jitsi:jitsi-util:2.9-20150723.181654-1:compile -org.jitsi:jitsi-ui-service:2.9-20150723.181654-1:compile -org.jitsi:jicoco:1.0-20160109.203023-16:compile -com.google.guava:guava:15.0:compile -org.jitsi:jitsi-configuration:2.9-20150723.181638-1:compile -org.jitsi:jitsi-fileaccess:2.9-20150723.181644-1:compile -org.jitsi:jitsi-packetlogging:2.9-20151104.171808-2:compile -org.jitsi:jitsi-resourcemanager:2.9-20150723.181652-1:compile -org.slf4j:slf4j-jdk14:1.7.7:compile -org.slf4j:osgi-over-slf4j:1.7.7:compile -org.slf4j:jul-to-slf4j:1.7.7:compile -org.jitsi:jitsi-videobridge:1.0-SNAPSHOT:compile \ No newline at end of file +org.apache.httpcomponents:httpcore:4.4.1:default +org.apache.httpcomponents:httpcore-nio:4.4.1:default +commons-logging:commons-logging:1.2:default +commons-codec:commons-codec:1.6:default +org.apache.httpcomponents:httpclient:4.4.1:default +org.apache.httpcomponents:httpasyncclient:4.1:default +org.apache.commons:commons-lang3:3.3.2:default +org.hamcrest:hamcrest-core:1.1:default +junit:junit:4.10:default +com.googlecode.json-simple:json-simple:1.1.1:default +com.google.code.gson:gson:2.3.1:default +io.netty:netty:3.10.4.Final:default +org.slf4j:slf4j-api:1.7.12:default +com.ning:async-http-client:1.9.31:default +org.apache.logging.log4j:log4j-api:2.3:default +org.apache.logging.log4j:log4j-core:2.3:default +org.slf4j:slf4j-simple:1.6.1:default +org.bitbucket.b_c:jose4j:0.5.1:default +io.callstats:callstats-java-sdk:4.1.1:default +xml-apis:xml-apis:1.0.b2:default +dom4j:dom4j:1.6.1:default +javax.servlet:javax.servlet-api:3.1.0:default +org.eclipse.jetty:jetty-util:9.2.10.v20150310:default +org.eclipse.jetty:jetty-http:9.2.10.v20150310:default +org.eclipse.jetty:jetty-io:9.2.10.v20150310:default +org.eclipse.jetty:jetty-server:9.2.10.v20150310:default +org.eclipse.jetty:jetty-client:9.2.10.v20150310:default +org.eclipse.jetty:jetty-rewrite:9.2.10.v20150310:default +org.eclipse.jetty.websocket:websocket-api:9.2.10.v20150310:default +org.eclipse.jetty.websocket:websocket-common:9.2.10.v20150310:default +org.eclipse.jetty.websocket:websocket-client:9.2.10.v20150310:default +org.eclipse.jetty.websocket:websocket-servlet:9.2.10.v20150310:default +org.eclipse.jetty:jetty-security:9.2.10.v20150310:default +org.eclipse.jetty:jetty-servlet:9.2.10.v20150310:default +org.eclipse.jetty.websocket:websocket-server:9.2.10.v20150310:default +log4j:log4j:1.2.15:default +org.fusesource:sigar:1.6.4:default +net.jcip:jcip-annotations:1.0:default +org.gnu.inet:libidn:1.15:default +com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.0_jdk5:default +org.igniterealtime:tinder:1.2.3:default +xpp3:xpp3:1.1.4c:default +com.github.igniterealtime:jbosh:06ee5a43a0:default +org.igniterealtime.smack:smack:3.2.2-jitsi-2-20170425.180420-2:default +com.jcraft:jzlib:1.1.3:default +org.igniterealtime.smack:smackx:3.2.2-jitsi-2-20170425.180420-2:default +xmlpull:xmlpull:1.1.3.4a:default +org.eclipse.jetty:jetty-xml:7.0.1.v20091125:default +org.eclipse.jetty:jetty-webapp:7.0.1.v20091125:default +org.igniterealtime.whack:core:2.0.0:default +org.jitsi:fmj:1.0-20160121.172939-10:default +org.opentelecoms.sdp:sdp-api:1.0:default +org.jitsi:jain-sip-ri-ossonly:1.2.98c7f8c-jitsi-oss1:default +org.opentelecoms.sdp:java-sdp-nist-bridge:1.1:default +org.bitlet:weupnp:0.1.4:default +org.jitsi:ice4j:1.0:default +org.eclipse.jetty:jetty-proxy:9.2.10.v20150310:default +org.osgi:org.osgi.core:4.3.1:default +org.jitsi:jitsi-android-osgi:1.0-20150723.002702-1:default +ch.imvs:sdes4j:1.1.3:default +net.java.dev.jna:jna:4.1.0:default +org.bouncycastle:bcprov-jdk15on:1.54:default +org.bouncycastle:bcpkix-jdk15on:1.54:default +org.jitsi:bccontrib:1.0:default +org.jitsi:zrtp4j-light:3.2.0-jitsi-1-20150723.002345-1:default +org.jitsi:libjitsi:1.0-20170606.180648-284:default +org.jitsi:jitsi-protocol:2.9-20151211.202410-3:default +dnsjava:dnsjava:2.1.7:default +org.jitsi:jitsi-dnsservice:2.9-20150723.181644-1:default +org.jitsi:jitsi-netaddr:2.9-20150723.181645-1:default +org.jitsi:jitsi-protocol-media:2.9-20150723.181646-1:default +javax.activation:activation:1.1:default +javax.mail:mail:1.4:default +javax.jms:jms:1.1:default +com.sun.jdmk:jmxtools:1.2.1:default +com.sun.jmx:jmxri:1.2.1:default +commons-lang:commons-lang:2.4:default +org.xmpp:jnsapi:0.0.3-jitsi-1-20151013.145326-2:default +org.jitsi:jitsi-protocol-jabber:2.9-20161228.174152-22:default +org.apache.felix:org.apache.felix.framework:4.4.0:default +org.apache.felix:org.apache.felix.main:4.4.0:default +com.yuvimasory:orange-extensions:1.3.0:default +org.jitsi:jitsi-util:2.9-20150723.181654-1:default +org.jitsi:jitsi-ui-service:2.9-20150723.181654-1:default +org.jitsi:jicoco:1.0-20160109.203023-16:default +com.google.guava:guava:15.0:default +org.jitsi:jitsi-configuration:2.9-20150723.181638-1:default +org.jitsi:jitsi-fileaccess:2.9-20150723.181644-1:default +org.jitsi:jitsi-packetlogging:2.9-20151104.171808-2:default +org.jitsi:jitsi-resourcemanager:2.9-20150723.181652-1:default +org.slf4j:slf4j-jdk14:1.7.7:default +org.slf4j:osgi-over-slf4j:1.7.7:default +org.slf4j:jul-to-slf4j:1.7.7:default +rusv:agafua-syslog:0.4:default +org.jitsi:jitsi-videobridge:1.0-SNAPSHOT:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.kie/kie-api/6.5.0.Final b/modules/tests/shared/src/test/resources/resolutions/org.kie/kie-api/6.5.0.Final index 2d4603f21e..65e878976c 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.kie/kie-api/6.5.0.Final +++ b/modules/tests/shared/src/test/resources/resolutions/org.kie/kie-api/6.5.0.Final @@ -1,2 +1,2 @@ -org.slf4j:slf4j-api:1.7.2:compile -org.kie:kie-api:6.5.0.Final:compile \ No newline at end of file +org.slf4j:slf4j-api:1.7.2:default +org.kie:kie-api:6.5.0.Final:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.nd4j/nd4j-native/0.5.0 b/modules/tests/shared/src/test/resources/resolutions/org.nd4j/nd4j-native/0.5.0 index 08a9eeaf36..55c85ae1e7 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.nd4j/nd4j-native/0.5.0 +++ b/modules/tests/shared/src/test/resources/resolutions/org.nd4j/nd4j-native/0.5.0 @@ -1,17 +1,17 @@ -org.nd4j:nd4j-backend-impls:0.5.0:compile -org.slf4j:slf4j-api:1.7.10:compile -com.google.guava:guava:18.0:compile -org.javassist:javassist:3.18.2-GA:compile -com.google.code.findbugs:annotations:2.0.1:compile -org.reflections:reflections:0.9.10:compile -commons-io:commons-io:2.4:compile -org.apache.commons:commons-math3:3.4.1:compile -org.apache.commons:commons-lang3:3.3.1:compile -org.nd4j:nd4j-common:0.5.0:compile -org.nd4j:nd4j-context:0.5.0:compile -org.bytedeco:javacpp:1.2.3:compile -org.nd4j:nd4j-buffer:0.5.0:compile -org.projectlombok:lombok:1.16.4:compile -org.nd4j:nd4j-api:0.5.0:compile -org.nd4j:nd4j-native-api:0.5.0:compile -org.nd4j:nd4j-native:0.5.0:compile \ No newline at end of file +org.nd4j:nd4j-backend-impls:0.5.0:default +org.slf4j:slf4j-api:1.7.10:default +com.google.guava:guava:18.0:default +org.javassist:javassist:3.18.2-GA:default +com.google.code.findbugs:annotations:2.0.1:default +org.reflections:reflections:0.9.10:default +commons-io:commons-io:2.4:default +org.apache.commons:commons-math3:3.4.1:default +org.apache.commons:commons-lang3:3.3.1:default +org.nd4j:nd4j-common:0.5.0:default +org.nd4j:nd4j-context:0.5.0:default +org.bytedeco:javacpp:1.2.3:default +org.nd4j:nd4j-buffer:0.5.0:default +org.projectlombok:lombok:1.16.4:default +org.nd4j:nd4j-api:0.5.0:default +org.nd4j:nd4j-native-api:0.5.0:default +org.nd4j:nd4j-native:0.5.0:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.scala-lang/scala-compiler/2.11.8 b/modules/tests/shared/src/test/resources/resolutions/org.scala-lang/scala-compiler/2.11.8 index 08fb801210..ba43bcbb7b 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.scala-lang/scala-compiler/2.11.8 +++ b/modules/tests/shared/src/test/resources/resolutions/org.scala-lang/scala-compiler/2.11.8 @@ -1,5 +1,5 @@ -org.scala-lang:scala-library:2.11.8:compile -org.scala-lang:scala-reflect:2.11.8:compile -org.scala-lang.modules:scala-xml_2.11:1.0.4:compile -org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4:compile -org.scala-lang:scala-compiler:2.11.8:compile \ No newline at end of file +org.scala-lang:scala-library:2.11.8:default +org.scala-lang:scala-reflect:2.11.8:default +org.scala-lang.modules:scala-xml_2.11:1.0.4:default +org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4:default +org.scala-lang:scala-compiler:2.11.8:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.scala-lang/scala-compiler/2.11.8_optional b/modules/tests/shared/src/test/resources/resolutions/org.scala-lang/scala-compiler/2.11.8_optional index fad4e37ae3..94faa1cb8e 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.scala-lang/scala-compiler/2.11.8_optional +++ b/modules/tests/shared/src/test/resources/resolutions/org.scala-lang/scala-compiler/2.11.8_optional @@ -1,6 +1,6 @@ -org.scala-lang:scala-library:2.11.8:compile -org.scala-lang:scala-reflect:2.11.8:compile -org.scala-lang.modules:scala-xml_2.11:1.0.4:compile -org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4:compile -jline:jline:2.12.1:compile +org.scala-lang:scala-library:2.11.8:default +org.scala-lang:scala-reflect:2.11.8:default +org.scala-lang.modules:scala-xml_2.11:1.0.4:default +org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4:default +jline:jline:2.12.1:default org.scala-lang:scala-compiler:2.11.8:optional \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.talend.daikon/daikon/0.19.0-SNAPSHOT b/modules/tests/shared/src/test/resources/resolutions/org.talend.daikon/daikon/0.19.0-SNAPSHOT index 9fbd0d9d2b..3ee9684889 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.talend.daikon/daikon/0.19.0-SNAPSHOT +++ b/modules/tests/shared/src/test/resources/resolutions/org.talend.daikon/daikon/0.19.0-SNAPSHOT @@ -1,17 +1,17 @@ -org.codehaus.jackson:jackson-core-asl:1.9.13:compile -org.codehaus.jackson:jackson-mapper-asl:1.9.13:compile -com.thoughtworks.paranamer:paranamer:2.7:compile -org.xerial.snappy:snappy-java:1.1.1.3:compile -org.apache.commons:commons-compress:1.8.1:compile -org.tukaani:xz:1.5:compile -org.slf4j:slf4j-api:1.7.12:compile -org.apache.avro:avro:1.8.1:compile -com.fasterxml.jackson.core:jackson-annotations:2.5.3:compile -org.apache.commons:commons-lang3:3.4:compile -com.fasterxml.jackson.core:jackson-core:2.5.3:compile -com.fasterxml.jackson.core:jackson-databind:2.5.3:compile -javax.servlet:javax.servlet-api:3.1.0:compile -javax.inject:javax.inject:1:compile -commons-codec:commons-codec:1.6:compile -com.cedarsoftware:json-io:4.9.9-TALEND:compile -org.talend.daikon:daikon:0.19.0-SNAPSHOT:compile \ No newline at end of file +org.codehaus.jackson:jackson-core-asl:1.9.13:default +org.codehaus.jackson:jackson-mapper-asl:1.9.13:default +com.thoughtworks.paranamer:paranamer:2.7:default +org.xerial.snappy:snappy-java:1.1.1.3:default +org.apache.commons:commons-compress:1.8.1:default +org.tukaani:xz:1.5:default +org.slf4j:slf4j-api:1.7.12:default +org.apache.avro:avro:1.8.1:default +com.fasterxml.jackson.core:jackson-annotations:2.5.3:default +org.apache.commons:commons-lang3:3.4:default +com.fasterxml.jackson.core:jackson-core:2.5.3:default +com.fasterxml.jackson.core:jackson-databind:2.5.3:default +javax.servlet:javax.servlet-api:3.1.0:default +javax.inject:javax.inject:1:default +commons-codec:commons-codec:1.6:default +com.cedarsoftware:json-io:4.9.9-TALEND:default +org.talend.daikon:daikon:0.19.0-SNAPSHOT:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.webjars.bower/dgrid/1.0.0 b/modules/tests/shared/src/test/resources/resolutions/org.webjars.bower/dgrid/1.0.0 index b52bb613a9..830cb898e1 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.webjars.bower/dgrid/1.0.0 +++ b/modules/tests/shared/src/test/resources/resolutions/org.webjars.bower/dgrid/1.0.0 @@ -1,3 +1,3 @@ -org.webjars.bower:dojo:1.12.2:compile -org.webjars.bower:dstore:1.1.1:compile -org.webjars.bower:dgrid:1.0.0:compile \ No newline at end of file +org.webjars.bower:dojo:1.12.2:default +org.webjars.bower:dstore:1.1.1:default +org.webjars.bower:dgrid:1.0.0:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.webjars.bower/malihu-custom-scrollbar-plugin/3.1.5 b/modules/tests/shared/src/test/resources/resolutions/org.webjars.bower/malihu-custom-scrollbar-plugin/3.1.5 index 88aacd07fe..6aa986b371 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.webjars.bower/malihu-custom-scrollbar-plugin/3.1.5 +++ b/modules/tests/shared/src/test/resources/resolutions/org.webjars.bower/malihu-custom-scrollbar-plugin/3.1.5 @@ -1,3 +1,3 @@ -org.webjars.bower:jquery:3.2.1:compile -org.webjars.bower:jquery-mousewheel:3.1.13:compile -org.webjars.bower:malihu-custom-scrollbar-plugin:3.1.5:compile \ No newline at end of file +org.webjars.bower:jquery:3.2.1:default +org.webjars.bower:jquery-mousewheel:3.1.13:default +org.webjars.bower:malihu-custom-scrollbar-plugin:3.1.5:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/resources/resolutions/org.yaml/snakeyaml/1.17 b/modules/tests/shared/src/test/resources/resolutions/org.yaml/snakeyaml/1.17 index 9d44a3672a..549d7c03fd 100644 --- a/modules/tests/shared/src/test/resources/resolutions/org.yaml/snakeyaml/1.17 +++ b/modules/tests/shared/src/test/resources/resolutions/org.yaml/snakeyaml/1.17 @@ -1 +1 @@ -org.yaml:snakeyaml:1.17:compile \ No newline at end of file +org.yaml:snakeyaml:1.17:default \ No newline at end of file diff --git a/modules/tests/shared/src/test/scala/coursier/test/TestRunner.scala b/modules/tests/shared/src/test/scala/coursier/test/TestRunner.scala index 2564ea87da..4b00dcdac3 100644 --- a/modules/tests/shared/src/test/scala/coursier/test/TestRunner.scala +++ b/modules/tests/shared/src/test/scala/coursier/test/TestRunner.scala @@ -25,7 +25,8 @@ class TestRunner[F[_]: Gather : ToFuture]( extraRepos: Seq[Repository] = Nil, profiles: Option[Set[String]] = None, mapDependencies: Option[Dependency => Dependency] = None, - forceVersions: Map[Module, String] = Map.empty + forceVersions: Map[Module, String] = Map.empty, + defaultConfiguration: Configuration = Configuration.defaultCompile ): Future[Resolution] = { val repositories0 = extraRepos ++ repositories @@ -38,6 +39,7 @@ class TestRunner[F[_]: Gather : ToFuture]( .withUserActivations(profiles.map(_.iterator.map(p => if (p.startsWith("!")) p.drop(1) -> false else p -> true).toMap)) .withMapDependencies(mapDependencies) .withForceVersions(forceVersions) + .withDefaultConfiguration(defaultConfiguration) .process .run(fetch0) @@ -62,7 +64,8 @@ class TestRunner[F[_]: Gather : ToFuture]( extraRepos: Seq[Repository] = Nil, configuration: Configuration = Configuration.empty, profiles: Option[Set[String]] = None, - forceVersions: Map[Module, String] = Map.empty + forceVersions: Map[Module, String] = Map.empty, + defaultConfiguration: Configuration = Configuration.defaultCompile ): Future[Resolution] = async { val attrPathPart = @@ -90,7 +93,7 @@ class TestRunner[F[_]: Gather : ToFuture]( def tryRead = textResource(path) val dep = Dependency(module, version, configuration = configuration) - val res = await(resolve(Seq(dep), extraRepos = extraRepos, profiles = profiles, forceVersions = forceVersions)) + val res = await(resolve(Seq(dep), extraRepos = extraRepos, profiles = profiles, forceVersions = forceVersions, defaultConfiguration = defaultConfiguration)) val result = res .orderedDependencies diff --git a/modules/tests/shared/src/test/scala/coursier/test/package.scala b/modules/tests/shared/src/test/scala/coursier/test/package.scala index 93f9eb1ad2..59850aa0a1 100644 --- a/modules/tests/shared/src/test/scala/coursier/test/package.scala +++ b/modules/tests/shared/src/test/scala/coursier/test/package.scala @@ -5,7 +5,7 @@ import coursier.core.Configuration package object test { implicit class DependencyOps(val underlying: Dependency) extends AnyVal { - def withCompileScope: Dependency = underlying.copy(configuration = Configuration.compile) + def withCompileScope: Dependency = underlying.withConfiguration(Configuration.defaultCompile) } private val projectProperties = Set( From f0e156bcdd77da30da061630e243ba1001c834be Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 5 Aug 2019 12:26:30 +0200 Subject: [PATCH 3/3] Better config handling --- .../main/scala/coursier/core/Resolution.scala | 9 +++---- .../test/scala/coursier/ResolveTests.scala | 15 +++++++++++ modules/tests/metadata | 2 +- .../sbtVersion_1.0_scalaVersion_2.12/1.2.6 | 25 +++++++++++++++++++ 4 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 modules/tests/shared/src/test/resources/resolutions/com.geirsson/sbt-ci-release/sbtVersion_1.0_scalaVersion_2.12/1.2.6 diff --git a/modules/core/shared/src/main/scala/coursier/core/Resolution.scala b/modules/core/shared/src/main/scala/coursier/core/Resolution.scala index 673bd7a858..e0f7a26b6c 100644 --- a/modules/core/shared/src/main/scala/coursier/core/Resolution.scala +++ b/modules/core/shared/src/main/scala/coursier/core/Resolution.scala @@ -529,15 +529,12 @@ object Resolution { keepOpt.fold(default) { keep => if (keep(config)) { val depConfig = - if (actualConfig == Configuration.optional) - defaultConfiguration - else if (actualConfig == Configuration.test) + if (actualConfig == Configuration.test || actualConfig == Configuration.runtime) Configuration.runtime else - // really keeping the from.configuration, with its fallback config part - from.configuration + defaultConfiguration - Seq(dep.copy(configuration = depConfig)) + Seq(dep.withConfiguration(depConfig)) } else Nil } diff --git a/modules/coursier/shared/src/test/scala/coursier/ResolveTests.scala b/modules/coursier/shared/src/test/scala/coursier/ResolveTests.scala index a332833436..c4f4636271 100644 --- a/modules/coursier/shared/src/test/scala/coursier/ResolveTests.scala +++ b/modules/coursier/shared/src/test/scala/coursier/ResolveTests.scala @@ -709,5 +709,20 @@ object ResolveTests extends TestSuite { val subRes = res.subset(Seq(json4s)) await(validateDependencies(subRes)) } + + "config handling" - async { + + // if config handling gets messed up, like the "default" config of some dependencies ends up being pulled + // where it shouldn't, this surfaces more easily here, as sbt-ci-release depends on other sbt plugins, + // only available on Ivy repositories and not having a configuration named "default". + val res = await { + resolve + .addDependencies(dep"com.geirsson:sbt-ci-release;scalaVersion=2.12;sbtVersion=1.0:1.2.6") + .addRepositories(Repositories.sbtPlugin("releases")) + .future() + } + + await(validateDependencies(res)) + } } } diff --git a/modules/tests/metadata b/modules/tests/metadata index ce90f3559c..ad95615303 160000 --- a/modules/tests/metadata +++ b/modules/tests/metadata @@ -1 +1 @@ -Subproject commit ce90f3559c3986b8d08b0c5b514e5617e2033f9f +Subproject commit ad95615303f0d17d51e04f7d0c603754a95fc555 diff --git a/modules/tests/shared/src/test/resources/resolutions/com.geirsson/sbt-ci-release/sbtVersion_1.0_scalaVersion_2.12/1.2.6 b/modules/tests/shared/src/test/resources/resolutions/com.geirsson/sbt-ci-release/sbtVersion_1.0_scalaVersion_2.12/1.2.6 new file mode 100644 index 0000000000..69522b4b45 --- /dev/null +++ b/modules/tests/shared/src/test/resources/resolutions/com.geirsson/sbt-ci-release/sbtVersion_1.0_scalaVersion_2.12/1.2.6 @@ -0,0 +1,25 @@ +com.dwijnand:sbt-dynver;sbtVersion=1.0;scalaVersion=2.12:3.3.0:compile +com.jcraft:jsch:0.1.54:default +com.googlecode.javaewah:JavaEWAH:1.1.6:default +org.apache.httpcomponents:httpcore:4.3.3:default +commons-logging:commons-logging:1.1.3:default +commons-codec:commons-codec:1.6:default +org.apache.httpcomponents:httpclient:4.3.6:default +org.slf4j:slf4j-api:1.7.25:default +org.eclipse.jgit:org.eclipse.jgit:4.9.0.201710071750-r:default +com.typesafe.sbt:sbt-git;sbtVersion=1.0;scalaVersion=2.12:1.0.0:compile +org.xerial.sbt:sbt-sonatype;sbtVersion=1.0;scalaVersion=2.12:2.3:default +org.scala-lang:scala-library:2.12.6:default +org.bouncycastle:bcprov-jdk15on:1.51:default +org.bouncycastle:bcpg-jdk15on:1.51:default +com.typesafe:config:1.2.0:default +org.scala-lang.modules:scala-parser-combinators_2.12:1.0.5:default +com.typesafe:ssl-config-core_2.12:0.2.2:default +org.reactivestreams:reactive-streams:1.0.0:default +com.eed3si9n:gigahorse-core_2.12:0.3.0:default +com.squareup.okio:okio:1.12.0:default +com.squareup.okhttp3:okhttp:3.7.0:default +com.eed3si9n:gigahorse-okhttp_2.12:0.3.0:default +com.jsuereth:pgp-library_2.12:1.1.2:compile +com.jsuereth:sbt-pgp;sbtVersion=1.0;scalaVersion=2.12:1.1.2:compile +com.geirsson:sbt-ci-release;sbtVersion=1.0;scalaVersion=2.12:1.2.6:default \ No newline at end of file