Author: olamy
Date: Mon Mar 12 08:52:50 2012
New Revision: 1299585
URL: http://svn.apache.org/viewvc?rev=1299585&view=rev
Log:
osgi import fix again :-)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1299585&r1=1299584&r2=1299585&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
Mon Mar 12 08:52:50 2012
@@ -556,4 +556,9 @@ $(function() {
});
}
+
+ //---------------------------
+ // system status part
+ //---------------------------
+
});
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml?rev=1299585&r1=1299584&r2=1299585&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml
(original)
+++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml Mon
Mar 12 08:52:50 2012
@@ -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
