From: Olivier Lamy Date: Mon, 12 Mar 2012 08:52:50 +0000 (+0000) Subject: osgi import fix again :-) X-Git-Tag: archiva-1.4-M3~1063 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=214b0b0d55fb986833ef03869ffef244d7ec833c;p=archiva.git osgi import fix again :-) git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1299585 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js index c0619a601..10fd0e2b3 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js @@ -556,4 +556,9 @@ $(function() { }); } + + //--------------------------- + // system status part + //--------------------------- + }); \ No newline at end of file diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml index 447510c3c..57ebe1cf1 100644 --- a/archiva-modules/plugins/stage-repository-merge/pom.xml +++ b/archiva-modules/plugins/stage-repository-merge/pom.xml @@ -106,6 +106,8 @@ org.apache.archiva.metadata.*;version=${project.version}, org.apache.archiva.model;version=${project.version}, org.apache.archiva.repository*;version=${project.version}, + org.apache.archiva.maven2.metadata*;version=${project.version}, + org.apache.archiva.xml*;version=${project.version}, org.apache.commons.io;version="[1.4,2)", org.springframework*;version="[3,4)", org.slf4j;resolution:=optional