Remove shiro declaration 54/87554/5
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 10 Feb 2020 22:43:54 +0000 (23:43 +0100)
committerStephen Kitt <skitt@redhat.com>
Tue, 11 Feb 2020 09:15:22 +0000 (10:15 +0100)
We do not package this integration and the only downstream, which
also packages it, is aaa. Remove the declaration, so that aaa can
properly control shiro version it uses.

Change-Id: I14514cd395821bec4253fcf73dec56ccb0b68d89
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
odlparent-dependency-check/pom.xml
odlparent/pom.xml

index 735de9b94ad37a9236ad930974b950b8667944b7..8a2974eec2315709bc7915403ce98c5a4af67aaf 100644 (file)
             <type>pom</type>
             <version>2.13.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-web</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-netty</artifactId>
index 197738255c9bcc137c02b033f9fbe4dfc0ba0e78..6c621ab0a2ff212a7b8857ca5a32ea5f10136cd6 100644 (file)
         <version>1.4.01</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.apache.shiro</groupId>
-        <artifactId>shiro-core</artifactId>
-        <version>1.3.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.shiro</groupId>
-        <artifactId>shiro-web</artifactId>
-        <version>1.3.2</version>
-      </dependency>
-
       <!-- Plugin integration -->
       <dependency>
         <groupId>net.java.dev.stax-utils</groupId>