Make jsr305 dependency optional (#140)

* Make jsr305 dependency optional * minor formatting adjustments --------- Co-authored-by: Johannes Schneider <johannes-schneider_1995@web.de>
SAP · Jun 30, 2023 · e3eed51 · e3eed51
1 parent 9d7d465
commit e3eed51
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 28 deletions.
diff --git a/api-parent/access-api/pom.xml b/api-parent/access-api/pom.xml
@@ -19,10 +19,6 @@
             <groupId>com.sap.cloud.environment.servicebinding.api</groupId>
             <artifactId>java-core-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/api-parent/consumption-api/pom.xml b/api-parent/consumption-api/pom.xml
@@ -19,10 +19,6 @@
             <groupId>com.sap.cloud.environment.servicebinding.api</groupId>
             <artifactId>java-core-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
 
         <!-- Scope: Test -->
         <dependency>

diff --git a/api-parent/core-api/pom.xml b/api-parent/core-api/pom.xml
@@ -14,11 +14,6 @@
     </properties>
 
     <dependencies>
-        <!-- Scope: Compile -->
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
 
         <!-- Scope: Test -->
         <dependency>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -45,7 +45,6 @@
 
     <properties>
         <cloud-environment.version>0.6.0</cloud-environment.version>
-        <jsr305.version>3.0.2</jsr305.version>
         <org.json.version>20230618</org.json.version>
         <junit-jupiter.version>5.9.3</junit-jupiter.version>
         <assertj-core.version>3.24.2</assertj-core.version>
@@ -65,11 +64,6 @@
             </dependency>
 
             <!-- Scope: Compile -->
-            <dependency>
-                <groupId>com.google.code.findbugs</groupId>
-                <artifactId>jsr305</artifactId>
-                <version>${jsr305.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -65,6 +65,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
 
+        <jsr305.version>3.0.2</jsr305.version>
         <slf4j-simple.version>2.0.7</slf4j-simple.version>
 
         <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
@@ -103,6 +104,17 @@
         </dependencies>
     </dependencyManagement>
 
+    <dependencies>
+        <!-- Scope: Compile -->
+        <!-- for @Nonnull and @Nullable annotations, not required transitively -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>${jsr305.version}</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
     <build>
         <resources>
             <resource>
@@ -484,4 +496,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/sap-service-operator/pom.xml b/sap-service-operator/pom.xml
@@ -22,10 +22,6 @@
             <groupId>com.sap.cloud.environment.servicebinding.api</groupId>
             <artifactId>java-access-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>

diff --git a/sap-vcap-services/pom.xml b/sap-vcap-services/pom.xml
@@ -22,10 +22,6 @@
             <groupId>com.sap.cloud.environment.servicebinding.api</groupId>
             <artifactId>java-access-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>