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 c0619a6010b4cec48060e5c27034182d11167765..10fd0e2b3aaaf7ee20af1062c3720133abc12326 100644 (file)
--- 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 447510c3cb39bc049ec19bd6a9432ef2a4576730..57ebe1cf1147485fdf0bd7f1e73b1eecbb444903 100644 (file)
--- 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