mcconnell 2004/04/08 03:45:14
Modified: merlin index.ent
merlin/activation/impl index.ent project.xml
merlin/composition/api index.ent project.xml
merlin/composition/impl index.ent project.xml
merlin/composition/spi index.ent project.xml
merlin/kernel/impl index.ent project.xml
Log:
Sync with avalon-util.ent for version relative to the util-extension package.
Revision Changes Path
1.2 +1 -0 avalon/merlin/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 13:10:28 -0000 1.1
+++ index.ent 8 Apr 2004 10:45:14 -0000 1.2
@@ -1 +1,2 @@
<!ENTITY % version-entities SYSTEM "file:version.ent"> %version-entities;
+<!ENTITY % util-entities SYSTEM "file:../versioning/avalon-util.ent">
%util-entities;
1.2 +1 -0 avalon/merlin/activation/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 13:33:00 -0000 1.1
+++ index.ent 8 Apr 2004 10:45:14 -0000 1.2
@@ -1 +1,2 @@
<!ENTITY % version-entities SYSTEM "file:../../version.ent">
%version-entities;
+<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
1.25 +6 -6 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- project.xml 5 Apr 2004 13:33:00 -0000 1.24
+++ project.xml 8 Apr 2004 10:45:14 -0000 1.25
@@ -76,14 +76,14 @@
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-extension-api</artifactId>
- <version>1.1</version>
+ <groupId>&avalon-util-extension-api-group;</groupId>
+ <artifactId>&avalon-util-extension-api-id;</artifactId>
+ <version>&avalon-util-extension-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-extension-impl</artifactId>
- <version>1.1</version>
+ <groupId>&avalon-util-extension-impl-group;</groupId>
+ <artifactId>&avalon-util-extension-impl-id;</artifactId>
+ <version>&avalon-util-extension-impl-version;</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
1.2 +1 -0 avalon/merlin/composition/api/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 12:57:20 -0000 1.1
+++ index.ent 8 Apr 2004 10:45:14 -0000 1.2
@@ -1 +1,2 @@
<!ENTITY % version-entities SYSTEM "file:../../version.ent">
%version-entities;
+<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
1.18 +3 -3 avalon/merlin/composition/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/project.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- project.xml 5 Apr 2004 12:57:20 -0000 1.17
+++ project.xml 8 Apr 2004 10:45:14 -0000 1.18
@@ -52,9 +52,9 @@
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-extension-api</artifactId>
- <version>1.1</version>
+ <groupId>&avalon-util-extension-api-group;</groupId>
+ <artifactId>&avalon-util-extension-api-id;</artifactId>
+ <version>&avalon-util-extension-api-version;</version>
</dependency>
<!-- testcase dependencies -->
1.2 +1 -0 avalon/merlin/composition/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 13:05:30 -0000 1.1
+++ index.ent 8 Apr 2004 10:45:14 -0000 1.2
@@ -1 +1,2 @@
<!ENTITY % version-entities SYSTEM "file:../../version.ent">
%version-entities;
+<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
1.25 +6 -7 avalon/merlin/composition/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- project.xml 5 Apr 2004 13:15:56 -0000 1.24
+++ project.xml 8 Apr 2004 10:45:14 -0000 1.25
@@ -76,16 +76,15 @@
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-extension-api</artifactId>
- <version>1.1</version>
+ <groupId>&avalon-util-extension-api-group;</groupId>
+ <artifactId>&avalon-util-extension-api-id;</artifactId>
+ <version>&avalon-util-extension-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-extension-impl</artifactId>
- <version>1.1</version>
+ <groupId>&avalon-util-extension-impl-group;</groupId>
+ <artifactId>&avalon-util-extension-impl-id;</artifactId>
+ <version>&avalon-util-extension-impl-version;</version>
</dependency>
-
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-exception</artifactId>
1.2 +1 -0 avalon/merlin/composition/spi/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 13:05:30 -0000 1.1
+++ index.ent 8 Apr 2004 10:45:14 -0000 1.2
@@ -1 +1,2 @@
<!ENTITY % version-entities SYSTEM "file:../../version.ent">
%version-entities;
+<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
1.19 +3 -3 avalon/merlin/composition/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 5 Apr 2004 13:15:56 -0000 1.18
+++ project.xml 8 Apr 2004 10:45:14 -0000 1.19
@@ -29,9 +29,9 @@
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-extension-api</artifactId>
- <version>1.1</version>
+ <groupId>&avalon-util-extension-api-group;</groupId>
+ <artifactId>&avalon-util-extension-api-id;</artifactId>
+ <version>&avalon-util-extension-api-version;</version>
</dependency>
<dependency>
1.2 +1 -0 avalon/merlin/kernel/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 14:04:54 -0000 1.1
+++ index.ent 8 Apr 2004 10:45:14 -0000 1.2
@@ -1 +1,2 @@
<!ENTITY % version-entities SYSTEM "file:../../version.ent">
%version-entities;
+<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
1.32 +6 -6 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- project.xml 5 Apr 2004 14:04:54 -0000 1.31
+++ project.xml 8 Apr 2004 10:45:14 -0000 1.32
@@ -129,17 +129,17 @@
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-extension-api</artifactId>
- <version>1.1</version>
+ <groupId>&avalon-util-extension-api-group;</groupId>
+ <artifactId>&avalon-util-extension-api-id;</artifactId>
+ <version>&avalon-util-extension-api-version;</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-extension-impl</artifactId>
- <version>1.1</version>
+ <groupId>&avalon-util-extension-impl-group;</groupId>
+ <artifactId>&avalon-util-extension-impl-id;</artifactId>
+ <version>&avalon-util-extension-impl-version;</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
