From ad96c5d772e424a0a808544214ad421f6b95c2fa Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Tue, 19 May 2026 17:31:35 +0200 Subject: [PATCH 1/2] Add REUSE compliance: LICENSES/, .reuse/dep5, and fix invalid SPDX expressions - Add LICENSES/Apache-2.0.txt (copy of LICENSE) as required by REUSE spec - Add .reuse/dep5 to provide copyright/license info for files without inline headers - Fix invalid SPDX expressions in OtelImplJavadocTest and OtelInternalJavadocTest by wrapping embedded SPDX-License-Identifier strings in REUSE-IgnoreStart/End comments to prevent the REUSE linter from treating test fixture content as actual license declarations --- .reuse/dep5 | 12 ++++++++++++ .../gradle/customchecks/OtelImplJavadocTest.java | 6 ++++++ .../gradle/customchecks/OtelInternalJavadocTest.java | 4 ++++ 3 files changed, 22 insertions(+) create mode 100644 .reuse/dep5 diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 00000000000..e64ba8b416b --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,12 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: OpenTelemetry Java +Upstream-Contact: opentelemetry-java@googlegroups.com +Source: https://github.com/open-telemetry/opentelemetry-java + +Files: gradle/wrapper/gradle-wrapper.jar +Copyright: Copyright Gradle, Inc. +License: Apache-2.0 + +Files: * +Copyright: Copyright The OpenTelemetry Authors +License: Apache-2.0 diff --git a/custom-checks/src/test/java/io/opentelemetry/gradle/customchecks/OtelImplJavadocTest.java b/custom-checks/src/test/java/io/opentelemetry/gradle/customchecks/OtelImplJavadocTest.java index ad294d61b2c..9b9126a1506 100644 --- a/custom-checks/src/test/java/io/opentelemetry/gradle/customchecks/OtelImplJavadocTest.java +++ b/custom-checks/src/test/java/io/opentelemetry/gradle/customchecks/OtelImplJavadocTest.java @@ -15,10 +15,12 @@ void positiveCases() { CompilationTestHelper.newInstance(OtelImplJavadoc.class, OtelImplJavadocTest.class) .addSourceLines( "impl/ImplJavadocPositiveCases.java", + // REUSE-IgnoreStart "/*", " * Copyright The OpenTelemetry Authors", " * SPDX-License-Identifier: Apache-2.0", " */", + // REUSE-IgnoreEnd "package io.opentelemetry.gradle.customchecks.impl;", "// BUG: Diagnostic contains: missing the required javadoc disclaimer", "public class ImplJavadocPositiveCases {", @@ -36,10 +38,12 @@ void negativeCases() { CompilationTestHelper.newInstance(OtelImplJavadoc.class, OtelImplJavadocTest.class) .addSourceLines( "impl/ImplJavadocNegativeCases.java", + // REUSE-IgnoreStart "/*", " * Copyright The OpenTelemetry Authors", " * SPDX-License-Identifier: Apache-2.0", " */", + // REUSE-IgnoreEnd "package io.opentelemetry.gradle.customchecks.impl;", "/**", " * This class is not intended for use by application developers. Its API is stable and", @@ -62,10 +66,12 @@ void nonImplPackageIgnored() { CompilationTestHelper.newInstance(OtelImplJavadoc.class, OtelImplJavadocTest.class) .addSourceLines( "other/NonImplPackageCases.java", + // REUSE-IgnoreStart "/*", " * Copyright The OpenTelemetry Authors", " * SPDX-License-Identifier: Apache-2.0", " */", + // REUSE-IgnoreEnd "package io.opentelemetry.gradle.customchecks.other;", "public class NonImplPackageCases {", " public static class One {}", diff --git a/custom-checks/src/test/java/io/opentelemetry/gradle/customchecks/OtelInternalJavadocTest.java b/custom-checks/src/test/java/io/opentelemetry/gradle/customchecks/OtelInternalJavadocTest.java index 34fbc46b6b6..777b4dd8c06 100644 --- a/custom-checks/src/test/java/io/opentelemetry/gradle/customchecks/OtelInternalJavadocTest.java +++ b/custom-checks/src/test/java/io/opentelemetry/gradle/customchecks/OtelInternalJavadocTest.java @@ -15,10 +15,12 @@ void positiveCases() { CompilationTestHelper.newInstance(OtelInternalJavadoc.class, OtelInternalJavadocTest.class) .addSourceLines( "internal/InternalJavadocPositiveCases.java", + // REUSE-IgnoreStart "/*", " * Copyright The OpenTelemetry Authors", " * SPDX-License-Identifier: Apache-2.0", " */", + // REUSE-IgnoreEnd "package io.opentelemetry.gradle.customchecks.internal;", "// BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers", "public class InternalJavadocPositiveCases {", @@ -36,10 +38,12 @@ void negativeCases() { CompilationTestHelper.newInstance(OtelInternalJavadoc.class, OtelInternalJavadocTest.class) .addSourceLines( "internal/InternalJavadocNegativeCases.java", + // REUSE-IgnoreStart "/*", " * Copyright The OpenTelemetry Authors", " * SPDX-License-Identifier: Apache-2.0", " */", + // REUSE-IgnoreEnd "package io.opentelemetry.gradle.customchecks.internal;", "/**", " * This class is internal and is hence not for public use. Its APIs are unstable and can change at", From 1807314b3716ecbac495b6bf876c85edca753d16 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Tue, 19 May 2026 18:01:40 +0200 Subject: [PATCH 2/2] reuse convert-dep5 Signed-off-by: Hilmar Falkenberg --- .reuse/dep5 | 12 ------------ REUSE.toml | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) delete mode 100644 .reuse/dep5 create mode 100644 REUSE.toml diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index e64ba8b416b..00000000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,12 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: OpenTelemetry Java -Upstream-Contact: opentelemetry-java@googlegroups.com -Source: https://github.com/open-telemetry/opentelemetry-java - -Files: gradle/wrapper/gradle-wrapper.jar -Copyright: Copyright Gradle, Inc. -License: Apache-2.0 - -Files: * -Copyright: Copyright The OpenTelemetry Authors -License: Apache-2.0 diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 00000000000..6cad12eb65c --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,16 @@ +version = 1 +SPDX-PackageName = "OpenTelemetry Java" +SPDX-PackageSupplier = "opentelemetry-java@googlegroups.com" +SPDX-PackageDownloadLocation = "https://github.com/open-telemetry/opentelemetry-java" + +[[annotations]] +path = "gradle/wrapper/gradle-wrapper.jar" +precedence = "aggregate" +SPDX-FileCopyrightText = "Copyright Gradle, Inc." +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "**" +precedence = "aggregate" +SPDX-FileCopyrightText = "Copyright The OpenTelemetry Authors" +SPDX-License-Identifier = "Apache-2.0"