Bump shiro to 1.7.1

This patch bumps the shiro dependency, release notes are here:

https://shiro.apache.org/news.html#1.4.0-RC2-released
https://shiro.apache.org/news.html#1.4.1-released
https://shiro.apache.org/news.html#1.4.2-released
https://shiro.apache.org/news.html#1.5.0-released
https://shiro.apache.org/news.html#1.5.1-released
https://shiro.apache.org/news.html#1.5.2-released
https://shiro.apache.org/news.html#1.5.3-released
https://shiro.apache.org/news.html#1.6.0-released
https://shiro.apache.org/news.html#1.7.0-released
https://shiro.apache.org/news.html#1.7.1-released

We end up repackaging shiro to deal with class loading issues
coming it faces. Those will be cleaned up in version shiro-2,
which when we ill just revert back to using their packaging.

JIRA: AAA-188
Change-Id: Ic1d5c4243776c5cd72778c248ba5824a4acc4a91
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aaa-password-service/impl/pom.xml b/aaa-password-service/impl/pom.xml
index 9f570440cdb8b5bea54bc1fcc2aecad7ff73d4a4..d9037d9ad730b8bfb53c4d217e7756ff70ce2649 100644 (file)
--- a/aaa-password-service/impl/pom.xml
+++ b/aaa-password-service/impl/pom.xml
@@ -28,8 +28,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>aaa-password-service-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.shiro</groupId>
-      <artifactId>shiro-core</artifactId>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>repackaged-shiro</artifactId>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

diff --git a/aaa-shiro/impl/pom.xml b/aaa-shiro/impl/pom.xml
index 2c39ee30828b5a4bedb173f976da472e3e40ba98..f7e506a3510d34bb56d7f830c3624b85d3358259 100644 (file)
--- a/aaa-shiro/impl/pom.xml
+++ b/aaa-shiro/impl/pom.xml
@@ -40,14 +40,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>aaa-cert</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-web</artifactId>
-        </dependency>
-        <!-- Enforce newer commons-collections versions -->
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.2</version>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>repackaged-shiro</artifactId>
         </dependency>
 
         <dependency>

diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/ShiroWebEnvironmentLoaderListener.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/ShiroWebEnvironmentLoaderListener.java
index a17e13f5f853241f5b098343e9cfbafc3d0241c7..7d9b12d8381eb585740f4d2ab7cca77553dcecec 100644 (file)
--- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/ShiroWebEnvironmentLoaderListener.java
+++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/ShiroWebEnvironmentLoaderListener.java
@@ -8,9 +8,7 @@
 package org.opendaylight.aaa.shiro.web.env;
 
 import javax.servlet.ServletContext;
-import org.apache.shiro.util.LifecycleUtils;
 import org.apache.shiro.web.env.EnvironmentLoaderListener;
-import org.apache.shiro.web.env.MutableWebEnvironment;
 import org.apache.shiro.web.env.WebEnvironment;
 import org.opendaylight.aaa.api.AuthenticationService;
 import org.opendaylight.aaa.api.TokenStore;
@@ -54,15 +52,8 @@ public class ShiroWebEnvironmentLoaderListener extends EnvironmentLoaderListener
     }
 
     @Override
-    protected WebEnvironment createEnvironment(final ServletContext sc) {
-        MutableWebEnvironment environment = new AAAIniWebEnvironment(shiroConfiguration, dataBroker,
-                certificateManager, authenticationService, tokenAuthenticators, tokenStore, passwordHashService);
-
-        // in newer Shiro version, there is a determineWebEnvironment() which should be
-        // used instead of createEnvironment() but for 1.3.x we just copy/paste from parent and do:
-        environment.setServletContext(sc);
-        customizeEnvironment(environment);
-        LifecycleUtils.init(environment);
-        return environment;
+    protected WebEnvironment determineWebEnvironment(final ServletContext servletContext) {
+        return new AAAIniWebEnvironment(shiroConfiguration, dataBroker, certificateManager, authenticationService,
+            tokenAuthenticators, tokenStore, passwordHashService);
     }
 }

diff --git a/aaa-shiro/pom.xml b/aaa-shiro/pom.xml
index a9e4a565182f7ef0a5030976c5aa0e2b03b60391..307179211ece5b930739582808644f000b0ffee9 100644 (file)
--- a/aaa-shiro/pom.xml
+++ b/aaa-shiro/pom.xml
@@ -29,6 +29,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <modules>
     <module>api</module>
     <module>impl</module>
+    <module>repackaged-shiro</module>
+    <module>repackaged-shiro-jar</module>
   </modules>
 
   <scm>

