From 866af3308c425f0cc3c5f2f4bd833663ec9675d0 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Thu, 15 Jun 2017 15:52:05 +0200 Subject: [PATCH] Add extra snapshot versioning test See discussion in https://github.com/coursier/coursier/pull/567 --- tests/metadata | 2 +- .../org.jitsi/jitsi-videobridge/1.0-SNAPSHOT | 94 +++++++++++++++++++ .../scala/coursier/test/CentralTests.scala | 51 ++++++---- 3 files changed, 129 insertions(+), 18 deletions(-) create mode 100644 tests/shared/src/test/resources/resolutions/org.jitsi/jitsi-videobridge/1.0-SNAPSHOT diff --git a/tests/metadata b/tests/metadata index af15241bf..ebc1985f3 160000 --- a/tests/metadata +++ b/tests/metadata @@ -1 +1 @@ -Subproject commit af15241bf354b67e825036fbe224b7a0954fa0f3 +Subproject commit ebc1985f31be10b3ac434ae708c94b9cf3a49b44 diff --git a/tests/shared/src/test/resources/resolutions/org.jitsi/jitsi-videobridge/1.0-SNAPSHOT b/tests/shared/src/test/resources/resolutions/org.jitsi/jitsi-videobridge/1.0-SNAPSHOT new file mode 100644 index 000000000..6e4462a68 --- /dev/null +++ b/tests/shared/src/test/resources/resolutions/org.jitsi/jitsi-videobridge/1.0-SNAPSHOT @@ -0,0 +1,94 @@ +ch.imvs:sdes4j:1.1.3:compile +com.github.igniterealtime:jbosh:06ee5a43a0:compile +com.google.code.gson:gson:2.3.1:compile +com.google.guava:guava:15.0:compile +com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.0_jdk5:compile +com.googlecode.json-simple:json-simple:1.1.1:compile +com.jcraft:jzlib:1.1.3:compile +com.ning:async-http-client:1.9.31:compile +com.sun.jdmk:jmxtools:1.2.1:compile +com.sun.jmx:jmxri:1.2.1:compile +com.yuvimasory:orange-extensions:1.3.0:compile +commons-codec:commons-codec:1.6:compile +commons-lang:commons-lang:2.4:compile +commons-logging:commons-logging:1.2:compile +dnsjava:dnsjava:2.1.7:compile +dom4j:dom4j:1.6.1:compile +io.callstats:callstats-java-sdk:4.1.1:compile +io.netty:netty:3.10.4.Final:compile +javax.activation:activation:1.1:compile +javax.jms:jms:1.1:compile +javax.mail:mail:1.4:compile +javax.servlet:javax.servlet-api:3.1.0:compile +junit:junit:4.10:compile +log4j:log4j:1.2.15:compile +net.java.dev.jna:jna:4.1.0:compile +net.jcip:jcip-annotations:1.0:compile +org.apache.commons:commons-lang3:3.3.2:compile +org.apache.felix:org.apache.felix.framework:4.4.0:compile +org.apache.felix:org.apache.felix.main:4.4.0:compile +org.apache.httpcomponents:httpasyncclient:4.1:compile +org.apache.httpcomponents:httpclient:4.4.1:compile +org.apache.httpcomponents:httpcore:4.4.1:compile +org.apache.httpcomponents:httpcore-nio:4.4.1:compile +org.apache.logging.log4j:log4j-api:2.3:compile +org.apache.logging.log4j:log4j-core:2.3:compile +org.bitbucket.b_c:jose4j:0.5.1:compile +org.bitlet:weupnp:0.1.4:compile +org.bouncycastle:bcpkix-jdk15on:1.54:compile +org.bouncycastle:bcprov-jdk15on:1.54:compile +org.eclipse.jetty:jetty-client: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-proxy:9.2.10.v20150310:compile +org.eclipse.jetty:jetty-rewrite:9.2.10.v20150310:compile +org.eclipse.jetty:jetty-security:9.2.10.v20150310:compile +org.eclipse.jetty:jetty-server:9.2.10.v20150310:compile +org.eclipse.jetty:jetty-servlet:9.2.10.v20150310:compile +org.eclipse.jetty:jetty-util:9.2.10.v20150310:compile +org.eclipse.jetty:jetty-webapp:7.0.1.v20091125:compile +org.eclipse.jetty:jetty-xml:7.0.1.v20091125:compile +org.eclipse.jetty.websocket:websocket-api:9.2.10.v20150310:compile +org.eclipse.jetty.websocket:websocket-client:9.2.10.v20150310:compile +org.eclipse.jetty.websocket:websocket-common:9.2.10.v20150310:compile +org.eclipse.jetty.websocket:websocket-server:9.2.10.v20150310:compile +org.eclipse.jetty.websocket:websocket-servlet:9.2.10.v20150310:compile +org.fusesource:sigar:1.6.4:compile +org.gnu.inet:libidn:1.15:compile +org.hamcrest:hamcrest-core:1.1:compile +org.igniterealtime:tinder:1.2.3:compile +org.igniterealtime.smack:smack:3.2.2-jitsi-2-20170425.180418-3:compile +org.igniterealtime.smack:smackx:3.2.2-jitsi-2-20170425.180420-2:compile +org.igniterealtime.whack:core:2.0.0:compile +org.jitsi:bccontrib:1.0:compile +org.jitsi:fmj:1.0-20160121.172939-10:compile +org.jitsi:ice4j:1.0:compile +org.jitsi:jain-sip-ri-ossonly:1.2.98c7f8c-jitsi-oss1:compile +org.jitsi:jicoco:1.0-20160109.203023-16:compile +org.jitsi:jitsi-android-osgi:1.0-20150723.002702-1:compile +org.jitsi:jitsi-configuration:2.9-20150723.181638-1:compile +org.jitsi:jitsi-dnsservice:2.9-20150723.181644-1:compile +org.jitsi:jitsi-fileaccess:2.9-20150723.181644-1:compile +org.jitsi:jitsi-netaddr:2.9-20150723.181645-1:compile +org.jitsi:jitsi-packetlogging:2.9-20151104.171808-2:compile +org.jitsi:jitsi-protocol:2.9-20151211.202410-3:compile +org.jitsi:jitsi-protocol-jabber:2.9-20161228.174152-22:compile +org.jitsi:jitsi-protocol-media:2.9-20150723.181646-1:compile +org.jitsi:jitsi-resourcemanager:2.9-20150723.181652-1:compile +org.jitsi:jitsi-ui-service:2.9-20150723.181654-1:compile +org.jitsi:jitsi-util:2.9-20150723.181654-1:compile +org.jitsi:jitsi-videobridge:1.0-SNAPSHOT:compile +org.jitsi:libjitsi:1.0-20170606.180648-284:compile +org.jitsi:zrtp4j-light:3.2.0-jitsi-1-20150723.002345-1:compile +org.opentelecoms.sdp:java-sdp-nist-bridge:1.1:compile +org.opentelecoms.sdp:sdp-api:1.0:compile +org.osgi:org.osgi.core:4.3.1:compile +org.slf4j:jul-to-slf4j:1.7.7:compile +org.slf4j:osgi-over-slf4j:1.7.7:compile +org.slf4j:slf4j-api:1.7.12:compile +org.slf4j:slf4j-jdk14:1.7.7:compile +org.slf4j:slf4j-simple:1.6.1:compile +org.xmpp:jnsapi:0.0.3-jitsi-1-20151013.145326-2:compile +xml-apis:xml-apis:1.0.b2:compile +xmlpull:xmlpull:1.1.3.4a:compile +xpp3:xpp3:1.1.4c:compile \ No newline at end of file diff --git a/tests/shared/src/test/scala/coursier/test/CentralTests.scala b/tests/shared/src/test/scala/coursier/test/CentralTests.scala index 1b035b51d..1663cfff2 100644 --- a/tests/shared/src/test/scala/coursier/test/CentralTests.scala +++ b/tests/shared/src/test/scala/coursier/test/CentralTests.scala @@ -273,25 +273,42 @@ abstract class CentralTests extends TestSuite { } 'snapshotMetadata - { - // Let's hope this one won't change too much - val mod = Module("com.github.fommil", "java-logging") - val version = "1.2-SNAPSHOT" - val extraRepo = MavenRepository("https://oss.sonatype.org/content/repositories/public/") + 'simple - { + val mod = Module("com.github.fommil", "java-logging") + val version = "1.2-SNAPSHOT" + val extraRepo = MavenRepository("https://oss.sonatype.org/content/repositories/public/") - * - resolutionCheck( - mod, - version, - configuration = "runtime", - extraRepos = Seq(extraRepo) - ) + * - resolutionCheck( + mod, + version, + configuration = "runtime", + extraRepos = Seq(extraRepo) + ) - * - ensureHasArtifactWithExtension( - mod, - version, - "jar", - "jar", - extraRepos = Seq(extraRepo) - ) + * - ensureHasArtifactWithExtension( + mod, + version, + "jar", + "jar", + extraRepos = Seq(extraRepo) + ) + } + + * - { + val mod = Module("org.jitsi", "jitsi-videobridge") + val version = "1.0-SNAPSHOT" + val extraRepos = Seq( + MavenRepository("https://github.com/jitsi/jitsi-maven-repository/raw/master/releases"), + MavenRepository("https://github.com/jitsi/jitsi-maven-repository/raw/master/snapshots"), + MavenRepository("https://jitpack.io") + ) + + * - resolutionCheck( + mod, + version, + extraRepos = extraRepos + ) + } } 'versionProperty - {