This is an automated email from the ASF dual-hosted git repository.
fpapon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/master by this push:
new 158143a Add javax.annotation dependency to get guice + some of the
samples working with JDK11
new 065bcb9 Merge pull request #174 from coheigea/annotation
158143a is described below
commit 158143aa76ca9e47f50799c9fe0757c9b0900151
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Fri Nov 8 10:25:59 2019 +0000
Add javax.annotation dependency to get guice + some of the samples working
with JDK11
---
pom.xml | 6 ++++++
samples/spring-boot/pom.xml | 4 ++++
samples/spring-mvc/pom.xml | 4 ++++
samples/spring/pom.xml | 4 ++++
support/guice/pom.xml | 4 ++++
5 files changed, 22 insertions(+)
diff --git a/pom.xml b/pom.xml
index f17ad4e..8457f30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,7 @@
<!-- Don't change this version without also changing the
shiro-hazelcast and shiro-features OSGi metadata: -->
<hazelcast.version>3.12.1</hazelcast.version>
<hsqldb.version>2.5.0</hsqldb.version>
+ <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
<jdk.version>1.8</jdk.version>
<jetty.version>9.4.20.v20190813</jetty.version>
<!-- Don't change this version without also changing the shiro-quartz
and shiro-features
@@ -820,6 +821,11 @@
<version>${commons.cli.version}</version>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${javax.annotation.api.version}</version>
+ </dependency>
+ <dependency>
<!-- runtime dependency for the shiro-cas module: -->
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml
index 3d02dd1..7b9b52a 100644
--- a/samples/spring-boot/pom.xml
+++ b/samples/spring-boot/pom.xml
@@ -49,6 +49,10 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/samples/spring-mvc/pom.xml b/samples/spring-mvc/pom.xml
index b12fb80..fe48a4b 100644
--- a/samples/spring-mvc/pom.xml
+++ b/samples/spring-mvc/pom.xml
@@ -103,6 +103,10 @@
<artifactId>shiro-ehcache</artifactId>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
<optional>false</optional>
diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml
index d388f91..802f046 100644
--- a/samples/spring/pom.xml
+++ b/samples/spring/pom.xml
@@ -45,6 +45,10 @@
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>runtime</scope>
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index 14677f4..ceaea53 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -54,6 +54,10 @@
<artifactId>guice-multibindings</artifactId>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
<optional>true</optional>
