Hi Craig,
I tried calling 'maven dist' in projects api20 and tck20. It suceeded,
but some of the generated distribution files do not include the expected
files. I was able to resolve some of the issues, please see the attached
patch.
- tck20/project.properties: allow to find all tck20 sources to be
included in the src distribution file.
- tck20/maven.xml: copy the generated src distribution file to file with
a different name.
- api20/project.xml: simplify the resource settings.
- project.properties: set checkstyle properties for all subprojects.
Please update your workspace in order to get Michelle's recent changes
befor applying the patch.
We still need to resolve the problem that the generated src distribution
includes the project.xml as it is, which means it extends ../project.xml.
Regards Michael
--
Michael Bouschen [EMAIL PROTECTED] Engineering GmbH
mailto:[EMAIL PROTECTED] http://www.tech.spree.de/
Tel.:++49/30/235 520-33 Buelowstr. 66
Fax.:++49/30/2175 2012 D-10783 Berlin
Index: tck20/project.properties
===================================================================
--- tck20/project.properties (Revision 370300)
+++ tck20/project.properties (Arbeitskopie)
@@ -20,6 +20,8 @@
maven.repo.remote = http://www.ibiblio.org/maven,
http://www.jpox.org/downloads/maven
maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
+maven.src.dir=${basedir}/test
+
# iut properties file
iut.pmf.properties = iut-pmf.properties
Index: tck20/maven.xml
===================================================================
--- tck20/maven.xml (Revision 370300)
+++ tck20/maven.xml (Arbeitskopie)
@@ -697,4 +697,14 @@
</copy>
</goal>
+ <postGoal name="dist:build-src">
+ <tstamp>
+ <format property="distdate" pattern="dd_MMM_yyyy" locale="en"/>
+ </tstamp>
+ <u:replace var="version" oldChar="." newChar="_"
value="${pom.currentVersion}"/>
+ <j:set var="distfile" value="jdotck-${version}-src-${distdate}.zip"/>
+ <copy
file="${maven.build.dir}/distributions/${maven.final.name}-src.zip"
+ tofile="${maven.build.dir}/distributions/${distfile}"
failonerror="false"/>
+ </postGoal>
+
</project>
Index: api20/project.xml
===================================================================
--- api20/project.xml (Revision 370300)
+++ api20/project.xml (Arbeitskopie)
@@ -70,11 +70,6 @@
<directory>${basedir}/src/dtd</directory>
<includes>
<include>javax/jdo/*.dtd</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/dtd</directory>
- <includes>
<include>javax/jdo/*.xsd</include>
</includes>
</resource>
Index: project.properties
===================================================================
--- project.properties (Revision 370300)
+++ project.properties (Arbeitskopie)
@@ -18,6 +18,9 @@
maven.compile.source = 1.3
maven.compile.target = 1.3
+# checkstyle settings
+maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
+
# Set the javadoc title
maven.javadoc.windowtitle = ${pom.name} ${pom.currentVersion}
