Merge pull request #22454 from vespa-engine/bjorncs/annotations

Bjorncs/annotations [run-systemtest]

26 files changed, 132 insertions, 4 deletions

diff --git a/annotations/pom.xml b/annotations/pom.xml
index df4f14f2a7d..358188f71c2 100644
--- a/annotations/pom.xml
+++ b/annotations/pom.xml
@@ -9,7 +9,7 @@
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>annotations</artifactId>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
   <version>7-SNAPSHOT</version>
   <name>annotations</name>
   <description>Public API annotations</description>
@@ -46,6 +46,31 @@
           <updateReleaseInfo>true</updateReleaseInfo>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>parse-version</id>
+            <goals>
+              <goal>parse-version</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
+            <Export-Package>com.yahoo.component.annotation;version=1.0.0;-noimport:=true</Export-Package>
+            <_nouses>true</_nouses> <!-- Don't include 'uses' directives for package exports -->
+          </instructions>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/annotations/src/main/java/com/yahoo/component/annotation/package-info.java b/annotations/src/main/java/com/yahoo/component/annotation/package-info.java
index 89e53b1f5ee..6ad7e9e2642 100644
--- a/annotations/src/main/java/com/yahoo/component/annotation/package-info.java
+++ b/annotations/src/main/java/com/yahoo/component/annotation/package-info.java
@@ -3,4 +3,5 @@
  * @author bjorncs
  */
 @com.yahoo.api.annotations.PublicApi
+@com.yahoo.osgi.annotation.ExportPackage
 package com.yahoo.component.annotation;
\ No newline at end of file
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/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index 025b567ce80..3eadf29489e 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -1,11 +1,12 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.handler;
 
-import com.google.inject.Inject;
+import ai.vespa.cloud.ZoneInfo;
 import com.yahoo.collections.Tuple2;
 import com.yahoo.component.ComponentId;
 import com.yahoo.component.ComponentSpecification;
 import com.yahoo.component.Vtag;
+import com.yahoo.component.annotation.Inject;
 import com.yahoo.component.chain.Chain;
 import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.container.QrSearchersConfig;
@@ -55,7 +56,6 @@ import com.yahoo.statistics.Statistics;
 import com.yahoo.vespa.configdefinition.SpecialtokensConfig;
 import com.yahoo.yolean.Exceptions;
 import com.yahoo.yolean.trace.TraceNode;
-import ai.vespa.cloud.ZoneInfo;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
diff --git a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java
index 47298cf645a..7bd66445512 100644
--- a/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java
+++ b/container-search/src/main/java/com/yahoo/search/schema/SchemaInfo.java
@@ -1,8 +1,8 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.schema;
 
-import com.google.inject.Inject;
 import com.yahoo.api.annotations.Beta;
+import com.yahoo.component.annotation.Inject;
 import com.yahoo.container.QrSearchersConfig;
 import com.yahoo.search.Query;
 import com.yahoo.search.config.IndexInfoConfig;
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>