mcconnell 2004/04/08 07:51:45
Modified: logging .cvsignore
merlin/activation/api index.ent project.xml
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 index.ent maven.xml
merlin/kernel/api index.ent project.xml
merlin/kernel/cli index.ent project.xml
merlin/kernel/impl index.ent project.xml
merlin/kernel/plugin index.ent
merlin/kernel/servlet index.ent project.xml
versioning avalon-merlin.ent avalon-meta.ent
Log:
Update versions to link to avalon-util and avalon-meta ent references.
Revision Changes Path
1.2 +1 -0 avalon/logging/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/logging/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 4 Feb 2004 21:19:26 -0000 1.1
+++ .cvsignore 8 Apr 2004 14:51:44 -0000 1.2
@@ -4,3 +4,4 @@
target
.classpath
.project
+build.xml
\ No newline at end of file
1.3 +2 -0 avalon/merlin/activation/api/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/index.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.ent 8 Apr 2004 11:58:32 -0000 1.2
+++ index.ent 8 Apr 2004 14:51:44 -0000 1.3
@@ -1 +1,3 @@
<!ENTITY % merlin-entities SYSTEM
"file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
+<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
1.11 +10 -8 avalon/merlin/activation/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 5 Apr 2004 13:33:00 -0000 1.10
+++ project.xml 8 Apr 2004 14:51:44 -0000 1.11
@@ -23,19 +23,21 @@
<dependencies>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
- </dependency>
- <dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <groupId>&avalon-framework-id;</groupId>
+ <artifactId>&avalon-framework-api-id;</artifactId>
+ <version>&avalon-framework-api-version;</version>
</dependency>
+
<dependency>
<groupId>&avalon-composition-id;</groupId>
<artifactId>&avalon-composition-api-id;</artifactId>
<version>&avalon-composition-api-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-api-id;</artifactId>
+ <version>&avalon-meta-api-version;</version>
</dependency>
</dependencies>
1.4 +2 -0 avalon/merlin/activation/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/index.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.ent 8 Apr 2004 11:58:32 -0000 1.3
+++ index.ent 8 Apr 2004 14:51:44 -0000 1.4
@@ -1,2 +1,4 @@
<!ENTITY % merlin-entities SYSTEM
"file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
+<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
1.26 +41 -41 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- project.xml 8 Apr 2004 10:45:14 -0000 1.25
+++ project.xml 8 Apr 2004 14:51:44 -0000 1.26
@@ -21,23 +21,6 @@
<!-- avalon dependecies -->
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-main</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-api</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-spi</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>&avalon-activation-id;</groupId>
<artifactId>&avalon-activation-api-id;</artifactId>
<version>&avalon-activation-api-version;</version>
@@ -60,46 +43,63 @@
</dependency>
<dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-extension-api-id;</artifactId>
+ <version>&avalon-util-extension-api-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-extension-impl-id;</artifactId>
+ <version>&avalon-util-extension-impl-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-i18n-id;</artifactId>
+ <version>&avalon-util-i18n-version;</version>
</dependency>
+
<dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-spi</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <groupId>&avalon-framework-id;</groupId>
+ <artifactId>&avalon-framework-api-id;</artifactId>
+ <version>&avalon-framework-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-impl</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <groupId>&avalon-framework-id;</groupId>
+ <artifactId>&avalon-framework-impl-id;</artifactId>
+ <version>&avalon-framework-impl-version;</version>
</dependency>
<dependency>
- <groupId>&avalon-util-extension-api-group;</groupId>
- <artifactId>&avalon-util-extension-api-id;</artifactId>
- <version>&avalon-util-extension-api-version;</version>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-api-id;</artifactId>
+ <version>&avalon-meta-api-version;</version>
</dependency>
<dependency>
- <groupId>&avalon-util-extension-impl-group;</groupId>
- <artifactId>&avalon-util-extension-impl-id;</artifactId>
- <version>&avalon-util-extension-impl-version;</version>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-spi-id;</artifactId>
+ <version>&avalon-meta-spi-version;</version>
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-i18n</artifactId>
- <version>1.0</version>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-impl-id;</artifactId>
+ <version>&avalon-meta-impl-version;</version>
</dependency>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
+ <groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-main</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon-logging</groupId>
+ <artifactId>avalon-logging-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5</version>
+ <groupId>avalon-logging</groupId>
+ <artifactId>avalon-logging-spi</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
1.4 +2 -0 avalon/merlin/composition/api/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/index.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.ent 8 Apr 2004 11:58:32 -0000 1.3
+++ index.ent 8 Apr 2004 14:51:44 -0000 1.4
@@ -1,2 +1,4 @@
<!ENTITY % merlin-entities SYSTEM
"file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
+<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
1.19 +15 -15 avalon/merlin/composition/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 8 Apr 2004 10:45:14 -0000 1.18
+++ project.xml 8 Apr 2004 14:51:44 -0000 1.19
@@ -23,9 +23,15 @@
<dependencies>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-extension-api-id;</artifactId>
+ <version>&avalon-util-extension-api-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>&avalon-framework-id;</groupId>
+ <artifactId>&avalon-framework-api-id;</artifactId>
+ <version>&avalon-framework-api-version;</version>
</dependency>
<dependency>
@@ -46,23 +52,17 @@
</dependency>
<dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-api</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>&avalon-util-extension-api-group;</groupId>
- <artifactId>&avalon-util-extension-api-id;</artifactId>
- <version>&avalon-util-extension-api-version;</version>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-api-id;</artifactId>
+ <version>&avalon-meta-api-version;</version>
</dependency>
<!-- testcase dependencies -->
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5</version>
+ <groupId>&avalon-framework-id;</groupId>
+ <artifactId>&avalon-framework-impl-id;</artifactId>
+ <version>&avalon-framework-impl-version;</version>
</dependency>
</dependencies>
1.4 +2 -0 avalon/merlin/composition/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/index.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.ent 8 Apr 2004 11:58:32 -0000 1.3
+++ index.ent 8 Apr 2004 14:51:44 -0000 1.4
@@ -1,2 +1,4 @@
<!ENTITY % merlin-entities SYSTEM
"file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
+<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
1.26 +48 -49 avalon/merlin/composition/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- project.xml 8 Apr 2004 10:45:14 -0000 1.25
+++ project.xml 8 Apr 2004 14:51:44 -0000 1.26
@@ -18,85 +18,84 @@
<dependencies>
- <!-- avalon dependecies -->
-
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-main</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-framework-id;</groupId>
+ <artifactId>&avalon-framework-api-id;</artifactId>
+ <version>&avalon-framework-api-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-framework-id;</groupId>
+ <artifactId>&avalon-framework-impl-id;</artifactId>
+ <version>&avalon-framework-impl-version;</version>
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-api-id;</artifactId>
+ <version>&avalon-composition-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-spi</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-spi-id;</artifactId>
+ <version>&avalon-composition-spi-version;</version>
</dependency>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-extension-api-id;</artifactId>
+ <version>&avalon-util-extension-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5</version>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-extension-impl-id;</artifactId>
+ <version>&avalon-util-extension-impl-version;</version>
</dependency>
-
<dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-exception-id;</artifactId>
+ <version>&avalon-util-exception-version;</version>
</dependency>
<dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-spi</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-i18n-id;</artifactId>
+ <version>&avalon-util-i18n-version;</version>
</dependency>
+
<dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-impl</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-api-id;</artifactId>
+ <version>&avalon-meta-api-version;</version>
</dependency>
-
<dependency>
- <groupId>&avalon-composition-id;</groupId>
- <artifactId>&avalon-composition-api-id;</artifactId>
- <version>&avalon-composition-api-version;</version>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-spi-id;</artifactId>
+ <version>&avalon-meta-spi-version;</version>
</dependency>
<dependency>
- <groupId>&avalon-composition-id;</groupId>
- <artifactId>&avalon-composition-spi-id;</artifactId>
- <version>&avalon-composition-spi-version;</version>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-impl-id;</artifactId>
+ <version>&avalon-meta-impl-version;</version>
</dependency>
+ <!-- avalon dependecies -->
+
<dependency>
- <groupId>&avalon-util-extension-api-group;</groupId>
- <artifactId>&avalon-util-extension-api-id;</artifactId>
- <version>&avalon-util-extension-api-version;</version>
+ <groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-main</artifactId>
+ <version>2.0-SNAPSHOT</version>
</dependency>
+
<dependency>
- <groupId>&avalon-util-extension-impl-group;</groupId>
- <artifactId>&avalon-util-extension-impl-id;</artifactId>
- <version>&avalon-util-extension-impl-version;</version>
+ <groupId>avalon-logging</groupId>
+ <artifactId>avalon-logging-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-exception</artifactId>
- <version>1.0</version>
+ <groupId>avalon-logging</groupId>
+ <artifactId>avalon-logging-spi</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-i18n</artifactId>
- <version>1.0</version>
- </dependency>
-
<!-- excalibur dependecies -->
<dependency>
1.4 +2 -0 avalon/merlin/composition/spi/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/index.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.ent 8 Apr 2004 11:58:32 -0000 1.3
+++ index.ent 8 Apr 2004 14:51:44 -0000 1.4
@@ -1,2 +1,4 @@
<!ENTITY % merlin-entities SYSTEM
"file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
+<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
1.20 +10 -11 avalon/merlin/composition/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 8 Apr 2004 10:45:14 -0000 1.19
+++ project.xml 8 Apr 2004 14:51:44 -0000 1.20
@@ -23,13 +23,13 @@
<dependencies>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
+ <groupId>&avalon-framework-id;</groupId>
+ <artifactId>&avalon-framework-api-id;</artifactId>
+ <version>&avalon-framework-api-version;</version>
</dependency>
<dependency>
- <groupId>&avalon-util-extension-api-group;</groupId>
+ <groupId>&avalon-util-id;</groupId>
<artifactId>&avalon-util-extension-api-id;</artifactId>
<version>&avalon-util-extension-api-version;</version>
</dependency>
@@ -41,6 +41,12 @@
</dependency>
<dependency>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-api-id;</artifactId>
+ <version>&avalon-meta-api-version;</version>
+ </dependency>
+
+ <dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-api</artifactId>
<version>2.0-SNAPSHOT</version>
@@ -55,13 +61,6 @@
<groupId>avalon-logging</groupId>
<artifactId>avalon-logging-spi</artifactId>
<version>1.0-SNAPSHOT</version>
- </dependency>
-
-
- <dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-api</artifactId>
- <version>1.4-SNAPSHOT</version>
</dependency>
</dependencies>
1.4 +2 -0 avalon/merlin/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/index.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.ent 8 Apr 2004 11:58:32 -0000 1.3
+++ index.ent 8 Apr 2004 14:51:44 -0000 1.4
@@ -1,2 +1,4 @@
<!ENTITY % util-entities SYSTEM "file:../versioning/avalon-util.ent">
%util-entities;
<!ENTITY % merlin-entities SYSTEM "file:../versioning/avalon-merlin.ent">
%merlin-entities;
+<!ENTITY % framework-entities SYSTEM
"file:../versioning/avalon-framework.ent"> %framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../versioning/avalon-meta.ent">
%meta-entities;
1.63 +9 -5 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- maven.xml 6 Apr 2004 06:36:08 -0000 1.62
+++ maven.xml 8 Apr 2004 14:51:44 -0000 1.63
@@ -18,12 +18,16 @@
==============================================================================
-->
- <ant:property name="avalon.util.plugin.version" value="1.0-SNAPSHOT"/>
- <ant:property name="meta.plugin.version" value="1.4-SNAPSHOT"/>
- <ant:property name="repository.cli.version" value="2.0-SNAPSHOT"/>
+ <ant:property name="avalon.util.plugin.version"
+ value="&avalon-util-plugin-version;"/>
+ <ant:property name="merlin.cli.version"
+ value="&merlin-cli-version;"/>
+ <ant:property name="merlin.plugin.version"
+ value="&merlin-plugin-version;"/>
+ <ant:property name="meta.plugin.version"
+ value="&avalon-meta-plugin-version;"/>
- <ant:property name="merlin.cli.version" value="&merlin-cli-version;"/>
- <ant:property name="merlin.plugin.version"
value="&merlin-plugin-version;"/>
+ <ant:property name="repository.cli.version" value="2.0-SNAPSHOT"/>
<!--
==============================================================================
1.3 +2 -0 avalon/merlin/kernel/api/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/api/index.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.ent 8 Apr 2004 11:58:32 -0000 1.2
+++ index.ent 8 Apr 2004 14:51:44 -0000 1.3
@@ -1 +1,3 @@
<!ENTITY % merlin-entities SYSTEM
"file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
+<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
1.10 +12 -8 avalon/merlin/kernel/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/api/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 5 Apr 2004 14:04:54 -0000 1.9
+++ project.xml 8 Apr 2004 14:51:44 -0000 1.10
@@ -21,21 +21,25 @@
</description>
<dependencies>
+
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
- </dependency>
- <dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-framework-id;</groupId>
+ <artifactId>&avalon-framework-api-id;</artifactId>
+ <version>&avalon-framework-api-version;</version>
</dependency>
+
<dependency>
<groupId>&avalon-composition-id;</groupId>
<artifactId>&avalon-composition-api-id;</artifactId>
<version>&avalon-composition-api-version;</version>
</dependency>
+
+ <dependency>
+ <groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
</dependencies>
</project>
1.3 +2 -0 avalon/merlin/kernel/cli/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/cli/index.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.ent 8 Apr 2004 11:58:32 -0000 1.2
+++ index.ent 8 Apr 2004 14:51:44 -0000 1.3
@@ -1 +1,3 @@
<!ENTITY % merlin-entities SYSTEM
"file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
+<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
1.11 +9 -5 avalon/merlin/kernel/cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/cli/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 5 Apr 2004 14:04:54 -0000 1.10
+++ project.xml 8 Apr 2004 14:51:44 -0000 1.11
@@ -17,20 +17,24 @@
<inceptionYear>2002</inceptionYear>
<dependencies>
+
+ <dependency>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-i18n-id;</artifactId>
+ <version>&avalon-util-i18n-version;</version>
+ </dependency>
+
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-main</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+
<dependency>
<id>commons-cli</id>
<version>1.0</version>
</dependency>
- <dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-i18n</artifactId>
- <version>1.0</version>
- </dependency>
+
</dependencies>
</project>
1.4 +2 -0 avalon/merlin/kernel/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/index.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.ent 8 Apr 2004 11:58:32 -0000 1.3
+++ index.ent 8 Apr 2004 14:51:44 -0000 1.4
@@ -1,2 +1,4 @@
<!ENTITY % merlin-entities SYSTEM
"file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
+<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
1.33 +32 -32 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- project.xml 8 Apr 2004 10:45:14 -0000 1.32
+++ project.xml 8 Apr 2004 14:51:44 -0000 1.33
@@ -93,43 +93,43 @@
</dependency>
<dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-api-id;</artifactId>
+ <version>&avalon-meta-api-version;</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
</dependency>
<dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-spi</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-spi-id;</artifactId>
+ <version>&avalon-meta-spi-version;</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
</dependency>
<dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-impl</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-impl-id;</artifactId>
+ <version>&avalon-meta-impl-version;</version>
</dependency>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
+ <groupId>&avalon-framework-id;</groupId>
+ <artifactId>&avalon-framework-api-id;</artifactId>
+ <version>&avalon-framework-api-version;</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
</dependency>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5</version>
+ <groupId>&avalon-framework-id;</groupId>
+ <artifactId>&avalon-framework-impl-id;</artifactId>
+ <version>&avalon-framework-impl-version;</version>
</dependency>
<dependency>
- <groupId>&avalon-util-extension-api-group;</groupId>
+ <groupId>&avalon-util-id;</groupId>
<artifactId>&avalon-util-extension-api-id;</artifactId>
<version>&avalon-util-extension-api-version;</version>
<properties>
@@ -137,34 +137,34 @@
</properties>
</dependency>
<dependency>
- <groupId>&avalon-util-extension-impl-group;</groupId>
+ <groupId>&avalon-util-id;</groupId>
<artifactId>&avalon-util-extension-impl-id;</artifactId>
<version>&avalon-util-extension-impl-version;</version>
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-defaults</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-i18n-id;</artifactId>
+ <version>&avalon-util-i18n-version;</version>
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-env</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-defaults-id;</artifactId>
+ <version>&avalon-util-defaults-version;</version>
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-exception</artifactId>
- <version>1.0</version>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-env-id;</artifactId>
+ <version>&avalon-util-env-version;</version>
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-criteria</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-exception-id;</artifactId>
+ <version>&avalon-util-exception-version;</version>
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-i18n</artifactId>
- <version>1.0</version>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-criteria-id;</artifactId>
+ <version>&avalon-util-criteria-version;</version>
</dependency>
<!-- excalibur dependecies -->
1.3 +1 -0 avalon/merlin/kernel/plugin/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/index.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.ent 8 Apr 2004 11:58:32 -0000 1.2
+++ index.ent 8 Apr 2004 14:51:45 -0000 1.3
@@ -1 +1,2 @@
<!ENTITY % merlin-entities SYSTEM
"file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
1.3 +2 -0 avalon/merlin/kernel/servlet/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/servlet/index.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.ent 8 Apr 2004 11:58:32 -0000 1.2
+++ index.ent 8 Apr 2004 14:51:45 -0000 1.3
@@ -1 +1,3 @@
<!ENTITY % merlin-entities SYSTEM
"file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
+<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
+<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
1.11 +6 -7 avalon/merlin/kernel/servlet/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/servlet/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 5 Apr 2004 14:04:54 -0000 1.10
+++ project.xml 8 Apr 2004 14:51:45 -0000 1.11
@@ -23,19 +23,18 @@
<dependencies>
<dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-api</artifactId>
- <version>1.4-SNAPSHOT</version>
- <type>jar</type>
+ <groupId>&avalon-meta-id;</groupId>
+ <artifactId>&avalon-meta-api-id;</artifactId>
+ <version>&avalon-meta-api-version;</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
+ <groupId>&avalon-framework-id;</groupId>
+ <artifactId>&avalon-framework-api-id;</artifactId>
+ <version>&avalon-framework-api-version;</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
1.3 +0 -11 avalon/versioning/avalon-merlin.ent
Index: avalon-merlin.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-merlin.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- avalon-merlin.ent 8 Apr 2004 11:58:33 -0000 1.2
+++ avalon-merlin.ent 8 Apr 2004 14:51:45 -0000 1.3
@@ -4,15 +4,12 @@
<!ENTITY avalon-composition-id "avalon-composition">
<!ENTITY avalon-composition-api-id "avalon-composition-api">
-<!ENTITY avalon-composition-api-group "avalon-composition">
<!ENTITY avalon-composition-api-version "2.0.0-dev">
<!ENTITY avalon-composition-impl-id "avalon-composition-impl">
-<!ENTITY avalon-composition-impl-group "avalon-composition">
<!ENTITY avalon-composition-impl-version "2.0.0-dev">
<!ENTITY avalon-composition-spi-id "avalon-composition-spi">
-<!ENTITY avalon-composition-spi-group "avalon-composition">
<!ENTITY avalon-composition-spi-version "2.0.0-dev">
<!-- Avalon Activation -->
@@ -21,11 +18,9 @@
<!ENTITY avalon-activation-id "avalon-activation">
<!ENTITY avalon-activation-api-id "avalon-activation-api">
-<!ENTITY avalon-activation-api-group "avalon-activation">
<!ENTITY avalon-activation-api-version "2.0.0-dev">
<!ENTITY avalon-activation-impl-id "avalon-activation-impl">
-<!ENTITY avalon-activation-impl-group "avalon-activation">
<!ENTITY avalon-activation-impl-version "2.0.0-dev">
<!ENTITY avalon-activation-artifact
@@ -37,26 +32,20 @@
<!ENTITY merlin-id "merlin">
<!ENTITY merlin-api-id "merlin-api">
-<!ENTITY merlin-api-group "merlin">
<!ENTITY merlin-api-version "3.3.0-dev">
<!ENTITY merlin-impl-id "merlin-impl">
-<!ENTITY merlin-impl-group "merlin">
<!ENTITY merlin-impl-version "3.3.0-dev">
<!ENTITY merlin-cli-id "merlin-cli">
-<!ENTITY merlin-cli-group "merlin">
<!ENTITY merlin-cli-version "3.3.0-dev">
<!ENTITY merlin-plugin-id "merlin-plugin">
-<!ENTITY merlin-plugin-group "merlin">
<!ENTITY merlin-plugin-version "3.3.0-dev">
<!ENTITY merlin-servlet-id "merlin-servlet">
-<!ENTITY merlin-servlet-group "merlin">
<!ENTITY merlin-servlet-version "3.3.0-dev">
<!ENTITY merlin-unit-id "merlin-unit">
-<!ENTITY merlin-unit-group "merlin">
<!ENTITY merlin-unit-version "3.3.0-dev">
1.2 +11 -12 avalon/versioning/avalon-meta.ent
Index: avalon-meta.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-meta.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avalon-meta.ent 6 Apr 2004 07:33:09 -0000 1.1
+++ avalon-meta.ent 8 Apr 2004 14:51:45 -0000 1.2
@@ -1,20 +1,19 @@
+<!ENTITY avalon-meta-id "avalon-meta">
<!ENTITY avalon-meta-api-id "avalon-meta-api">
-<!ENTITY avalon-meta-api-group "avalon-meta">
-<!ENTITY avalon-meta-api-version "1.4">
+<!ENTITY avalon-meta-api-version "1.4.0-dev">
+
+<!ENTITY avalon-meta-spi-id "avalon-meta-spi">
+<!ENTITY avalon-meta-spi-version "1.4.0-dev">
<!ENTITY avalon-meta-impl-id "avalon-meta-impl">
-<!ENTITY avalon-meta-impl-group "avalon-meta">
-<!ENTITY avalon-meta-impl-version "1.4">
+<!ENTITY avalon-meta-impl-version "1.4.0-dev">
<!ENTITY avalon-meta-plugin-id "avalon-meta-plugin">
-<!ENTITY avalon-meta-plugin-group "avalon-meta">
-<!ENTITY avalon-meta-plugin-version "1.4">
-
-<!ENTITY avalon-meta-spi-id "avalon-meta-spi">
-<!ENTITY avalon-meta-spi-group "avalon-meta">
-<!ENTITY avalon-meta-spi-version "1.4">
+<!ENTITY avalon-meta-plugin-version "1.4.0-dev">
<!ENTITY avalon-meta-util-id "avalon-meta-util">
-<!ENTITY avalon-meta-util-group "avalon-meta">
-<!ENTITY avalon-meta-util-version "1.4">
+<!ENTITY avalon-meta-util-version "1.4.0-dev">
+
+<!ENTITY avalon-meta-tools-id "avalon-meta-tools">
+<!ENTITY avalon-meta-tools-version "1.4.0-dev">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
