svn commit: r1225147 - in /archiva/trunk/archiva-modules: archiva-base/archiva-plexus-bridge/pom.xml archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js

[olamy]

Author: olamy
Date: Wed Dec 28 09:09:34 2011
New Revision: 1225147

URL: http://svn.apache.org/viewvc?rev=1225147&view=rev
Log:
[MRM-1562] Update to Archiva as OSGi compliant application
Submitted by Jean-Baptiste Onofré

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml?rev=1225147&r1=1225146&r2=1225147&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml 
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml 
Wed Dec 28 09:09:34 2011
@@ -85,7 +85,7 @@
               org.codehaus.plexus.classworlds*,
               org.codehaus.plexus.component.repository.exception,
               org.codehaus.plexus.digest,
-              org.springframework.stereotype,
+              org.springframework.stereotype;version="[3,4)",
               org.apache.maven.index.context;resolution:=optional,
               org.slf4j;resolution:=optional
             </Import-Package>

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js?rev=1225147&r1=1225146&r2=1225147&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
 Wed Dec 28 09:09:34 2011
@@ -36,7 +36,6 @@ $(function() {
              return mapRole(item);
          });
          $("#main-content").html($("#rolesGrid").tmpl(data));
-
        }
       }
     );