Author: skygo
Date: Fri Mar 7 18:45:42 2014
New Revision: 1575365
URL: http://svn.apache.org/r1575365
Log:
-- archetype pom no more filtered
-- add needed dependencies version in metadata
-- archetype to jdk6
-- adapt IT
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
- copied, changed from r1575246,
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml?rev=1575365&r1=1575364&r2=1575365&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
Fri Mar 7 18:45:42 2014
@@ -77,7 +77,17 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
- </resources>
+ <resource>
+ <directory>src/main/resourcesstatic</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1575365&r1=1575364&r2=1575365&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
Fri Mar 7 18:45:42 2014
@@ -33,4 +33,30 @@
<directory>src/test/resources</directory>
</fileSet>
</fileSets>
+ <requiredProperties>
+ <requiredProperty key="wagonVersion">
+ <defaultValue>${wagon.version}</defaultValue>
+ </requiredProperty>
+ <requiredProperty key="archivaVersion">
+ <defaultValue>${archivaVersion}</defaultValue>
+ </requiredProperty>
+ <requiredProperty key="log4jVersion">
+ <defaultValue>${log4j.version}</defaultValue>
+ </requiredProperty>
+ <requiredProperty key="slf4jVersion">
+ <defaultValue>${slf4j.version}</defaultValue>
+ </requiredProperty>
+ <requiredProperty key="springVersion">
+ <defaultValue>${spring.version}</defaultValue>
+ </requiredProperty>
+ <requiredProperty key="jackrabbitVersion">
+ <defaultValue>${jackrabbit.version}</defaultValue>
+ </requiredProperty>
+ <requiredProperty key="redbackVersion">
+ <defaultValue>${redback.version}</defaultValue>
+ </requiredProperty>
+ <requiredProperty key="derbyVersion">
+ <defaultValue>${derbyVersion}</defaultValue>
+ </requiredProperty>
+ </requiredProperties>
</archetype-descriptor>
\ No newline at end of file
Copied:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
(from r1575246,
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml?p2=archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml&p1=archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml&r1=1575246&r2=1575365&rev=1575365&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
Fri Mar 7 18:45:42 2014
@@ -17,7 +17,6 @@
~ 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";>
@@ -34,9 +33,13 @@
</description>
<properties>
<archiva.version>${archivaVersion}</archiva.version>
- <wagonVersion>${wagon.version}</wagonVersion>
- <slf4jVersion>${slf4j.version}</slf4jVersion>
- <log4jVersion>${log4j.version}</log4jVersion>
+ <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>
</properties>
<dependencies>
<dependency>
@@ -286,8 +289,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties?rev=1575365&r1=1575364&r2=1575365&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
Fri Mar 7 18:45:42 2014
@@ -20,4 +20,12 @@
groupId=org.apache.archiva.consumer.its.compile
artifactId=simple-consumer-compile
version=1.0-SNAPSHOT
-package=org.apache.archiva.consumer.its
\ No newline at end of file
+package=org.apache.archiva.consumer.its
+wagonVersion=${wagon.version}
+archivaVersion=${archivaVersion}
+log4jVersion=${log4j.version}
+slf4jVersion=${slf4j.version}
+jackrabbitVersion=${jackrabbit.version}
+springVersion=${spring.version}
+redbackVersion=${redback.version}
+derbyVersion=${derbyVersion}
