|
From: Carlos S. <car...@us...> - 2005-09-22 03:05:00
|
carlossg 05/09/21 20:04:52
Modified: . maven.xml project.properties
Log:
Fix release problem when using scm:perform-release
Set JVM source and target to 1.3
Set right properties to deploy site to SF
Revision Changes Path
1.35 +7 -6 maven-plugins/maven.xml
Index: maven.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/maven.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- maven.xml 12 Aug 2005 17:47:32 -0000 1.34
+++ maven.xml 22 Sep 2005 03:04:52 -0000 1.35
@@ -119,13 +119,14 @@
project.xml, maven.xml, project.properties, but tag will not be set -->
<!-- perhaps copy extended project.xml into current directory, merge higher extends, commit & tag, replace extends
in main POM? -->
- <postGoal name="scm:cvs-checkout-project">
+ <postGoal name="scm:checkout">
<maven:pluginVar plugin="maven-scm-plugin" property="maven.scm.checkout.dir" var="dir" />
- <ant:mkdir dir="${dir}/maven-plugins" />
- <ant:copy todir="${dir}/maven-plugins" file="${pom.parent.file}" />
- <ant:copy todir="${dir}/maven-plugins" file="${pom.parent.file.parent}/project.properties" />
- <ant:copy todir="${dir}/maven-plugins" file="${pom.parent.file.parent}/LICENSE.txt" />
- <ant:copy todir="${dir}/maven-plugins" file="${pom.parent.file.parent}/plugin-project.xml" />
+ <ant:mkdir dir="${dir}/.." />
+ <ant:copy todir="${dir}/.." file="${pom.parent.file}" />
+ <ant:copy todir="${dir}/.." file="${pom.parent.file.parent}/project.properties" />
+ <ant:copy todir="${dir}/.." file="${pom.parent.file.parent}/build.properties" failonerror="false"/>
+ <ant:copy todir="${dir}/.." file="${pom.parent.file.parent}/LICENSE.txt" />
+ <ant:copy todir="${dir}/.." file="${pom.parent.file.parent}/plugin-project.xml" />
</postGoal>
<preGoal name="xdoc:jelly-transform">
1.16 +8 -0 maven-plugins/project.properties
Index: project.properties
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/project.properties,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.properties 12 Aug 2005 17:47:32 -0000 1.15
+++ project.properties 22 Sep 2005 03:04:52 -0000 1.16
@@ -34,3 +34,11 @@
#facililitate downloading dependencies
maven.repo.remote=http://www.ibiblio.org/maven,http://maven-plugins.sourceforge.net/repository
+
+maven.site.tar.options=xvf
+
+# We are targetting the 1.3 JVM and above
+maven.compile.target=1.3
+maven.compile.source=1.3
+
+maven.scm.checkout.dir=${maven.build.dir}/checkout/currentplugin
|