diff options
Diffstat (limited to 'bundle-plugin-test/test-bundles')
6 files changed, 53 insertions, 1 deletions
diff --git a/bundle-plugin-test/test-bundles/export-packages-lib/src/main/java/ai/vespa/internal/Foo.java b/bundle-plugin-test/test-bundles/export-packages-lib/src/main/java/ai/vespa/internal/Foo.java new file mode 100644 index 00000000000..ed955a7a779 --- /dev/null +++ b/bundle-plugin-test/test-bundles/export-packages-lib/src/main/java/ai/vespa/internal/Foo.java @@ -0,0 +1,5 @@ +package ai.vespa.internal; + +public interface Foo { + +} diff --git a/bundle-plugin-test/test-bundles/export-packages-lib/src/main/java/ai/vespa/internal/package-info.java b/bundle-plugin-test/test-bundles/export-packages-lib/src/main/java/ai/vespa/internal/package-info.java new file mode 100644 index 00000000000..9814b033acd --- /dev/null +++ b/bundle-plugin-test/test-bundles/export-packages-lib/src/main/java/ai/vespa/internal/package-info.java @@ -0,0 +1,5 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +@ExportPackage +package ai.vespa.internal; + +import com.yahoo.osgi.annotation.ExportPackage; diff --git a/bundle-plugin-test/test-bundles/non-public-api-usage/pom.xml b/bundle-plugin-test/test-bundles/non-public-api-usage/pom.xml index 2a621fd97c2..fb52368d186 100644 --- a/bundle-plugin-test/test-bundles/non-public-api-usage/pom.xml +++ b/bundle-plugin-test/test-bundles/non-public-api-usage/pom.xml @@ -22,6 +22,12 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + + <dependency> + <groupId>com.yahoo.vespa.bundle-plugin</groupId> + <artifactId>vespa-jar-using-non-public-api</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <build> diff --git a/bundle-plugin-test/test-bundles/pom.xml b/bundle-plugin-test/test-bundles/pom.xml index 71c0e549be6..4fced129d2e 100644 --- a/bundle-plugin-test/test-bundles/pom.xml +++ b/bundle-plugin-test/test-bundles/pom.xml @@ -51,8 +51,9 @@ <module>artifact-version-for-exports</module> <module>artifact-version-for-exports-dep</module> <module>export-packages-lib</module> - <module>non-public-api-usage</module> <module>main</module> + <module>non-public-api-usage</module> + <module>vespa-jar-using-non-public-api</module> </modules> <dependencies> diff --git a/bundle-plugin-test/test-bundles/vespa-jar-using-non-public-api/pom.xml b/bundle-plugin-test/test-bundles/vespa-jar-using-non-public-api/pom.xml new file mode 100644 index 00000000000..18b44fcad23 --- /dev/null +++ b/bundle-plugin-test/test-bundles/vespa-jar-using-non-public-api/pom.xml @@ -0,0 +1,27 @@ +<?xml version="1.0"?> +<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.yahoo.vespa.bundle-plugin</groupId> + <artifactId>test-bundles</artifactId> + <version>8-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>vespa-jar-using-non-public-api</artifactId> + <version>8-SNAPSHOT</version> + <packaging>jar</packaging> + + <dependencies> + <dependency> + <groupId>com.yahoo.vespa.bundle-plugin</groupId> + <artifactId>export-packages-lib</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + +</project> diff --git a/bundle-plugin-test/test-bundles/vespa-jar-using-non-public-api/src/main/java/ai/vespa/using_non_public_api/UsingNonPublicApiPackage.java b/bundle-plugin-test/test-bundles/vespa-jar-using-non-public-api/src/main/java/ai/vespa/using_non_public_api/UsingNonPublicApiPackage.java new file mode 100644 index 00000000000..1234ae40920 --- /dev/null +++ b/bundle-plugin-test/test-bundles/vespa-jar-using-non-public-api/src/main/java/ai/vespa/using_non_public_api/UsingNonPublicApiPackage.java @@ -0,0 +1,8 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package ai.vespa.using_non_public_api; + +public class UsingNonPublicApiPackage { + + ai.vespa.internal.Foo non_public_vespa = null; + +} |