mcconnell 2004/05/15 22:41:42
Modified: repository/api project.xml
repository maven.xml project.xml
Log:
Add notice file handling and prep for 2.0.0 release.
Revision Changes Path
1.7 +0 -41 avalon/repository/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/api/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 8 May 2004 18:24:17 -0000 1.6
+++ project.xml 16 May 2004 05:41:42 -0000 1.7
@@ -16,45 +16,4 @@
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Repository API</shortDescription>
- <build>
-
- <sourceDirectory>${basedir}/src/java/</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/src/test/</unitTestSourceDirectory>
-
- <unitTest>
- <includes>
- <include>**/*Test.*</include>
- <include>**/*TestCase.*</include>
- </includes>
- <excludes>
- <exclude>**/Abstract*.*</exclude>
- </excludes>
- <resources>
- <resource>
- <directory>${basedir}/src/test</directory>
- <includes>
- <include>**/*.x*</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
-
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/target/</directory>
- <includes>
- <include>*.meta</include>
- </includes>
- </resource>
- </resources>
-
- <jars></jars>
-
- </build>
</project>
1.24 +11 -2 avalon/repository/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/repository/maven.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- maven.xml 8 May 2004 18:24:17 -0000 1.23
+++ maven.xml 16 May 2004 05:41:42 -0000 1.24
@@ -47,7 +47,7 @@
<ant:property name="maven.dist.src.archive.dir"
value="${maven.dist.assembly.dir}/src"/>
<ant:property name="maven.dist.bin.assembly.dir"
- value="${maven.dist.assembly.dir}/bin/avalon-${pom.currentVersion}"/>
+ value="${maven.dist.assembly.dir}/bin/${pom.artifactId}"/>
<ant:property name="maven.dist.src.assembly.dir"
value="${maven.dist.assembly.dir}/src/${pom.artifactId}"/>
<ant:property name="maven.dist.dir"
@@ -252,8 +252,11 @@
</ant:echo>
<ant:copy todir="${maven.dist.bin.assembly.dir}">
<ant:fileset dir=".">
+ <ant:include name="README.txt"/>
+ </ant:fileset>
+ <ant:fileset dir="${avalon.buildsystem}/site">
<ant:include name="LICENSE*"/>
- <ant:include name="README*"/>
+ <ant:include name="NOTICE*"/>
</ant:fileset>
</ant:copy>
@@ -297,7 +300,13 @@
<ant:copy todir="${maven.dist.src.assembly.dir}">
<ant:fileset dir=".">
+ <ant:include name="README.txt"/>
+ </ant:fileset>
+ <ant:fileset dir="${avalon.buildsystem}/site">
<ant:include name="LICENSE*"/>
+ <ant:include name="NOTICE*"/>
+ </ant:fileset>
+ <ant:fileset dir=".">
<ant:include name="project.properties"/>
<ant:include name="maven.xml"/>
<ant:include name="project.xml"/>
1.19 +4 -3 avalon/repository/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 1 May 2004 17:03:44 -0000 1.18
+++ project.xml 16 May 2004 05:41:42 -0000 1.19
@@ -22,7 +22,7 @@
<project>
<pomVersion>3</pomVersion>
- <groupId>avalon</groupId>
+ <groupId>&avalon-repository-id;</groupId>
<id>&avalon-repository-id;</id>
<name>Avalon Repository</name>
@@ -194,9 +194,10 @@
</includes>
</resource>
<resource>
- <directory>${basedir}/../</directory>
+ <directory>${avalon.buildsystem}/site</directory>
<includes>
- <include>LICENSE.txt</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
</includes>
</resource>
<resource>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
