diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-05-04 17:12:08 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-05-04 17:12:08 +0200 |
| commit | a4cdc05c518d194f53b01e0970a85734430867af (patch) | |
| tree | 64962095a5760923df97026d5a207f5aec1d992b | |
| parent | f25396044fbc0f0ab4ee4b84100893ccbbd5be29 (diff) | |
Don't embed annotations in osgi bundles
| -rw-r--r-- | clustercontroller-core/pom.xml | 6 | ||||
| -rwxr-xr-x | component/pom.xml | 6 | ||||
| -rw-r--r-- | config-application-package/pom.xml | 6 | ||||
| -rw-r--r-- | config-lib/pom.xml | 1 | ||||
| -rw-r--r-- | config-model-api/pom.xml | 6 | ||||
| -rw-r--r-- | configdefinitions/pom.xml | 6 | ||||
| -rw-r--r-- | document/pom.xml | 1 | ||||
| -rw-r--r-- | fileacquirer/pom.xml | 6 | ||||
| -rw-r--r-- | indexinglanguage/pom.xml | 6 | ||||
| -rw-r--r-- | jdisc_core/pom.xml | 6 | ||||
| -rw-r--r-- | jdisc_core_test/test_bundles/pom.xml | 6 | ||||
| -rw-r--r-- | jrt/pom.xml | 1 | ||||
| -rw-r--r-- | linguistics-components/pom.xml | 6 | ||||
| -rw-r--r-- | messagebus/pom.xml | 6 | ||||
| -rw-r--r-- | predicate-search-core/pom.xml | 1 | ||||
| -rw-r--r-- | predicate-search/pom.xml | 6 | ||||
| -rw-r--r-- | searchcore/pom.xml | 6 | ||||
| -rw-r--r-- | searchlib/pom.xml | 6 | ||||
| -rw-r--r-- | statistics/pom.xml | 6 | ||||
| -rw-r--r-- | vdslib/pom.xml | 6 | ||||
| -rw-r--r-- | vespa-feed-client-api/pom.xml | 1 | ||||
| -rw-r--r-- | vespalog/pom.xml | 1 |
22 files changed, 102 insertions, 0 deletions
diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml index c3ccf39c906..7a3ccaf61f4 100644 --- a/clustercontroller-core/pom.xml +++ b/clustercontroller-core/pom.xml @@ -14,6 +14,12 @@ <name>${project.artifactId}</name> <dependencies> <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <!-- required for bundle-plugin to generate import-package statements for Java's standard library --> <groupId>com.yahoo.vespa</groupId> <artifactId>jdisc_core</artifactId> diff --git a/component/pom.xml b/component/pom.xml index 94e0b6637ea..d4d8400f397 100755 --- a/component/pom.xml +++ b/component/pom.xml @@ -28,6 +28,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/config-application-package/pom.xml b/config-application-package/pom.xml index 7c84edce0f3..869e161f57d 100644 --- a/config-application-package/pom.xml +++ b/config-application-package/pom.xml @@ -28,6 +28,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>component</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/config-lib/pom.xml b/config-lib/pom.xml index fa540b5b387..7c13bd22227 100644 --- a/config-lib/pom.xml +++ b/config-lib/pom.xml @@ -25,6 +25,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>annotations</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/config-model-api/pom.xml b/config-model-api/pom.xml index 624c993d819..3e83a6dfddf 100644 --- a/config-model-api/pom.xml +++ b/config-model-api/pom.xml @@ -24,6 +24,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/configdefinitions/pom.xml b/configdefinitions/pom.xml index a90d656e1d6..0f4f1ddbad3 100644 --- a/configdefinitions/pom.xml +++ b/configdefinitions/pom.xml @@ -19,6 +19,12 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/document/pom.xml b/document/pom.xml index 2a284f709db..06488d799eb 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -55,6 +55,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>annotations</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> diff --git a/fileacquirer/pom.xml b/fileacquirer/pom.xml index 8be54e15682..1a85849fd98 100644 --- a/fileacquirer/pom.xml +++ b/fileacquirer/pom.xml @@ -22,6 +22,12 @@ <artifactId>config</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml index 112dcee5136..48fa89c428e 100644 --- a/indexinglanguage/pom.xml +++ b/indexinglanguage/pom.xml @@ -31,6 +31,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>document</artifactId> <version>${project.version}</version> </dependency> diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index c651f6528b7..928258b5e75 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -167,6 +167,12 @@ <version>${project.version}</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/jdisc_core_test/test_bundles/pom.xml b/jdisc_core_test/test_bundles/pom.xml index 8a6d4a02d15..ff3c14ee354 100644 --- a/jdisc_core_test/test_bundles/pom.xml +++ b/jdisc_core_test/test_bundles/pom.xml @@ -21,6 +21,12 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/jrt/pom.xml b/jrt/pom.xml index e8a68f06137..fea45602e58 100644 --- a/jrt/pom.xml +++ b/jrt/pom.xml @@ -22,6 +22,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>annotations</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/linguistics-components/pom.xml b/linguistics-components/pom.xml index 96cb26b9642..aa68f6590cb 100644 --- a/linguistics-components/pom.xml +++ b/linguistics-components/pom.xml @@ -25,6 +25,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>component</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/messagebus/pom.xml b/messagebus/pom.xml index 369d751ca9a..d26e9b32909 100644 --- a/messagebus/pom.xml +++ b/messagebus/pom.xml @@ -26,6 +26,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>component</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/predicate-search-core/pom.xml b/predicate-search-core/pom.xml index c30cf4633a8..733501122bf 100644 --- a/predicate-search-core/pom.xml +++ b/predicate-search-core/pom.xml @@ -32,6 +32,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>annotations</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/predicate-search/pom.xml b/predicate-search/pom.xml index 3f0b8b3de4d..83efe9d9754 100644 --- a/predicate-search/pom.xml +++ b/predicate-search/pom.xml @@ -30,6 +30,12 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/searchcore/pom.xml b/searchcore/pom.xml index a13390a0f8d..27b0e55c781 100644 --- a/searchcore/pom.xml +++ b/searchcore/pom.xml @@ -22,6 +22,12 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/searchlib/pom.xml b/searchlib/pom.xml index 614601ecee9..d1a167b14c8 100644 --- a/searchlib/pom.xml +++ b/searchlib/pom.xml @@ -31,6 +31,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/statistics/pom.xml b/statistics/pom.xml index 37467cc8aa0..c32b42ad5be 100644 --- a/statistics/pom.xml +++ b/statistics/pom.xml @@ -32,6 +32,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>config-bundle</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/vdslib/pom.xml b/vdslib/pom.xml index ab7175918db..0a6eae7ec3e 100644 --- a/vdslib/pom.xml +++ b/vdslib/pom.xml @@ -36,6 +36,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>document</artifactId> <version>${project.version}</version> </dependency> diff --git a/vespa-feed-client-api/pom.xml b/vespa-feed-client-api/pom.xml index 7760ed5f1c4..64b71ae6fb1 100644 --- a/vespa-feed-client-api/pom.xml +++ b/vespa-feed-client-api/pom.xml @@ -18,6 +18,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>annotations</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/vespalog/pom.xml b/vespalog/pom.xml index 94be1302e30..aab362e3395 100644 --- a/vespalog/pom.xml +++ b/vespalog/pom.xml @@ -37,6 +37,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>annotations</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> </dependencies> <build> |