mcconnell 2004/04/18 05:12:43
Modified: maven-plugins/merlin maven.xml project.xml
Added: maven-plugins/merlin runtime.xml
Log:
Seperate build time project defintion from the runtime project definition.
Revision Changes Path
1.2 +2 -2 avalon/maven-plugins/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/merlin/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 17 Apr 2004 10:22:50 -0000 1.1
+++ maven.xml 18 Apr 2004 12:12:43 -0000 1.2
@@ -38,8 +38,8 @@
<preGoal name="jar:jar">
<mkdir dir="${maven.build.dir}/classes"/>
- <ant:xslt in="${basedir}/project.xml"
out="${maven.build.dir}/classes/project.xml"
- style="${basedir}/copy-all.xsl">
+ <ant:xslt in="${basedir}/runtime.xml"
out="${maven.build.dir}/classes/project.xml"
+ style="${basedir}/copy-all.xsl" force="true">
<outputproperty name="method" value="xml" />
<outputproperty name="standalone" value="yes"/>
<outputproperty name="indent" value="yes"/>
1.4 +2 -0 avalon/maven-plugins/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/merlin/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 18 Apr 2004 04:57:41 -0000 1.3
+++ project.xml 18 Apr 2004 12:12:43 -0000 1.4
@@ -65,10 +65,12 @@
<version>&avalon-logging-logkit-impl-version;</version>
</dependency>
+ <!--
<dependency>
<groupId>&avalon-versioning-group;</groupId>
<artifactId>&avalon-versioning-id;</artifactId>
<version>&avalon-versioning-version;</version>
</dependency>
+ -->
</dependencies>
</project>
1.1 avalon/maven-plugins/merlin/runtime.xml
Index: runtime.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE project [
<!ENTITY % index SYSTEM "file:index.ent"> %index;
]>
<!--
Copyright 2001-2004 The Apache Software Foundation.
Licensed 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>
<groupId>&merlin-plugin-id;</groupId>
<id>&merlin-plugin-id;</id>
<currentVersion>&merlin-plugin-version;</currentVersion>
<pomVersion>3</pomVersion>
<name>Merlin Plugin</name>
<description>Merlin Plugin for Maven</description>
<shortDescription>Merlin Plugin for Maven</shortDescription>
<package>org.apache.avalon.plugins.merlin</package>
<url>http://avalon.apache.org/plugins/merlin/</url>
<siteDirectory>/www/avalon.apache.org/maven-plugins/merlin</siteDirectory>
<dependencies>
<dependency>
<groupId>&avalon-repository-id;</groupId>
<artifactId>&avalon-repository-main-id;</artifactId>
<version>&avalon-repository-main-version;</version>
<properties>
<classloader>root</classloader>
</properties>
</dependency>
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
