eolivelli closed pull request #1725: Add optional compile time only
annotations-api dependency dropped in JDK11
URL: https://github.com/apache/bookkeeper/pull/1725
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pom.xml b/pom.xml
index 425730214f..0b158cffbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,6 +157,7 @@
<shrinkwrap.version>3.0.1</shrinkwrap.version>
<slf4j.version>1.7.25</slf4j.version>
<spotbugs-annotations.version>3.1.1</spotbugs-annotations.version>
+ <javax-annotations-api.version>1.3.2</javax-annotations-api.version>
<testcontainers.version>1.8.3</testcontainers.version>
<twitter-server.version>1.29.0</twitter-server.version>
<vertx.version>3.4.1</vertx.version>
@@ -198,6 +199,11 @@
<artifactId>spotbugs-annotations</artifactId>
<version>${spotbugs-annotations.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${javax-annotations-api.version}</version>
+ </dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
diff --git a/stream/common/pom.xml b/stream/common/pom.xml
index 27d52b89d7..40c8b07dde 100644
--- a/stream/common/pom.xml
+++ b/stream/common/pom.xml
@@ -41,6 +41,12 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <!-- this should not be bundled in binary distributions -->
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.apache.bookkeeper.tests</groupId>
<artifactId>stream-storage-tests-common</artifactId>
diff --git a/stream/distributedlog/core/pom.xml
b/stream/distributedlog/core/pom.xml
index 0e7d860366..5617f2c4c1 100644
--- a/stream/distributedlog/core/pom.xml
+++ b/stream/distributedlog/core/pom.xml
@@ -54,6 +54,12 @@
<artifactId>bookkeeper-server</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <!-- this should not be bundled in binary distributions -->
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml
index 8a6ad97874..7c3e86fdfd 100644
--- a/stream/proto/pom.xml
+++ b/stream/proto/pom.xml
@@ -42,6 +42,12 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <!-- this should not be bundled in binary distributions -->
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.apache.bookkeeper.tests</groupId>
<artifactId>stream-storage-tests-common</artifactId>
diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml
index 971aecc792..6f760251c5 100644
--- a/stream/tests-common/pom.xml
+++ b/stream/tests-common/pom.xml
@@ -37,6 +37,12 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <!-- this should not be bundled in binary distributions -->
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
