Adding muzzle tests for glassfish 3 and 5

labbati · labbati · commit eb032d1c8e4c · 2019-05-29T17:53:42.000+02:00
diff --git a/dd-java-agent/instrumentation/glassfish/glassfish.gradle b/dd-java-agent/instrumentation/glassfish/glassfish.gradle
@@ -6,7 +6,7 @@ muzzle {
   pass {
     group = 'org.glassfish.main.extras'
     module = 'glassfish-embedded-all'
-    versions = "[4.0,4.1.2)"
+    versions = "[3.0,)"
     assertInverse = true
   }
 }
diff --git a/dd-java-agent/instrumentation/glassfish/src/main/java/datadog/trace/instrumentation/glassfish/GlassfishInstrumentation.java b/dd-java-agent/instrumentation/glassfish/src/main/java/datadog/trace/instrumentation/glassfish/GlassfishInstrumentation.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.glassfish4;
+package datadog.trace.instrumentation.glassfish;
 
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
diff --git a/settings.gradle b/settings.gradle
@@ -40,7 +40,7 @@ include ':dd-java-agent:instrumentation:elasticsearch:transport-2'
 include ':dd-java-agent:instrumentation:elasticsearch:transport-5'
 include ':dd-java-agent:instrumentation:elasticsearch:transport-5.3'
 include ':dd-java-agent:instrumentation:elasticsearch:transport-6'
-include ':dd-java-agent:instrumentation:glassfish-4'
+include ':dd-java-agent:instrumentation:glassfish'
 include ':dd-java-agent:instrumentation:grpc-1.5'
 include ':dd-java-agent:instrumentation:hibernate'
 include ':dd-java-agent:instrumentation:hibernate:core-3.3'

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ muzzle {`
`6`	`6`	`pass {`
`7`	`7`	`group = 'org.glassfish.main.extras'`
`8`	`8`	`module = 'glassfish-embedded-all'`
`9`		`- versions = "[4.0,4.1.2)"`
	`9`	`+ versions = "[3.0,)"`
`10`	`10`	`assertInverse = true`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package datadog.trace.instrumentation.glassfish4;`
	`1`	`+package datadog.trace.instrumentation.glassfish;`
`2`	`2`
`3`	`3`	`import static java.util.Collections.singletonMap;`
`4`	`4`	`import static net.bytebuddy.matcher.ElementMatchers.isMethod;`