From: Olivier Lamy <olamy@apache.org>
Date: Wed, 28 Dec 2011 09:09:34 +0000 (+0000)
Subject: [MRM-1562] Update to Archiva as OSGi compliant application
X-Git-Tag: archiva-1.4-M3~1688
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=020a44b802ee98559151344676ceb704af4e9be5;p=archiva.git

[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 b15bfa3e8..39a0e0cdc 100644
--- 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 c7a84b888..99a7d6827 100644
--- 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));
-
        }
       }
     );