diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-05-20 17:00:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-20 17:00:53 +0200 |
commit | 37d915ab1872688591a9e9e59c9a3336d8d37e7e (patch) | |
tree | b56c4c6f097d91ccd2f7b5a8bc80bcfb6b926a59 | |
parent | 118ff3ba51a984962534a6e1d1b0940cfa5ab8ac (diff) | |
parent | 0531bb2a9e873997f9f4c24fe1b444f5e167c527 (diff) |
Merge pull request #22685 from vespa-engine/jonmv/re-export-jupiter-compile-scoped-bundles
Avoid override, re-export packages instead
10 files changed, 83 insertions, 3 deletions
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 3c17bb840c1..ad61e1c28c0 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -235,12 +235,11 @@ <!-- note: ordering affects how overrides are evaluated! --> <testBundleScopeOverrides> ${extraTestBundleScopeOverrides}, - com.yahoo.vespa:application:test, - com.yahoo.vespa:container-test:runtime, org.junit.jupiter:junit-jupiter-api:provided, - org.opentest4j:opentest4j:test, org.junit.jupiter:junit-jupiter-engine:test, org.junit.vintage:junit-vintage-engine:test, + com.yahoo.vespa:application:test, + com.yahoo.vespa:container-test:runtime, com.yahoo.vespa:vespa-feed-client:runtime, <!-- prevent effective compile scope of vespa-feed-client in test bundle --> com.yahoo.vespa:vespa-feed-client-api:provided, com.yahoo.vespa:tenant-cd-api:provided diff --git a/tenant-cd-api/src/main/java/org/apiguardian/api/package-info.java b/tenant-cd-api/src/main/java/org/apiguardian/api/package-info.java new file mode 100644 index 00000000000..85bca21b2ff --- /dev/null +++ b/tenant-cd-api/src/main/java/org/apiguardian/api/package-info.java @@ -0,0 +1,9 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +/** + * @author jonmv + */ +@ExportPackage(version = @Version(major = 1, minor = 1, micro = 2)) +package org.apiguardian.api; + +import com.yahoo.osgi.annotation.ExportPackage; +import com.yahoo.osgi.annotation.Version; diff --git a/tenant-cd-api/src/main/java/org/junit/jupiter/api/extension/support/package-info.java b/tenant-cd-api/src/main/java/org/junit/jupiter/api/extension/support/package-info.java new file mode 100644 index 00000000000..087a1f556fc --- /dev/null +++ b/tenant-cd-api/src/main/java/org/junit/jupiter/api/extension/support/package-info.java @@ -0,0 +1,9 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +/** + * @author jonmv + */ +@ExportPackage(version = @Version(major = 5, minor = 8, micro = 1)) +package org.junit.jupiter.api.extension.support; + +import com.yahoo.osgi.annotation.ExportPackage; +import com.yahoo.osgi.annotation.Version; diff --git a/tenant-cd-api/src/main/java/org/junit/platform/commons/annotation/package-info.java b/tenant-cd-api/src/main/java/org/junit/platform/commons/annotation/package-info.java new file mode 100644 index 00000000000..1bdfab887c1 --- /dev/null +++ b/tenant-cd-api/src/main/java/org/junit/platform/commons/annotation/package-info.java @@ -0,0 +1,9 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +/** + * @author jonmv + */ +@ExportPackage(version = @Version(major = 1, minor = 8, micro = 1)) +package org.junit.platform.commons.annotation; + +import com.yahoo.osgi.annotation.ExportPackage; +import com.yahoo.osgi.annotation.Version; diff --git a/tenant-cd-api/src/main/java/org/junit/platform/commons/function/package-info.java b/tenant-cd-api/src/main/java/org/junit/platform/commons/function/package-info.java new file mode 100644 index 00000000000..8c577c10b26 --- /dev/null +++ b/tenant-cd-api/src/main/java/org/junit/platform/commons/function/package-info.java @@ -0,0 +1,9 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +/** + * @author jonmv + */ +@ExportPackage(version = @Version(major = 1, minor = 8, micro = 1)) +package org.junit.platform.commons.function; + +import com.yahoo.osgi.annotation.ExportPackage; +import com.yahoo.osgi.annotation.Version; diff --git a/tenant-cd-api/src/main/java/org/junit/platform/commons/logging/package-info.java b/tenant-cd-api/src/main/java/org/junit/platform/commons/logging/package-info.java new file mode 100644 index 00000000000..7c8e37cdc72 --- /dev/null +++ b/tenant-cd-api/src/main/java/org/junit/platform/commons/logging/package-info.java @@ -0,0 +1,9 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +/** + * @author jonmv + */ +@ExportPackage(version = @Version(major = 1, minor = 8, micro = 1)) +package org.junit.platform.commons.logging; + +import com.yahoo.osgi.annotation.ExportPackage; +import com.yahoo.osgi.annotation.Version; diff --git a/tenant-cd-api/src/main/java/org/junit/platform/commons/package-info.java b/tenant-cd-api/src/main/java/org/junit/platform/commons/package-info.java new file mode 100644 index 00000000000..2b56bf87c9b --- /dev/null +++ b/tenant-cd-api/src/main/java/org/junit/platform/commons/package-info.java @@ -0,0 +1,9 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +/** + * @author jonmv + */ +@ExportPackage(version = @Version(major = 1, minor = 8, micro = 1)) +package org.junit.platform.commons; + +import com.yahoo.osgi.annotation.ExportPackage; +import com.yahoo.osgi.annotation.Version; diff --git a/tenant-cd-api/src/main/java/org/junit/platform/commons/support/package-info.java b/tenant-cd-api/src/main/java/org/junit/platform/commons/support/package-info.java new file mode 100644 index 00000000000..328c88cc1a9 --- /dev/null +++ b/tenant-cd-api/src/main/java/org/junit/platform/commons/support/package-info.java @@ -0,0 +1,9 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +/** + * @author jonmv + */ +@ExportPackage(version = @Version(major = 1, minor = 8, micro = 1)) +package org.junit.platform.commons.support; + +import com.yahoo.osgi.annotation.ExportPackage; +import com.yahoo.osgi.annotation.Version; diff --git a/tenant-cd-api/src/main/java/org/junit/platform/commons/util/package-info.java b/tenant-cd-api/src/main/java/org/junit/platform/commons/util/package-info.java new file mode 100644 index 00000000000..811114f4976 --- /dev/null +++ b/tenant-cd-api/src/main/java/org/junit/platform/commons/util/package-info.java @@ -0,0 +1,9 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +/** + * @author jonmv + */ +@ExportPackage(version = @Version(major = 1, minor = 8, micro = 1)) +package org.junit.platform.commons.util; + +import com.yahoo.osgi.annotation.ExportPackage; +import com.yahoo.osgi.annotation.Version; diff --git a/tenant-cd-api/src/main/java/org/opentest4j/package-info.java b/tenant-cd-api/src/main/java/org/opentest4j/package-info.java new file mode 100644 index 00000000000..b7fa6cbf964 --- /dev/null +++ b/tenant-cd-api/src/main/java/org/opentest4j/package-info.java @@ -0,0 +1,9 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +/** + * @author jonmv + */ +@ExportPackage(version = @Version(major = 1, minor = 2, micro = 0)) +package org.opentest4j; + +import com.yahoo.osgi.annotation.ExportPackage; +import com.yahoo.osgi.annotation.Version; |