Merged /archiva/trunk:r888397-889227

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@889240 13f79535-47bb-0310-9956-ffa450edef68

diff --cc archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
Simple merge

diff --cc archiva-modules/archiva-reporting/pom.xml
Simple merge

diff --cc archiva-modules/archiva-web/archiva-webapp/pom.xml
index 06fd7df9a63e73f8db21cdece9d21963a6fe29bb,bab0d1abbe54f2de8f43c40ace956da346c022f0..d91a1e9471f5ecbf371a9dbe39ff921270168750
--- 1/archiva-modules/archiva-web/archiva-webapp/pom.xml
--- 2/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@@ -35,11 -35,16 +35,16 @@@
      </dependency>
      <dependency>
        <groupId>org.apache.archiva</groupId>
 -      <artifactId>archiva-report-manager</artifactId>
 +      <artifactId>repository-statistics</artifactId>
      </dependency>
+     <dependency>
+       <groupId>org.apache.archiva</groupId>
+       <artifactId>archiva-artifact-reports</artifactId>
+       <scope>runtime</scope>
+     </dependency>
      <dependency>
        <groupId>org.apache.archiva</groupId>
 -      <artifactId>archiva-scheduled</artifactId>
 +      <artifactId>archiva-scheduler-repository</artifactId>
      </dependency>
      <dependency>
        <groupId>org.apache.archiva</groupId>