mcconnell 2004/04/05 06:05:30 Modified: merlin/composition/impl project.xml merlin/composition/spi project.xml Added: merlin/composition/impl index.ent merlin/composition/spi index.ent Log: Parameterize build using entity references. Revision Changes Path 1.23 +14 -10 avalon/merlin/composition/impl/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- project.xml 4 Apr 2004 06:30:54 -0000 1.22 +++ project.xml 5 Apr 2004 13:05:30 -0000 1.23 @@ -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-composition</groupId> - <id>avalon-composition-impl</id> + <groupId>&avalon-composition-id;</groupId> + <id>&avalon-composition-impl-id;</id> + <currentVersion>&avalon-composition-impl-version;</currentVersion> + <name>Avalon Composition Framework</name> <package>org.apache.avalon.composition</package> - <inceptionYear>2002</inceptionYear> <shortDescription>Avalon Composition Framework.</shortDescription> @@ -61,14 +65,14 @@ </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-id;</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-id;</version> </dependency> <dependency> 1.1 avalon/merlin/composition/impl/index.ent Index: index.ent =================================================================== <!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities; 1.17 +10 -6 avalon/merlin/composition/spi/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/avalon/merlin/composition/spi/project.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- project.xml 4 Apr 2004 06:30:54 -0000 1.16 +++ project.xml 5 Apr 2004 13:05:30 -0000 1.17 @@ -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-composition</groupId> - <id>avalon-composition-spi</id> + <groupId>&avalon-composition-id;</groupId> + <id>&avalon-composition-spi-id;</id> + <currentVersion>&avalon-composition-spi-version;</currentVersion> + <name>Avalon Composition SPI</name> <package>org.apache.avalon.assembly</package> - <inceptionYear>2002</inceptionYear> <shortDescription>Avalon Composition SPI</shortDescription> @@ -31,9 +35,9 @@ </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-id;</version> </dependency> <dependency> 1.1 avalon/merlin/composition/spi/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]