Skip to content

Commit 5ffefa5

Browse files
committed
Drop wildcard checker exceptions for jaxrs-{2.0,3.0}-{annotations,common}
Their package layout already matches the module-name <-> package-name convention (jaxrs/v2_0/annotations, jaxrs/v2_0/common, jaxrs/v3_0/annotations, jaxrs/v3_0/common). Only the digit-suffix module-name guard fails because the version is embedded mid-name, so move them from the historical wildcard case to the no-base-version case where the package layout is still validated.
1 parent 687b65a commit 5ffefa5

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

.github/scripts/check-package-names.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,16 @@ check_source_set() {
8181
instrumentation/java-http-client/javaagent/*) continue ;;
8282
instrumentation/java-http-server/javaagent/*) continue ;;
8383
instrumentation/java-util-logging/javaagent/*) continue ;;
84-
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/*) continue ;;
85-
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/*) continue ;;
86-
instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/*) continue ;;
87-
instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-common/javaagent/*) continue ;;
8884
instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/*) continue ;;
8985
instrumentation/opentelemetry-extension-annotations-1.0/javaagent/*) continue ;;
9086
instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/*) continue ;;
9187
instrumentation/opentelemetry-instrumentation-api/javaagent/*) continue ;;
9288
esac
9389
fi
9490

95-
# some common modules don't have any base version (might have a variant instead, ex: javax)
91+
# modules whose name does not end with a version digit, either because they have no base
92+
# version (e.g. jdbc, netty-common) or because the version is embedded mid-name (e.g.
93+
# jaxrs-2.0-annotations); package layout is still derived from the module name below
9694
if [[ ! "$module_name" =~ [0-9]$ ]]; then
9795
case "$source_set:$module_name" in
9896
# library:
@@ -112,6 +110,10 @@ check_source_set() {
112110
javaagent:internal-lambda) ;;
113111
javaagent:internal-reflection) ;;
114112
javaagent:internal-url-class-loader) ;;
113+
javaagent:jaxrs-2.0-annotations) ;;
114+
javaagent:jaxrs-2.0-common) ;;
115+
javaagent:jaxrs-3.0-annotations) ;;
116+
javaagent:jaxrs-3.0-common) ;;
115117
javaagent:jaxrs-common) ;;
116118
javaagent:jdbc) ;;
117119
javaagent:jsf-common-jakarta) ;;

0 commit comments

Comments
 (0)