[shiro] branch master updated: [SHIRO-761] Bad OSGi import for javax.annotation in shiro-guice

[fpapon]

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 b8cd45c  [SHIRO-761] Bad OSGi import for javax.annotation in 
shiro-guice
     new 76d22f8  Merge pull request #243 from fpapon/SHIRO-761
b8cd45c is described below

commit b8cd45c840f6657b06dc6fccfdf82cc8269e4d50
Author: Francois Papon <fpa...@apache.org>
AuthorDate: Thu Jul 2 23:13:42 2020 +0200

    [SHIRO-761] Bad OSGi import for javax.annotation in shiro-guice
---
 support/guice/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index 66ade20..7b2c50e 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -46,6 +46,10 @@
             <optional>true</optional>
         </dependency>
         <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+        </dependency>
+        <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
@@ -54,10 +58,6 @@
             <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>