diff --git a/aaa-shiro/repackaged-shiro-jar/pom.xml b/aaa-shiro/repackaged-shiro-jar/pom.xml
new file mode 100644 (file)
index 0000000..8ed168a
--- /dev/null
+++ b/aaa-shiro/repackaged-shiro-jar/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2020 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>8.0.0</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.aaa</groupId>
+    <artifactId>repackaged-shiro-jar</artifactId>
+    <packaging>jar</packaging>
+    <version>0.14.0-SNAPSHOT</version>
+    <name>${project.artifactId}</name>
+
+    <properties>
+        <!-- We do not want to leak this artifact -->
+        <maven.deploy.skip>true</maven.deploy.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-core</artifactId>
+            <version>1.7.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-web</artifactId>
+            <version>1.7.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-license</id>
+                        <configuration>
+                            <!-- Shiro is Apache-2.0 licensed -->
+                            <skip>true</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <shadeSourcesContent>true</shadeSourcesContent>
+                            <createSourcesJar>true</createSourcesJar>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.apache.shiro:shiro-core</include>
+                                    <include>org.apache.shiro:shiro-web</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>org.apache.shiro:shiro-core</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/DEPENDENCIES</exclude>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                        <exclude>META-INF/LICENSE</exclude>
+                                        <exclude>META-INF/NOTICE</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.apache.shiro:shiro-web</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

diff --git a/aaa-shiro/repackaged-shiro/pom.xml b/aaa-shiro/repackaged-shiro/pom.xml
new file mode 100644 (file)
index 0000000..17d2764
--- /dev/null
+++ b/aaa-shiro/repackaged-shiro/pom.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2020 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.aaa</groupId>
+        <artifactId>aaa-parent</artifactId>
+        <version>0.14.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
+    </parent>
+
+    <artifactId>repackaged-shiro</artifactId>
+    <packaging>bundle</packaging>
+    <name>${project.artifactId}</name>
+
+    <properties>
+        <!-- We are just juggling classes here -->
+        <odlparent.modernizer.skip>true</odlparent.modernizer.skip>
+        <odlparent.spotbugs.skip>true</odlparent.spotbugs.skip>
+
+        <!-- We do not want to generate javadoc -->
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>repackaged-shiro-jar</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.owasp.encoder</groupId>
+            <artifactId>encoder</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-license</id>
+                        <configuration>
+                            <!-- Shiro is Apache-2.0 licensed -->
+                            <skip>true</skip>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.opendaylight.aaa</groupId>
+                                    <artifactId>repackaged-shiro-jar</artifactId>
+                                    <version>${project.version}</version>
+                                </artifactItem>
+                            </artifactItems>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>unpack-sources</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>sources</classifier>
+                            <includeArtifactIds>shiro-jar</includeArtifactIds>
+                            <outputDirectory>${project.build.directory}/shaded-sources</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>shaded-sources</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                           <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>${project.build.directory}/shaded-sources</sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>shared-resources</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                           <goal>add-resource</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>${project.build.directory}/classes/META-INF</directory>
+                                    <targetPath>META-INF</targetPath>
+                                    <includes>
+                                        <include>DEPENDENCIES</include>
+                                        <include>LICENSE</include>
+                                        <include>NOTICE</include>
+                                        <include>shiro.tld</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Include-Resource>
+                            {maven-resources},
+                            META-INF/git.properties=-${project.build.directory}/classes/META-INF/git.properties,
+                            META-INF/services=-${project.build.directory}/classes/META-INF/services
+                        </Include-Resource>
+                        <Import-Package>
+                            javax.servlet.jsp;resolution:=optional,
+                            javax.servlet.jsp.tagext;resolution:=optional,
+                            org.apache.commons.configuration2.interpol;resolution:=optional,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 73aff00113af558ad603c01434ae355b9c176c6b..4132deeb33eb7f4641ab79a3760cf42a41631a03 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -105,6 +105,11 @@
                 <artifactId>aaa-shiro</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>repackaged-shiro</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>${project.groupId}.web</groupId>
@@ -197,6 +202,13 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-apache-shiro</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>

diff --git a/dependency-check/pom.xml b/dependency-check/pom.xml
index be0aee33a05b2ec3134ef058cf9e8e4a88b54138..f57d02e69cf69c7514baa5a91e9f35ee71a3e8c3 100644 (file)
--- a/dependency-check/pom.xml
+++ b/dependency-check/pom.xml
@@ -132,6 +132,10 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>repackaged-shiro</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}.web</groupId>
             <artifactId>servlet-api</artifactId>

diff --git a/features/features-aaa/pom.xml b/features/features-aaa/pom.xml
index 83e095ef5dc22535abb062e0b1f030a8af6dacbf..4bfadf8376fcc0b0cd2b31c9a705e64538edde36 100644 (file)
--- a/features/features-aaa/pom.xml
+++ b/features/features-aaa/pom.xml
@@ -58,5 +58,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-apache-shiro</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/odl-aaa-password-service/pom.xml b/features/odl-aaa-password-service/pom.xml
index 2c83584172f97aa62f2caf783c62e9cb0579e846..8d6edfd12b15e73306b919a60b336b593f950d87 100644 (file)
--- a/features/odl-aaa-password-service/pom.xml
+++ b/features/odl-aaa-password-service/pom.xml
@@ -51,6 +51,12 @@
             <classifier>aaa-password-service-config</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>odl-apache-shiro</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
