mcconnell 2004/04/05 06:33:00 Modified: merlin/activation/api project.xml merlin/activation/impl project.xml Added: merlin/activation/api index.ent merlin/activation/impl index.ent Log: Parameterize build using entity references. Revision Changes Path 1.10 +10 -6 avalon/merlin/activation/api/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/avalon/merlin/activation/api/project.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- project.xml 4 Apr 2004 06:30:54 -0000 1.9 +++ project.xml 5 Apr 2004 13:33:00 -0000 1.10 @@ -1,14 +1,18 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE project [ + <!ENTITY % index SYSTEM "file:index.ent"> %index; +]> <project> <extend>${basedir}/../../project.xml</extend> - <groupId>avalon-activation</groupId> - <id>avalon-activation-api</id> + <groupId>&avalon-activation-id;</groupId> + <id>&avalon-activation-api-id;</id> + <currentVersion>&avalon-activation-api-version;</currentVersion> + <name>Avalon Activation API</name> <package>org.apache.avalon.activation</package> - <inceptionYear>2002</inceptionYear> <shortDescription>Activation API</shortDescription> @@ -29,9 +33,9 @@ <version>1.4-SNAPSHOT</version> </dependency> <dependency> - <groupId>avalon-composition</groupId> - <artifactId>avalon-composition-api</artifactId> - <version>${pom.currentVersion}</version> + <groupId>&avalon-composition-id;</groupId> + <artifactId>&avalon-composition-api-id;</artifactId> + <version>&avalon-composition-api-version;</version> </dependency> </dependencies> 1.1 avalon/merlin/activation/api/index.ent Index: index.ent =================================================================== <!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities; 1.24 +20 -16 avalon/merlin/activation/impl/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- project.xml 4 Apr 2004 06:30:54 -0000 1.23 +++ project.xml 5 Apr 2004 13:33:00 -0000 1.24 @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE project [ + <!ENTITY % index SYSTEM "file:index.ent"> %index; +]> <project> <extend>${basedir}/../../project.xml</extend> - <groupId>avalon-activation</groupId> - <id>avalon-activation-impl</id> + <groupId>&avalon-activation-id;</groupId> + <id>&avalon-activation-impl-id;</id> + <currentVersion>&avalon-activation-impl-version;</currentVersion> + <name>Avalon Activation Framework</name> <package>org.apache.avalon.activation</package> - - <inceptionYear>2002</inceptionYear> <shortDescription>Runtime activation framework.</shortDescription> + <inceptionYear>2002</inceptionYear> <dependencies> @@ -34,25 +38,25 @@ </dependency> <dependency> - <groupId>avalon-activation</groupId> - <artifactId>avalon-activation-api</artifactId> - <version>${pom.currentVersion}</version> + <groupId>&avalon-activation-id;</groupId> + <artifactId>&avalon-activation-api-id;</artifactId> + <version>&avalon-activation-api-version;</version> </dependency> <dependency> - <groupId>avalon-composition</groupId> - <artifactId>avalon-composition-api</artifactId> - <version>${pom.currentVersion}</version> + <groupId>&avalon-composition-id;</groupId> + <artifactId>&avalon-composition-api-id;</artifactId> + <version>&avalon-composition-api-version;</version> </dependency> <dependency> - <groupId>avalon-composition</groupId> - <artifactId>avalon-composition-spi</artifactId> - <version>${pom.currentVersion}</version> + <groupId>&avalon-composition-id;</groupId> + <artifactId>&avalon-composition-spi-id;</artifactId> + <version>&avalon-composition-spi-version;</version> </dependency> <dependency> - <groupId>avalon-composition</groupId> - <artifactId>avalon-composition-impl</artifactId> - <version>${pom.currentVersion}</version> + <groupId>&avalon-composition-id;</groupId> + <artifactId>&avalon-composition-impl-id;</artifactId> + <version>&avalon-composition-impl-version;</version> </dependency> <dependency> 1.1 avalon/merlin/activation/impl/index.ent Index: index.ent =================================================================== <!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]