[MRM-1562] Update to Archiva as OSGi compliant application

Submitted by Jean-Baptiste Onofré

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1225147 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
index b15bfa3e8c380663c189272de4d0a5e26b4e2099..39a0e0cdce11e19d37d18c067c73504395613ccb 100644 (file)
--- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
+++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
@@ -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>

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
index c7a84b88883ae7bfb09d9ff7482275067ae47c17..99a7d68270b068833e6d06d5d1065bb93f32566b 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
@@ -36,7 +36,6 @@ $(function() {
              return mapRole(item);
          });
          $("#main-content").html($("#rolesGrid").tmpl(data));
-
        }
       }
     );