trim POM to required resources
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/482c368d Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/482c368d Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/482c368d Branch: refs/heads/master Commit: 482c368d0d3d4fe8def6899ce9713fe899d0ae07 Parents: 50e30fe Author: Brett Porter <[email protected]> Authored: Tue Jul 29 15:54:11 2014 +1000 Committer: Brett Porter <[email protected]> Committed: Tue Jul 29 15:54:42 2014 +1000 ---------------------------------------------------------------------- .../META-INF/maven/archetype-metadata.xml | 15 -- .../resourcesstatic/archetype-resources/pom.xml | 188 ++++--------------- 2 files changed, 38 insertions(+), 165 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/482c368d/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index 48efe7e..fa67d3d 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -34,9 +34,6 @@ </fileSet> </fileSets> <requiredProperties> - <requiredProperty key="wagonVersion"> - <defaultValue>${wagon.version}</defaultValue> - </requiredProperty> <requiredProperty key="archivaVersion"> <defaultValue>${archivaVersion}</defaultValue> </requiredProperty> @@ -52,17 +49,5 @@ <requiredProperty key="jackrabbitVersion"> <defaultValue>${jackrabbit.version}</defaultValue> </requiredProperty> - <requiredProperty key="redbackVersion"> - <defaultValue>${redback.version}</defaultValue> - </requiredProperty> - <requiredProperty key="derbyVersion"> - <defaultValue>${derbyVersion}</defaultValue> - </requiredProperty> - <requiredProperty key="httpclientCoreVersion"> - <defaultValue>${httpclient.core.version}</defaultValue> - </requiredProperty> - <requiredProperty key="commons-poolVersion"> - <defaultValue>${commons-pool.version}</defaultValue> - </requiredProperty> </requiredProperties> </archetype-descriptor> http://git-wip-us.apache.org/repos/asf/archiva/blob/482c368d/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml index da0baf6..4c97fb7 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml @@ -24,24 +24,17 @@ <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> <version>${version}</version> - <packaging>jar</packaging> <name>Simple Archiva Consumer</name> - <url>http://archiva.apache.org</url> <description> This is a simple consumer component which demonstrates how a component can be plugged in Archiva. </description> <properties> <archiva.version>${archivaVersion}</archiva.version> - <wagonVersion>${wagonVersion}</wagonVersion> <slf4jVersion>${slf4jVersion}</slf4jVersion> <log4jVersion>${log4jVersion}</log4jVersion> <jackrabbit.version>${jackrabbitVersion}</jackrabbit.version> <spring.version>${springVersion}</spring.version> - <redback.version>${redbackVersion}</redback.version> - <derbyVersion>${derbyVersion}</derbyVersion> - <commons-pool.version>${commons-poolVersion}</commons-pool.version> - <httpclientCoreVersion>${httpclientCoreVersion}</httpclientCoreVersion> </properties> <dependencies> <dependency> @@ -56,31 +49,13 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-layer</artifactId> + <artifactId>archiva-repository-admin-api</artifactId> <version>${archiva.version}</version> </dependency> <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-indexer</artifactId> - <version>${archiva.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>maven2-repository</artifactId> - <version>${archiva.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>3.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> + <groupId>org.apache.archiva.redback.components.registry</groupId> + <artifactId>spring-registry-api</artifactId> + <version>2.3</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -88,92 +63,26 @@ <version>${slf4jVersion}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4jVersion}</version> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4jVersion}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - <version>${log4jVersion}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${log4jVersion}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <version>${log4jVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-admin-default</artifactId> - <version>${archiva.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>metadata-store-jcr</artifactId> - <version>${archiva.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-core</artifactId> - <version>${jackrabbit.version}</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> + <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-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-expression</artifactId> - <version>${spring.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -187,39 +96,22 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-common-test-resources</artifactId> - <scope>test</scope> - <version>${redback.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-rbac-memory</artifactId> - <scope>test</scope> - <version>${redback.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-rbac-cached</artifactId> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>3.2</version> <scope>test</scope> - <version>${redback.version}</version> </dependency> <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-rbac-role-manager</artifactId> + <groupId>org.apache.archiva</groupId> + <artifactId>metadata-store-jcr</artifactId> + <version>${archiva.version}</version> <scope>test</scope> - <version>${redback.version}</version> </dependency> <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http</artifactId> - <version>${wagonVersion}</version> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-core</artifactId> + <version>${jackrabbit.version}</version> <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>${httpclientCoreVersion}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -228,32 +120,28 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-lightweight</artifactId> - <version>${wagonVersion}</version> + <groupId>org.apache.archiva.redback.components</groupId> + <artifactId>spring-quartz</artifactId> + <version>2.1</version> <scope>test</scope> </dependency> <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.11.0</version> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>${derbyVersion}</version> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4jVersion}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <version>1.4</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${log4jVersion}</version> <scope>test</scope> </dependency> <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4jVersion}</version> <scope>test</scope> - <version>${commons-pool.version}</version> </dependency> </dependencies> <build>
