Author: olamy
Date: Fri Oct 28 17:19:01 2011
New Revision: 1190458
URL: http://svn.apache.org/viewvc?rev=1190458&view=rev
Log:
[MRM-1175] archiva-consumer-plugin-archetype: generates code that does not
compile
start working with adding it test
more to fix with 1.4 changes
Added:
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/archetype.properties
(with props)
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/goal.txt
(with props)
Modified:
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/pom.xml
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/pom.xml
Modified: archiva/sandbox/trunk/archiva-consumer-plugin-archetype/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/archiva-consumer-plugin-archetype/pom.xml?rev=1190458&r1=1190457&r2=1190458&view=diff
==============================================================================
--- archiva/sandbox/trunk/archiva-consumer-plugin-archetype/pom.xml (original)
+++ archiva/sandbox/trunk/archiva-consumer-plugin-archetype/pom.xml Fri Oct 28
17:19:01 2011
@@ -1,9 +1,54 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-parent</artifactId>
+ <version>7</version>
+ </parent>
+
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-consumer-plugin-archetype</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<name>Archiva Consumers :: Consumers Plugin Archetype</name>
<description>Simple archetype to create archiva consumers</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <id>archetype-it-tests</id>
+ <phase>integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified:
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=1190458&r1=1190457&r2=1190458&view=diff
==============================================================================
---
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/main/resources/archetype-resources/pom.xml
Fri Oct 28 17:19:01 2011
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>${version}</version>
<packaging>jar</packaging>
<name>Simple Archiva Consumer</name>
<url>http://maven.apache.org</url>
@@ -12,26 +12,29 @@
This is a simple consumer component which demonstrates how a
component can be plugged in Archiva.
</description>
+ <properties>
+ <archivaVersion>1.4-M1</archivaVersion>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-consumer-api</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>${archivaVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-configuration</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>${archivaVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-layer</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>${archivaVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-indexer</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>${archivaVersion}</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
@@ -42,23 +45,6 @@
</dependencies>
<build>
<plugins>
- <!--
- This is required to be declared in the pom.
- Generates the components.xml file which is needed for the consumer to
be looked up by Archiva
- -->
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <version>1.3.5</version>
- <executions>
- <execution>
- <id>generate</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Added:
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/archetype.properties
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/archetype.properties?rev=1190458&view=auto
==============================================================================
---
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/archetype.properties
(added)
+++
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/archetype.properties
Fri Oct 28 17:19:01 2011
@@ -0,0 +1,3 @@
+groupId=org.apache.archiva.consumer.its.compile
+artifactId=simple-consumer-compile
+version=1.0-SNAPSHOT
\ No newline at end of file
Propchange:
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/archetype.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/archetype.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/goal.txt
URL:
http://svn.apache.org/viewvc/archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/goal.txt?rev=1190458&view=auto
==============================================================================
---
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/goal.txt
(added)
+++
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/goal.txt
Fri Oct 28 17:19:01 2011
@@ -0,0 +1 @@
+test
\ No newline at end of file
Propchange:
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/goal.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/sandbox/trunk/archiva-consumer-plugin-archetype/src/test/resources/projects/compile/goal.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
