Bump commons dependencies, clean up POM

Explicitly pull in beanutils 1.9.3 in aaa-shiro, and clean up the
dependencies to pull in dependencies transitively. The generated
feature ends up being identical, apart from beanutils and
commons-logging (upgraded to 1.2, which is now an OSGi bundle).

beanutils’ release notes are available at
https://commons.apache.org/proper/commons-beanutils/changes-report.html

Change-Id: I4fe725c6d4b443e0c3be3cbdd662a27a7ca7c719
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/aaa-shiro/impl/pom.xml b/aaa-shiro/impl/pom.xml
index cbf9894e15d1a139cc387985717d14d568a8a081..47151c3cd11d9942afbb56401d5857e5ba3d5ec2 100644 (file)
--- a/aaa-shiro/impl/pom.xml
+++ b/aaa-shiro/impl/pom.xml
@@ -54,19 +54,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>jersey-client</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-    </dependency>
     <!-- OAuth2 dependencies for moon -->
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.authzserver</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.oltu.oauth2</groupId>
-      <artifactId>org.apache.oltu.oauth2.common</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.resourceserver</artifactId>
@@ -82,43 +74,22 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>aaa-cert</artifactId>
     </dependency>
     <!-- end -->
-    <dependency>
-      <groupId>org.apache.shiro</groupId>
-      <artifactId>shiro-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.shiro</groupId>
       <artifactId>shiro-web</artifactId>
     </dependency>
+    <!-- Enforce newer commons-beanutils and commons-collections versions -->
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.8.3</version>
+      <version>1.9.3</version>
     </dependency>
-    <!-- commons-beanutils' dependency on commons-collections is supposed to be optional... -->
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
       <version>3.2.2</version>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <scope>provided</scope>
-    </dependency>
+
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.dependencymanager</artifactId>