|
|
@@ -30,214 +30,14 @@ |
|
|
|
<version>7-SNAPSHOT</version> |
|
|
|
<relativePath>../parent/pom.xml</relativePath> |
|
|
|
</parent> |
|
|
|
<name>Apache Archiva</name> |
|
|
|
|
|
|
|
<artifactId>archiva</artifactId> |
|
|
|
<packaging>pom</packaging> |
|
|
|
<version>1.4-SNAPSHOT</version> |
|
|
|
<packaging>pom</packaging> |
|
|
|
|
|
|
|
<name>Apache Archiva</name> |
|
|
|
<url>http://archiva.apache.org</url> |
|
|
|
<scm> |
|
|
|
<connection>scm:svn:http://svn.apache.org/repos/asf/archiva/trunk</connection> |
|
|
|
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/trunk</developerConnection> |
|
|
|
<url>http://svn.apache.org/viewvc/archiva/trunk</url> |
|
|
|
</scm> |
|
|
|
|
|
|
|
<build> |
|
|
|
<plugins> |
|
|
|
<!-- We want to package up license resources in the JARs produced --> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-remote-resources-plugin</artifactId> |
|
|
|
<executions> |
|
|
|
<execution> |
|
|
|
<goals> |
|
|
|
<goal>process</goal> |
|
|
|
</goals> |
|
|
|
<configuration> |
|
|
|
<resourceBundles> |
|
|
|
<resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle> |
|
|
|
</resourceBundles> |
|
|
|
</configuration> |
|
|
|
</execution> |
|
|
|
</executions> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-enforcer-plugin</artifactId> |
|
|
|
<version>1.0</version> |
|
|
|
<executions> |
|
|
|
<execution> |
|
|
|
<goals> |
|
|
|
<goal>enforce</goal> |
|
|
|
</goals> |
|
|
|
<configuration> |
|
|
|
<rules> |
|
|
|
<bannedDependencies> |
|
|
|
<excludes> |
|
|
|
<exclude>org.codehaus.plexus:plexus-container-default</exclude> |
|
|
|
<exclude>org.codehaus.plexus:plexus-log4j-logging</exclude> |
|
|
|
<exclude>org.codehaus.plexus:plexus-quartz</exclude> |
|
|
|
<exclude>org.codehaus.plexus:plexus-spring</exclude> |
|
|
|
<exclude>org.codehaus.redback:plexus-spring</exclude> |
|
|
|
<exclude>commons-logging:commons-logging</exclude> |
|
|
|
<exclude>org.slf4j:jcl104-over-slf4j</exclude> |
|
|
|
<exclude>velocity:velocity-dep</exclude> |
|
|
|
<exclude>classworlds:classworlds</exclude> |
|
|
|
<exclude>javax.transaction:jta</exclude> |
|
|
|
<exclude>javax.sql:jdbc-stdext</exclude> |
|
|
|
<exclude>ant:ant-optional</exclude> |
|
|
|
<exclude>xom:xom</exclude> |
|
|
|
<exclude>org.codehaus.plexus:plexus-xwork-integration</exclude> |
|
|
|
<exclude>org.codehaus.plexus:plexus-component-api</exclude> |
|
|
|
<exclude>org.codehaus.plexus:plexus-container-default</exclude> |
|
|
|
<exclude>plexus:plexus-utils</exclude> |
|
|
|
<exclude>com.google.code.atinject:atinject</exclude> |
|
|
|
<exclude>org.codehaus.plexus.cache:plexus-cache-api</exclude> |
|
|
|
<exclude>org.codehaus.plexus.cache:plexus-cache-ehcache</exclude> |
|
|
|
<exclude>net.sf.ehcache:ehcache</exclude> |
|
|
|
<exclude>org.codehaus.plexus.registry:plexus-registry-api</exclude> |
|
|
|
<exclude>org.codehaus.plexus.registry:plexus-registry-commons</exclude> |
|
|
|
<exclude>>org.codehaus.plexus:plexus-taskqueue</exclude> |
|
|
|
</excludes> |
|
|
|
</bannedDependencies> |
|
|
|
</rules> |
|
|
|
</configuration> |
|
|
|
</execution> |
|
|
|
</executions> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.codehaus.plexus</groupId> |
|
|
|
<artifactId>plexus-component-metadata</artifactId> |
|
|
|
<version>1.0-beta-3.0.5</version> |
|
|
|
<executions> |
|
|
|
<execution> |
|
|
|
<id>generate</id> |
|
|
|
<phase>generate-resources</phase> |
|
|
|
<goals> |
|
|
|
<goal>generate-metadata</goal> |
|
|
|
</goals> |
|
|
|
</execution> |
|
|
|
</executions> |
|
|
|
</plugin> |
|
|
|
</plugins> |
|
|
|
<pluginManagement> |
|
|
|
<plugins> |
|
|
|
<plugin> |
|
|
|
<groupId>org.codehaus.mojo</groupId> |
|
|
|
<artifactId>cobertura-maven-plugin</artifactId> |
|
|
|
<version>2.4</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.codehaus.mojo</groupId> |
|
|
|
<artifactId>exec-maven-plugin</artifactId> |
|
|
|
<version>1.2</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.codehaus.modello</groupId> |
|
|
|
<artifactId>modello-maven-plugin</artifactId> |
|
|
|
<version>1.0</version> |
|
|
|
<configuration> |
|
|
|
<useJava5>true</useJava5> |
|
|
|
</configuration> |
|
|
|
<dependencies> |
|
|
|
<dependency> |
|
|
|
<groupId>org.codehaus.modello</groupId> |
|
|
|
<artifactId>modello-plugin-plexus-registry</artifactId> |
|
|
|
<version>1.0-alpha-21</version> |
|
|
|
</dependency> |
|
|
|
</dependencies> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-assembly-plugin</artifactId> |
|
|
|
<version>2.2-beta-3</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-compiler-plugin</artifactId> |
|
|
|
<version>2.3.2</version> |
|
|
|
<configuration> |
|
|
|
<source>1.5</source> |
|
|
|
<target>1.5</target> |
|
|
|
</configuration> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-clean-plugin</artifactId> |
|
|
|
<version>2.4.1</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-remote-resources-plugin</artifactId> |
|
|
|
<version>1.2</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-deploy-plugin</artifactId> |
|
|
|
<version>2.3</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-gpg-plugin</artifactId> |
|
|
|
<version>1.1</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-install-plugin</artifactId> |
|
|
|
<version>2.3.1</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-jar-plugin</artifactId> |
|
|
|
<version>2.3.1</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-release-plugin</artifactId> |
|
|
|
<version>2.1</version> |
|
|
|
<configuration> |
|
|
|
<tagBase>https://svn.apache.org/repos/asf/archiva/tags</tagBase> |
|
|
|
<useReleaseProfile>false</useReleaseProfile> |
|
|
|
<autoVersionSubmodules>true</autoVersionSubmodules> |
|
|
|
<goals>deploy</goals> |
|
|
|
<preparationGoals>clean</preparationGoals> |
|
|
|
<!-- TODO: merge these when upgrading to latest ASF parent POM --> |
|
|
|
<arguments>-Papache-release,release</arguments> |
|
|
|
</configuration> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-resources-plugin</artifactId> |
|
|
|
<version>2.5</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-surefire-plugin</artifactId> |
|
|
|
<version>2.8.1</version> |
|
|
|
<configuration> |
|
|
|
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile> |
|
|
|
</configuration> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-idea-plugin</artifactId> |
|
|
|
<version>2.2</version> |
|
|
|
<configuration> |
|
|
|
<jdkLevel>1.5</jdkLevel> |
|
|
|
</configuration> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-site-plugin</artifactId> |
|
|
|
<version>2.3</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.codehaus.mojo</groupId> |
|
|
|
<artifactId>tomcat-maven-plugin</artifactId> |
|
|
|
<version>1.1</version> |
|
|
|
</plugin> |
|
|
|
</plugins> |
|
|
|
</pluginManagement> |
|
|
|
</build> |
|
|
|
<modules> |
|
|
|
<module>skin</module> |
|
|
|
<module>archiva-cli</module> |
|
|
@@ -245,25 +45,37 @@ |
|
|
|
<module>archiva-jetty</module> |
|
|
|
<module>archiva-modules</module> |
|
|
|
</modules> |
|
|
|
<dependencies> |
|
|
|
<dependency> |
|
|
|
<groupId>junit</groupId> |
|
|
|
<artifactId>junit</artifactId> |
|
|
|
<scope>test</scope> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>easymock</groupId> |
|
|
|
<artifactId>easymock</artifactId> |
|
|
|
<version>1.2_Java1.3</version> |
|
|
|
<scope>test</scope> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>easymock</groupId> |
|
|
|
<artifactId>easymockclassextension</artifactId> |
|
|
|
<version>1.2</version> |
|
|
|
<scope>test</scope> |
|
|
|
</dependency> |
|
|
|
</dependencies> |
|
|
|
|
|
|
|
<scm> |
|
|
|
<connection>scm:svn:http://svn.apache.org/repos/asf/archiva/trunk</connection> |
|
|
|
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/trunk</developerConnection> |
|
|
|
<url>http://svn.apache.org/viewvc/archiva/trunk</url> |
|
|
|
</scm> |
|
|
|
|
|
|
|
<!-- TODO: we need to push this into the parent, and also upgrade to the latest ASF parent POM --> |
|
|
|
<distributionManagement> |
|
|
|
<repository> |
|
|
|
<id>vmbuild.staging</id> |
|
|
|
<name>Apache Release Staging Repository on VMBuild</name> |
|
|
|
<url>http://vmbuild.apache.org/archiva/repository/staged-archiva</url> |
|
|
|
</repository> |
|
|
|
</distributionManagement> |
|
|
|
|
|
|
|
<properties> |
|
|
|
<struts.version>2.1.8.1</struts.version> |
|
|
|
<maven.version>2.0.8</maven.version> |
|
|
|
<maven3x.version>3.0.3</maven3x.version> |
|
|
|
<wagon.version>1.0-beta-5</wagon.version> |
|
|
|
<redback.version>1.3-SNAPSHOT</redback.version> |
|
|
|
<jetty.version>6.1.19</jetty.version> |
|
|
|
<slf4j.version>1.5.8</slf4j.version> |
|
|
|
<binder.version>0.9</binder.version> |
|
|
|
<spring.version>3.0.5.RELEASE</spring.version> |
|
|
|
<jackrabbit.version>2.2.5</jackrabbit.version> |
|
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
|
|
|
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile> |
|
|
|
</properties> |
|
|
|
|
|
|
|
<dependencyManagement> |
|
|
|
<dependencies> |
|
|
|
<dependency> |
|
|
@@ -1049,14 +861,154 @@ |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.maven.wagon</groupId> |
|
|
|
<artifactId>wagon-provider-api</artifactId> |
|
|
|
<version>${wagon.version}</version> |
|
|
|
<groupId>org.apache.maven.wagon</groupId> |
|
|
|
<artifactId>wagon-provider-api</artifactId> |
|
|
|
<version>${wagon.version}</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.struts</groupId> |
|
|
|
<artifactId>struts2-core</artifactId> |
|
|
|
<version>${struts.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.struts</groupId> |
|
|
|
<artifactId>struts2-spring-plugin</artifactId> |
|
|
|
<version>${struts.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>xmlunit</groupId> |
|
|
|
<artifactId>xmlunit</artifactId> |
|
|
|
<version>1.0</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>joda-time</groupId> |
|
|
|
<artifactId>joda-time</artifactId> |
|
|
|
<version>1.5.2</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.mortbay.jetty</groupId> |
|
|
|
<artifactId>jetty</artifactId> |
|
|
|
<version>${jetty.version}</version> |
|
|
|
</dependency> |
|
|
|
|
|
|
|
<!-- xmlrpc --> |
|
|
|
<dependency> |
|
|
|
<groupId>com.atlassian.xmlrpc</groupId> |
|
|
|
<artifactId>atlassian-xmlrpc-binder-annotations</artifactId> |
|
|
|
<version>${binder.version}</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>com.atlassian.xmlrpc</groupId> |
|
|
|
<artifactId>atlassian-xmlrpc-binder-server-spring</artifactId> |
|
|
|
<version>${binder.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>com.atlassian.xmlrpc</groupId> |
|
|
|
<artifactId>atlassian-xmlrpc-binder</artifactId> |
|
|
|
<version>${binder.version}</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>commons-validator</groupId> |
|
|
|
<artifactId>commons-validator</artifactId> |
|
|
|
<version>1.3.1</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>com.atlassian.xmlrpc</groupId> |
|
|
|
<artifactId>atlassian-xmlrpc-binder-testing</artifactId> |
|
|
|
<version>${binder.version}</version> |
|
|
|
<scope>test</scope> |
|
|
|
</dependency> |
|
|
|
|
|
|
|
<!-- JCR --> |
|
|
|
<dependency> |
|
|
|
<groupId>javax.jcr</groupId> |
|
|
|
<artifactId>jcr</artifactId> |
|
|
|
<version>2.0</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.jackrabbit</groupId> |
|
|
|
<artifactId>jackrabbit-jcr-commons</artifactId> |
|
|
|
<version>${jackrabbit.version}</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.jackrabbit</groupId> |
|
|
|
<artifactId>jackrabbit-core</artifactId> |
|
|
|
<version>${jackrabbit.version}</version> |
|
|
|
</dependency> |
|
|
|
|
|
|
|
<!-- Transitive versions to manage --> |
|
|
|
<dependency> |
|
|
|
<groupId>org.springframework</groupId> |
|
|
|
<artifactId>spring-context</artifactId> |
|
|
|
<version>${spring.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.springframework</groupId> |
|
|
|
<artifactId>spring-web</artifactId> |
|
|
|
<version>${spring.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.springframework</groupId> |
|
|
|
<artifactId>spring-beans</artifactId> |
|
|
|
<version>${spring.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.springframework</groupId> |
|
|
|
<artifactId>spring-asm</artifactId> |
|
|
|
<version>${spring.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.struts</groupId> |
|
|
|
<artifactId>struts2-core</artifactId> |
|
|
|
<version>${struts.version}</version> |
|
|
|
<groupId>org.springframework</groupId> |
|
|
|
<artifactId>spring-core</artifactId> |
|
|
|
<version>${spring.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
@@ -1065,9 +1017,9 @@ |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.struts</groupId> |
|
|
|
<artifactId>struts2-spring-plugin</artifactId> |
|
|
|
<version>${struts.version}</version> |
|
|
|
<groupId>org.springframework</groupId> |
|
|
|
<artifactId>spring-test</artifactId> |
|
|
|
<version>${spring.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
@@ -1076,47 +1028,57 @@ |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>xmlunit</groupId> |
|
|
|
<artifactId>xmlunit</artifactId> |
|
|
|
<groupId>jdom</groupId> |
|
|
|
<artifactId>jdom</artifactId> |
|
|
|
<version>1.0</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>joda-time</groupId> |
|
|
|
<artifactId>joda-time</artifactId> |
|
|
|
<version>1.5.2</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.mortbay.jetty</groupId> |
|
|
|
<artifactId>jetty</artifactId> |
|
|
|
<version>${jetty.version}</version> |
|
|
|
<groupId>org.apache.maven.shared</groupId> |
|
|
|
<artifactId>maven-model-converter</artifactId> |
|
|
|
<version>2.1</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>org.codehaus.plexus</groupId> |
|
|
|
<artifactId>plexus-container-default</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
|
|
|
|
<!-- xmlrpc --> |
|
|
|
<dependency> |
|
|
|
<groupId>com.atlassian.xmlrpc</groupId> |
|
|
|
<artifactId>atlassian-xmlrpc-binder-annotations</artifactId> |
|
|
|
<version>${binder.version}</version> |
|
|
|
<groupId>org.apache.maven.shared</groupId> |
|
|
|
<artifactId>maven-dependency-tree</artifactId> |
|
|
|
<version>1.2</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>org.codehaus.plexus</groupId> |
|
|
|
<artifactId>plexus-container-default</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>com.atlassian.xmlrpc</groupId> |
|
|
|
<artifactId>atlassian-xmlrpc-binder-server-spring</artifactId> |
|
|
|
<version>${binder.version}</version> |
|
|
|
<groupId>org.apache.maven</groupId> |
|
|
|
<artifactId>maven-artifact-manager</artifactId> |
|
|
|
<version>${maven.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
<groupId>org.codehaus.plexus</groupId> |
|
|
|
<artifactId>plexus-container-default</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>com.atlassian.xmlrpc</groupId> |
|
|
|
<artifactId>atlassian-xmlrpc-binder</artifactId> |
|
|
|
<version>${binder.version}</version> |
|
|
|
<groupId>org.apache.maven</groupId> |
|
|
|
<artifactId>maven-artifact</artifactId> |
|
|
|
<version>${maven.version}</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>commons-validator</groupId> |
|
|
|
<artifactId>commons-validator</artifactId> |
|
|
|
<version>1.3.1</version> |
|
|
|
<groupId>org.apache.maven</groupId> |
|
|
|
<artifactId>maven-repository-metadata</artifactId> |
|
|
|
<version>${maven.version}</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>net.sf.ehcache</groupId> |
|
|
|
<artifactId>ehcache-core</artifactId> |
|
|
|
<version>2.4.2</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
@@ -1125,177 +1087,245 @@ |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>com.atlassian.xmlrpc</groupId> |
|
|
|
<artifactId>atlassian-xmlrpc-binder-testing</artifactId> |
|
|
|
<version>${binder.version}</version> |
|
|
|
<groupId>org.mockito</groupId> |
|
|
|
<artifactId>mockito-all</artifactId> |
|
|
|
<version>1.8.3</version> |
|
|
|
<scope>test</scope> |
|
|
|
</dependency> |
|
|
|
</dependencies> |
|
|
|
</dependencyManagement> |
|
|
|
|
|
|
|
<!-- JCR --> |
|
|
|
<dependency> |
|
|
|
<groupId>javax.jcr</groupId> |
|
|
|
<artifactId>jcr</artifactId> |
|
|
|
<version>2.0</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.jackrabbit</groupId> |
|
|
|
<artifactId>jackrabbit-jcr-commons</artifactId> |
|
|
|
<version>${jackrabbit.version}</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.jackrabbit</groupId> |
|
|
|
<artifactId>jackrabbit-core</artifactId> |
|
|
|
<version>${jackrabbit.version}</version> |
|
|
|
</dependency> |
|
|
|
<dependencies> |
|
|
|
<dependency> |
|
|
|
<groupId>junit</groupId> |
|
|
|
<artifactId>junit</artifactId> |
|
|
|
<scope>test</scope> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>easymock</groupId> |
|
|
|
<artifactId>easymock</artifactId> |
|
|
|
<version>1.2_Java1.3</version> |
|
|
|
<scope>test</scope> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>easymock</groupId> |
|
|
|
<artifactId>easymockclassextension</artifactId> |
|
|
|
<version>1.2</version> |
|
|
|
<scope>test</scope> |
|
|
|
</dependency> |
|
|
|
</dependencies> |
|
|
|
|
|
|
|
<repositories> |
|
|
|
<repository> |
|
|
|
<id>redback</id> |
|
|
|
<url>http://snapshots.repository.codehaus.org/</url> |
|
|
|
<releases> |
|
|
|
<enabled>false</enabled> |
|
|
|
</releases> |
|
|
|
<snapshots> |
|
|
|
<enabled>true</enabled> |
|
|
|
</snapshots> |
|
|
|
</repository> |
|
|
|
</repositories> |
|
|
|
|
|
|
|
<build> |
|
|
|
<plugins> |
|
|
|
<!-- We want to package up license resources in the JARs produced --> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-remote-resources-plugin</artifactId> |
|
|
|
<executions> |
|
|
|
<execution> |
|
|
|
<goals> |
|
|
|
<goal>process</goal> |
|
|
|
</goals> |
|
|
|
<configuration> |
|
|
|
<resourceBundles> |
|
|
|
<resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle> |
|
|
|
</resourceBundles> |
|
|
|
</configuration> |
|
|
|
</execution> |
|
|
|
</executions> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-enforcer-plugin</artifactId> |
|
|
|
<version>1.0</version> |
|
|
|
<executions> |
|
|
|
<execution> |
|
|
|
<goals> |
|
|
|
<goal>enforce</goal> |
|
|
|
</goals> |
|
|
|
<configuration> |
|
|
|
<rules> |
|
|
|
<bannedDependencies> |
|
|
|
<excludes> |
|
|
|
<exclude>org.codehaus.plexus:plexus-container-default</exclude> |
|
|
|
<exclude>org.codehaus.plexus:plexus-log4j-logging</exclude> |
|
|
|
<exclude>org.codehaus.plexus:plexus-quartz</exclude> |
|
|
|
<exclude>org.codehaus.plexus:plexus-spring</exclude> |
|
|
|
<exclude>org.codehaus.redback:plexus-spring</exclude> |
|
|
|
<exclude>commons-logging:commons-logging</exclude> |
|
|
|
<exclude>org.slf4j:jcl104-over-slf4j</exclude> |
|
|
|
<exclude>velocity:velocity-dep</exclude> |
|
|
|
<exclude>classworlds:classworlds</exclude> |
|
|
|
<exclude>javax.transaction:jta</exclude> |
|
|
|
<exclude>javax.sql:jdbc-stdext</exclude> |
|
|
|
<exclude>ant:ant-optional</exclude> |
|
|
|
<exclude>xom:xom</exclude> |
|
|
|
<exclude>org.codehaus.plexus:plexus-xwork-integration</exclude> |
|
|
|
<exclude>org.codehaus.plexus:plexus-component-api</exclude> |
|
|
|
<exclude>org.codehaus.plexus:plexus-container-default</exclude> |
|
|
|
<exclude>plexus:plexus-utils</exclude> |
|
|
|
<exclude>com.google.code.atinject:atinject</exclude> |
|
|
|
<exclude>org.codehaus.plexus.cache:plexus-cache-api</exclude> |
|
|
|
<exclude>org.codehaus.plexus.cache:plexus-cache-ehcache</exclude> |
|
|
|
<exclude>net.sf.ehcache:ehcache</exclude> |
|
|
|
<exclude>org.codehaus.plexus.registry:plexus-registry-api</exclude> |
|
|
|
<exclude>org.codehaus.plexus.registry:plexus-registry-commons</exclude> |
|
|
|
<exclude>>org.codehaus.plexus:plexus-taskqueue</exclude> |
|
|
|
</excludes> |
|
|
|
</bannedDependencies> |
|
|
|
</rules> |
|
|
|
</configuration> |
|
|
|
</execution> |
|
|
|
</executions> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.codehaus.plexus</groupId> |
|
|
|
<artifactId>plexus-component-metadata</artifactId> |
|
|
|
<version>1.0-beta-3.0.5</version> |
|
|
|
<executions> |
|
|
|
<execution> |
|
|
|
<id>generate</id> |
|
|
|
<phase>generate-resources</phase> |
|
|
|
<goals> |
|
|
|
<goal>generate-metadata</goal> |
|
|
|
</goals> |
|
|
|
</execution> |
|
|
|
</executions> |
|
|
|
</plugin> |
|
|
|
</plugins> |
|
|
|
<pluginManagement> |
|
|
|
<plugins> |
|
|
|
<plugin> |
|
|
|
<groupId>org.codehaus.mojo</groupId> |
|
|
|
<artifactId>cobertura-maven-plugin</artifactId> |
|
|
|
<version>2.4</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.codehaus.mojo</groupId> |
|
|
|
<artifactId>exec-maven-plugin</artifactId> |
|
|
|
<version>1.2</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.codehaus.modello</groupId> |
|
|
|
<artifactId>modello-maven-plugin</artifactId> |
|
|
|
<version>1.0</version> |
|
|
|
<configuration> |
|
|
|
<useJava5>true</useJava5> |
|
|
|
</configuration> |
|
|
|
<dependencies> |
|
|
|
<dependency> |
|
|
|
<groupId>org.codehaus.modello</groupId> |
|
|
|
<artifactId>modello-plugin-plexus-registry</artifactId> |
|
|
|
<version>1.0-alpha-21</version> |
|
|
|
</dependency> |
|
|
|
</dependencies> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-assembly-plugin</artifactId> |
|
|
|
<version>2.2-beta-3</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-compiler-plugin</artifactId> |
|
|
|
<version>2.3.2</version> |
|
|
|
<configuration> |
|
|
|
<source>1.5</source> |
|
|
|
<target>1.5</target> |
|
|
|
</configuration> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-clean-plugin</artifactId> |
|
|
|
<version>2.4.1</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-remote-resources-plugin</artifactId> |
|
|
|
<version>1.2</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-deploy-plugin</artifactId> |
|
|
|
<version>2.3</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-gpg-plugin</artifactId> |
|
|
|
<version>1.1</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-install-plugin</artifactId> |
|
|
|
<version>2.3.1</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-jar-plugin</artifactId> |
|
|
|
<version>2.3.1</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-release-plugin</artifactId> |
|
|
|
<version>2.1</version> |
|
|
|
<configuration> |
|
|
|
<tagBase>https://svn.apache.org/repos/asf/archiva/tags</tagBase> |
|
|
|
<useReleaseProfile>false</useReleaseProfile> |
|
|
|
<autoVersionSubmodules>true</autoVersionSubmodules> |
|
|
|
<goals>deploy</goals> |
|
|
|
<preparationGoals>clean</preparationGoals> |
|
|
|
<!-- TODO: merge these when upgrading to latest ASF parent POM --> |
|
|
|
<arguments>-Papache-release,release</arguments> |
|
|
|
</configuration> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-resources-plugin</artifactId> |
|
|
|
<version>2.5</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-surefire-plugin</artifactId> |
|
|
|
<version>2.8.1</version> |
|
|
|
<configuration> |
|
|
|
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile> |
|
|
|
</configuration> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-idea-plugin</artifactId> |
|
|
|
<version>2.2</version> |
|
|
|
<configuration> |
|
|
|
<jdkLevel>1.5</jdkLevel> |
|
|
|
</configuration> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.apache.maven.plugins</groupId> |
|
|
|
<artifactId>maven-site-plugin</artifactId> |
|
|
|
<version>2.3</version> |
|
|
|
</plugin> |
|
|
|
<plugin> |
|
|
|
<groupId>org.codehaus.mojo</groupId> |
|
|
|
<artifactId>tomcat-maven-plugin</artifactId> |
|
|
|
<version>1.1</version> |
|
|
|
</plugin> |
|
|
|
</plugins> |
|
|
|
</pluginManagement> |
|
|
|
</build> |
|
|
|
|
|
|
|
<!-- Transitive versions to manage --> |
|
|
|
<dependency> |
|
|
|
<groupId>org.springframework</groupId> |
|
|
|
<artifactId>spring-context</artifactId> |
|
|
|
<version>${spring.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.springframework</groupId> |
|
|
|
<artifactId>spring-web</artifactId> |
|
|
|
<version>${spring.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.springframework</groupId> |
|
|
|
<artifactId>spring-beans</artifactId> |
|
|
|
<version>${spring.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.springframework</groupId> |
|
|
|
<artifactId>spring-asm</artifactId> |
|
|
|
<version>${spring.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.springframework</groupId> |
|
|
|
<artifactId>spring-core</artifactId> |
|
|
|
<version>${spring.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.springframework</groupId> |
|
|
|
<artifactId>spring-test</artifactId> |
|
|
|
<version>${spring.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>jdom</groupId> |
|
|
|
<artifactId>jdom</artifactId> |
|
|
|
<version>1.0</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.maven.shared</groupId> |
|
|
|
<artifactId>maven-model-converter</artifactId> |
|
|
|
<version>2.1</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>org.codehaus.plexus</groupId> |
|
|
|
<artifactId>plexus-container-default</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.maven.shared</groupId> |
|
|
|
<artifactId>maven-dependency-tree</artifactId> |
|
|
|
<version>1.2</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>org.codehaus.plexus</groupId> |
|
|
|
<artifactId>plexus-container-default</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.maven</groupId> |
|
|
|
<artifactId>maven-artifact-manager</artifactId> |
|
|
|
<version>${maven.version}</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>org.codehaus.plexus</groupId> |
|
|
|
<artifactId>plexus-container-default</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.maven</groupId> |
|
|
|
<artifactId>maven-artifact</artifactId> |
|
|
|
<version>${maven.version}</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.apache.maven</groupId> |
|
|
|
<artifactId>maven-repository-metadata</artifactId> |
|
|
|
<version>${maven.version}</version> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>net.sf.ehcache</groupId> |
|
|
|
<artifactId>ehcache-core</artifactId> |
|
|
|
<version>2.4.2</version> |
|
|
|
<exclusions> |
|
|
|
<exclusion> |
|
|
|
<groupId>commons-logging</groupId> |
|
|
|
<artifactId>commons-logging</artifactId> |
|
|
|
</exclusion> |
|
|
|
</exclusions> |
|
|
|
</dependency> |
|
|
|
<dependency> |
|
|
|
<groupId>org.mockito</groupId> |
|
|
|
<artifactId>mockito-all</artifactId> |
|
|
|
<version>1.8.3</version> |
|
|
|
<scope>test</scope> |
|
|
|
</dependency> |
|
|
|
</dependencies> |
|
|
|
</dependencyManagement> |
|
|
|
<properties> |
|
|
|
<struts.version>2.1.8.1</struts.version> |
|
|
|
<maven.version>2.0.8</maven.version> |
|
|
|
<maven3x.version>3.0.3</maven3x.version> |
|
|
|
<wagon.version>1.0-beta-5</wagon.version> |
|
|
|
<redback.version>1.3-SNAPSHOT</redback.version> |
|
|
|
<jetty.version>6.1.19</jetty.version> |
|
|
|
<slf4j.version>1.5.8</slf4j.version> |
|
|
|
<binder.version>0.9</binder.version> |
|
|
|
<spring.version>3.0.5.RELEASE</spring.version> |
|
|
|
<jackrabbit.version>2.2.5</jackrabbit.version> |
|
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
|
|
|
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile> |
|
|
|
</properties> |
|
|
|
<profiles> |
|
|
|
<profile> |
|
|
|
<id>release</id> |
|
|
@@ -1396,24 +1426,6 @@ |
|
|
|
</repositories> |
|
|
|
</profile> |
|
|
|
</profiles> |
|
|
|
<!-- TODO: we need to push this into the parent, and also upgrade to the latest ASF parent POM --> |
|
|
|
<distributionManagement> |
|
|
|
<repository> |
|
|
|
<id>vmbuild.staging</id> |
|
|
|
<name>Apache Release Staging Repository on VMBuild</name> |
|
|
|
<url>http://vmbuild.apache.org/archiva/repository/staged-archiva</url> |
|
|
|
</repository> |
|
|
|
</distributionManagement> |
|
|
|
<repositories> |
|
|
|
<repository> |
|
|
|
<id>redback</id> |
|
|
|
<url>http://snapshots.repository.codehaus.org/</url> |
|
|
|
<releases> |
|
|
|
<enabled>false</enabled> |
|
|
|
</releases> |
|
|
|
<snapshots> |
|
|
|
<enabled>true</enabled> |
|
|
|
</snapshots> |
|
|
|
</repository> |
|
|
|
</repositories> |
|
|
|
|
|
|
|
|
|
|
|
</project> |