Skip to content

Commit 6e03a8d

Browse files
author
Sergei Malafeev
authored
Merge pull request #582 from jam01/mule-4-jdk11
removes mule-4 jdk11 override
2 parents 7bfc990 + 96df531 commit 6e03a8d

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed

test/mule/mule-4-app/pom.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,33 @@
2929
<properties>
3030
<exec.skip>true</exec.skip>
3131
</properties>
32+
<profiles>
33+
<profile>
34+
<id>jdk11-compat</id>
35+
<activation>
36+
<jdk>11</jdk>
37+
</activation>
38+
<!-- This could be a bug with Mule 4 class loading mechanism behaving differently between
39+
JDK 1.8 and 11, or an oversight on mule-4-artifact-module instrumentation. To be determined... -->
40+
<dependencies>
41+
<dependency>
42+
<groupId>io.opentracing</groupId>
43+
<artifactId>opentracing-api</artifactId>
44+
<scope>provided</scope>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.opentracing</groupId>
48+
<artifactId>opentracing-noop</artifactId>
49+
<scope>provided</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.opentracing</groupId>
53+
<artifactId>opentracing-util</artifactId>
54+
<scope>provided</scope>
55+
</dependency>
56+
</dependencies>
57+
</profile>
58+
</profiles>
3259
<build>
3360
<plugins>
3461
<plugin>

test/mule/mule-4.2.2/src/test/java/io/opentracing/contrib/specialagent/test/Mule4ContainerITest.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ public class Mule4ContainerITest {
2121
private static final String MULE_HOME = "/src/test/mule-home";
2222

2323
public static void main(final String[] args) throws Exception {
24-
if (!System.getProperty("java.version").startsWith("1.8.")) {
25-
System.err.println("This test is not working: https://github.com/opentracing-contrib/java-specialagent/issues/405");
26-
return;
27-
}
28-
2924
final String homeDir = new File("").getAbsolutePath() + MULE_HOME;
3025
final Mule4ContainerITest lock = new Mule4ContainerITest();
3126
System.setProperty(MuleSystemProperties.MULE_SIMPLE_LOG, "true");

0 commit comments

Comments
 (0)