svn commit: r1189311 - in /karaf/trunk: pom.xml tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java

[jg...@apache.org]

Author: jgoodyear
Date: Wed Oct 26 17:00:53 2011
New Revision: 1189311

URL: http://svn.apache.org/viewvc?rev=1189311&view=rev
Log:
[KARAF-966] Update xbean to 3.8

Update xbean to 3.8, modify usage of xbean finder (tighten use of generics).

Modified:
    karaf/trunk/pom.xml
    karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java

Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1189311&r1=1189310&r2=1189311&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Oct 26 17:00:53 2011
@@ -161,7 +161,7 @@
         <spring.osgi.version>1.2.1</spring.osgi.version>
         <spring.version>3.0.6.RELEASE</spring.version>
         <sshd.version>0.6.0</sshd.version>
-        <xbean.version>3.7</xbean.version>
+        <xbean.version>3.8</xbean.version>
         <javax.mail.version>1.4.4</javax.mail.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

Modified: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java?rev=1189311&r1=1189310&r2=1189311&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java Wed Oct 26 17:00:53 2011
@@ -126,7 +126,7 @@ public class GenerateHelpMojo extends Ab
             } else {
                 throw new MojoFailureException("classLoader attribute must be 'project' or 'plugin'");
             }
-            List<Class> classes = finder.findAnnotatedClasses(Command.class);
+            List<Class<?>> classes = finder.findAnnotatedClasses(Command.class);
             if (classes.isEmpty()) {
                 throw new MojoFailureException("No command found");
             }