From 0f16fb7b59fde5b879c2c8fa49d1dbf80239516e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bl=C3=A4sing?= <mblaesing@doppel-helix.eu>
Date: Sun, 8 Dec 2019 16:44:29 +0100
Subject: [PATCH] Add runtime dependency for JSR305 and export annotations

The annotations defined in the Common Annotations module depend
on the annotations defined in JSR305. If they are not present, a
warning is generated from javac.
---
 .../api.annotations.common/nbproject/project.properties    | 1 +
 platform/api.annotations.common/nbproject/project.xml      | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/platform/api.annotations.common/nbproject/project.properties b/platform/api.annotations.common/nbproject/project.properties
index c3d99dfe108e..26b0aaf1372e 100644
--- a/platform/api.annotations.common/nbproject/project.properties
+++ b/platform/api.annotations.common/nbproject/project.properties
@@ -23,3 +23,4 @@ javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
 
 cp.extra=external/jsr305-3.0.2.jar
+release.external/jsr305-3.0.2.jar=modules/ext/jsr305-3.0.2.jar
\ No newline at end of file
diff --git a/platform/api.annotations.common/nbproject/project.xml b/platform/api.annotations.common/nbproject/project.xml
index 54c7c9706d15..565163d1e966 100644
--- a/platform/api.annotations.common/nbproject/project.xml
+++ b/platform/api.annotations.common/nbproject/project.xml
@@ -26,8 +26,15 @@
             <code-name-base>org.netbeans.api.annotations.common</code-name-base>
             <module-dependencies/>
             <public-packages>
+                <package>javax.annotation</package>
+                <package>javax.annotation.concurrent</package>
+                <package>javax.annotation.meta</package>
                 <package>org.netbeans.api.annotations.common</package>
             </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/jsr305-3.0.2.jar</runtime-relative-path>
+                <binary-origin>external/jsr305-3.0.2.jar</binary-origin>
+            </class-path-extension>
         </data>
     </configuration>
 </project>