From 020a44b802ee98559151344676ceb704af4e9be5 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 28 Dec 2011 09:09:34 +0000 Subject: [PATCH] =?UTF-8?q?[MRM-1562]=20Update=20to=20Archiva=20as=20OSGi?= =?UTF-8?q?=20compliant=20application=20Submitted=20by=20Jean-Baptiste=20O?= =?UTF-8?q?nofr=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1225147 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml | 2 +- .../archiva-webapp-js/src/main/webapp/js/redback/roles.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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 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)); - } } );