open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Limit latest test version for Apache HttpClient 2.0 (#1676)

This commit is contained in:
Nikita Salnikov-Tarnovski 2020-11-18 14:57:58 +02:00 committed by GitHub
parent eab3697660
commit 3c195f3273
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
instrumentation/apache-httpclient/apache-httpclient-2.0/apache-httpclient-2.0.gradle
View File

@ -4,12 +4,14 @@ muzzle {
pass {
group = "commons-httpclient"
module = "commons-httpclient"
versions = "[2.0,]"
skipVersions += "3.1-jenkins-1" // odd version in jcenter
versions = "[2.0,4.0)"
skipVersions += ["3.1-jenkins-1", "20020423"] // odd versions
assertInverse = true
}
}
dependencies {
library group: 'commons-httpclient', name: 'commons-httpclient', version: '2.0'
latestDepTestLibrary group: 'commons-httpclient', name: 'commons-httpclient', version: '3.+'
}

2
instrumentation/jms-1.1/src/test/groovy/Jms1Test.groovy
View File

@ -30,7 +30,7 @@ class Jms1Test extends AgentTestRunner {
private static final Logger logger = LoggerFactory.getLogger(Jms1Test)
private static final GenericContainer broker = new GenericContainer("rmohr/activemq")
private static final GenericContainer broker = new GenericContainer("rmohr/activemq:latest")
.withExposedPorts(61616, 8161)
.withLogConsumer(new Slf4jLogConsumer(logger))

2
instrumentation/jms-1.1/src/test/groovy/SpringTemplateJms1Test.groovy
View File

@ -25,7 +25,7 @@ import spock.lang.Shared
class SpringTemplateJms1Test extends AgentTestRunner {
private static final Logger logger = LoggerFactory.getLogger(SpringTemplateJms1Test)
private static final GenericContainer broker = new GenericContainer("rmohr/activemq")
private static final GenericContainer broker = new GenericContainer("rmohr/activemq:latest")
.withExposedPorts(61616, 8161)
.withLogConsumer(new Slf4jLogConsumer(logger))

2
instrumentation/jms-1.1/src/test/groovy/listener/Config.groovy
View File

@ -21,7 +21,7 @@ import org.testcontainers.containers.GenericContainer
@EnableJms
class Config {
private static GenericContainer broker = new GenericContainer("rmohr/activemq")
private static GenericContainer broker = new GenericContainer("rmohr/activemq:latest")
.withExposedPorts(61616, 8161)
static {

2
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SmokeTest.groovy
View File

@ -61,7 +61,7 @@ abstract class SmokeTest extends Specification {
private GenericContainer collector
def setupSpec() {
backend = new GenericContainer<>("open-telemetry-docker-dev.bintray.io/java/smoke-fake-backend")
backend = new GenericContainer<>("open-telemetry-docker-dev.bintray.io/java/smoke-fake-backend:latest")
.withExposedPorts(8080)
.waitingFor(Wait.forHttp("/health").forPort(8080))
.withNetwork(network)