@@ -65,10 +71,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

diff --git a/features/odl-aaa-shiro/pom.xml b/features/odl-aaa-shiro/pom.xml
index 31a99e9c9968e252639c682787dc04d6c54c6524..0c0a356068399dfc16bd29d419d52251c4e5fa3f 100644 (file)
--- a/features/odl-aaa-shiro/pom.xml
+++ b/features/odl-aaa-shiro/pom.xml
@@ -98,18 +98,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-shiro</artifactId>
@@ -130,12 +118,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-apache-commons-codec</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
 
         <!--H2 Store -->
         <dependency>

diff --git a/features/odl-aaa-shiro/src/main/feature/feature.xml b/features/odl-aaa-shiro/src/main/feature/feature.xml
index eb2401ee3fcc40e2d5880f9a48a39f6bd1d4ddd5..59ec7f062aee1731226d4cda89947bb2db663d39 100644 (file)
--- a/features/odl-aaa-shiro/src/main/feature/feature.xml
+++ b/features/odl-aaa-shiro/src/main/feature/feature.xml
@@ -25,7 +25,6 @@
         </configfile>
         <feature version="[8.1,9)">odl-karaf-feat-jdbc</feature>
         <feature version="[8.1,9)">odl-karaf-feat-jetty</feature>
-        <feature version="[8.1,9)">odl-apache-commons-codec</feature>
         <feature version="[3,4)">odl-jolokia</feature>
     </feature>
 </features>

diff --git a/features/odl-apache-shiro/pom.xml b/features/odl-apache-shiro/pom.xml
new file mode 100644 (file)
index 0000000..5d2a369
--- /dev/null
+++ b/features/odl-apache-shiro/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2021 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>8.1.2</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.aaa</groupId>
+    <artifactId>odl-apache-shiro</artifactId>
+    <version>0.14.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: Apache Shiro</name>
+    <description>Apache Shiro (repackaged)</description>
+
+    <properties>
+        <checkDependencyChange>true</checkDependencyChange>
+        <failOnDependencyChange>true</failOnDependencyChange>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>aaa-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-servlet-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>repackaged-shiro</artifactId>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/odl-apache-shiro/src/main/feature/feature.xml b/features/odl-apache-shiro/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..b4a92d4
--- /dev/null
+++ b/features/odl-apache-shiro/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2021 PANTHEON.tech, s.r.o. and others. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name="odl-apache-shiro" version="${project.version}">
+        <feature version="[8,9)">odl-servlet-api</feature>
+    </feature>
+</features>

diff --git a/features/odl-apache-shiro/src/main/history/dependencies.xml b/features/odl-apache-shiro/src/main/history/dependencies.xml
new file mode 100644 (file)
index 0000000..8fdacdf
--- /dev/null
+++ b/features/odl-apache-shiro/src/main/history/dependencies.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-aaa-0.14.0-SNAPSHOT">
+    <feature version="0.0.0">
+        <feature>odl-servlet-api</feature>
+        <bundle>mvn:commons-beanutils/commons-beanutils/1.9.4</bundle>
+        <bundle>mvn:commons-collections/commons-collections/3.2.2</bundle>
+        <bundle>mvn:commons-logging/commons-logging/1.2</bundle>
+        <bundle>mvn:org.opendaylight.aaa/repackaged-shiro/${project.version}</bundle>
+        <bundle>mvn:org.owasp.encoder/encoder/1.2.3</bundle>
+    </feature>
+</features>

diff --git a/features/pom.xml b/features/pom.xml
index c36699716e1b7058df019bf83de5d3a7748b50a8..66c6065d8378d55f33373bac960ce893fa6b231f 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -35,6 +35,7 @@
         <module>odl-aaa-password-service</module>
         <module>odl-aaa-shiro</module>
         <module>odl-aaa-web</module>
+        <module>odl-apache-shiro</module>
     </modules>
 
     <scm>

diff --git a/parent/pom.xml b/parent/pom.xml
index 38cfe450153dba6bf0c8ebfbb1f4eda416f712f6..82bb6dabf80158ae943b9c6796b73cd20583204a 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -44,16 +44,6 @@
         <artifactId>javax.json</artifactId>
         <version>1.0.4</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.shiro</groupId>
-        <artifactId>shiro-web</artifactId>
-        <version>1.3.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.shiro</groupId>
-        <artifactId>shiro-core</artifactId>
-        <version>1.3.2</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>