mcconnell 2004/04/08 23:52:03
Modified: 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 external.xml index.ent
merlin/kernel/api index.ent project.xml
merlin/kernel/cli index.ent project.xml
merlin/kernel/impl project.xml
merlin/kernel/plugin index.ent project.xml
merlin/kernel/servlet index.ent project.xml
merlin/kernel/unit index.ent project.xml
repository/api project.xml
repository/cli project.xml
repository/impl project.xml
repository/main maven.xml project.properties project.xml
repository/spi project.xml
repository/test project.xml
repository/util project.xml
versioning avalon-repository.ent avalon-util.ent
Added: repository/api index.ent
repository/cli index.ent
repository/impl index.ent
repository/main index.ent
repository/spi index.ent
repository/test index.ent
repository/util index.ent
repository index.ent
Log:
Update versions.
Revision Changes Path
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.ent 8 Apr 2004 14:51:44 -0000 1.4
+++ index.ent 9 Apr 2004 06:52:01 -0000 1.5
@@ -2,3 +2,4 @@
<!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;
+<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
1.27 +3 -3 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- project.xml 8 Apr 2004 14:51:44 -0000 1.26
+++ project.xml 9 Apr 2004 06:52:01 -0000 1.27
@@ -86,9 +86,9 @@
</dependency>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-main</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-main-id;</artifactId>
+ <version>&avalon-repository-main-version;</version>
</dependency>
<dependency>
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.ent 8 Apr 2004 14:51:44 -0000 1.4
+++ index.ent 9 Apr 2004 06:52:01 -0000 1.5
@@ -2,3 +2,4 @@
<!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;
+<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
1.20 +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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 8 Apr 2004 14:51:44 -0000 1.19
+++ project.xml 9 Apr 2004 06:52:01 -0000 1.20
@@ -35,9 +35,9 @@
</dependency>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-api-id;</artifactId>
+ <version>&avalon-repository-api-version;</version>
</dependency>
<dependency>
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.ent 8 Apr 2004 14:51:44 -0000 1.4
+++ index.ent 9 Apr 2004 06:52:01 -0000 1.5
@@ -2,3 +2,4 @@
<!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;
+<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
1.27 +3 -3 avalon/merlin/composition/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- project.xml 8 Apr 2004 14:51:44 -0000 1.26
+++ project.xml 9 Apr 2004 06:52:01 -0000 1.27
@@ -80,9 +80,9 @@
<!-- avalon dependecies -->
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-main</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-main-id;</artifactId>
+ <version>&avalon-repository-main-version;</version>
</dependency>
<dependency>
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.ent 8 Apr 2004 14:51:44 -0000 1.4
+++ index.ent 9 Apr 2004 06:52:01 -0000 1.5
@@ -2,3 +2,4 @@
<!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;
+<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
1.21 +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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 8 Apr 2004 14:51:44 -0000 1.20
+++ project.xml 9 Apr 2004 06:52:01 -0000 1.21
@@ -47,9 +47,9 @@
</dependency>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-api-id;</artifactId>
+ <version>&avalon-repository-api-version;</version>
</dependency>
<dependency>
1.9 +11 -9 avalon/merlin/external.xml
Index: external.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/external.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- external.xml 8 Apr 2004 11:58:32 -0000 1.8
+++ external.xml 9 Apr 2004 06:52:01 -0000 1.9
@@ -12,21 +12,23 @@
<currentVersion>3.3</currentVersion>
<dependencies>
+
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-impl-id;</artifactId>
+ <version>&avalon-repository-impl-version;</version>
</dependency>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-util</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-util-id;</artifactId>
+ <version>&avalon-repository-util-version;</version>
</dependency>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-cli</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-cli-id;</artifactId>
+ <version>&avalon-repository-cli-version;</version>
</dependency>
+
<dependency>
<groupId>avalon-logging</groupId>
<artifactId>avalon-logging-impl</artifactId>
1.5 +1 -0 avalon/merlin/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/index.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.ent 8 Apr 2004 14:51:44 -0000 1.4
+++ index.ent 9 Apr 2004 06:52:01 -0000 1.5
@@ -2,3 +2,4 @@
<!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;
+<!ENTITY % repo-entities SYSTEM "file:../versioning/avalon-repository.ent">
%repo-entities;
1.5 +1 -0 avalon/merlin/kernel/api/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/api/index.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.ent 8 Apr 2004 19:48:45 -0000 1.4
+++ index.ent 9 Apr 2004 06:52:01 -0000 1.5
@@ -2,3 +2,4 @@
<!ENTITY % framework-entities SYSTEM
"file:../../../versioning/avalon-framework.ent"> %framework-entities;
<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent">
%util-entities;
+<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
1.11 +3 -3 avalon/merlin/kernel/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/api/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 8 Apr 2004 14:51:44 -0000 1.10
+++ project.xml 9 Apr 2004 06:52:01 -0000 1.11
@@ -35,9 +35,9 @@
</dependency>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-api-id;</artifactId>
+ <version>&avalon-repository-api-version;</version>
</dependency>
</dependencies>
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.ent 8 Apr 2004 14:51:44 -0000 1.3
+++ index.ent 9 Apr 2004 06:52:01 -0000 1.4
@@ -1,3 +1,5 @@
<!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;
+<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
+<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
1.12 +3 -3 avalon/merlin/kernel/cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/cli/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 8 Apr 2004 14:51:44 -0000 1.11
+++ project.xml 9 Apr 2004 06:52:01 -0000 1.12
@@ -25,9 +25,9 @@
</dependency>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-main</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-main-id;</artifactId>
+ <version>&avalon-repository-main-version;</version>
</dependency>
<dependency>
1.34 +23 -23 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- project.xml 8 Apr 2004 14:51:44 -0000 1.33
+++ project.xml 9 Apr 2004 06:52:01 -0000 1.34
@@ -36,35 +36,18 @@
<!-- avalon dependecies -->
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-main</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-main-id;</artifactId>
+ <version>&avalon-repository-main-version;</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
</dependency>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-spi</artifactId>
- <version>2.0-SNAPSHOT</version>
- <properties>
- <avalon.classloader>spi</avalon.classloader>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-api</artifactId>
- <version>1.0-SNAPSHOT</version>
- <properties>
- <avalon.classloader>api</avalon.classloader>
- </properties>
- </dependency>
- <dependency>
- <groupId>avalon-logging</groupId>
- <artifactId>avalon-logging-spi</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-spi-id;</artifactId>
+ <version>&avalon-repository-spi-version;</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
@@ -165,6 +148,23 @@
<groupId>&avalon-util-id;</groupId>
<artifactId>&avalon-util-criteria-id;</artifactId>
<version>&avalon-util-criteria-version;</version>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon-logging</groupId>
+ <artifactId>avalon-logging-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <properties>
+ <avalon.classloader>api</avalon.classloader>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>avalon-logging</groupId>
+ <artifactId>avalon-logging-spi</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <properties>
+ <avalon.classloader>spi</avalon.classloader>
+ </properties>
</dependency>
<!-- excalibur dependecies -->
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.ent 8 Apr 2004 14:51:45 -0000 1.3
+++ index.ent 9 Apr 2004 06:52:02 -0000 1.4
@@ -1,2 +1,3 @@
<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent">
%merlin-entities;
<!ENTITY % meta-entities SYSTEM "file:../../../versioning/avalon-meta.ent">
%meta-entities;
+<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
1.22 +5 -3 avalon/merlin/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/project.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- project.xml 5 Apr 2004 14:04:54 -0000 1.21
+++ project.xml 9 Apr 2004 06:52:02 -0000 1.22
@@ -18,14 +18,16 @@
<package>org.apache.avalon.merlin</package>
<dependencies>
+
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-main</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-main-id;</artifactId>
+ <version>&avalon-repository-main-version;</version>
<properties>
<classloader>root</classloader>
</properties>
</dependency>
+
</dependencies>
<build>
1.4 +1 -0 avalon/merlin/kernel/servlet/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/servlet/index.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.ent 8 Apr 2004 14:51:45 -0000 1.3
+++ index.ent 9 Apr 2004 06:52:02 -0000 1.4
@@ -1,3 +1,4 @@
<!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;
+<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
1.12 +3 -4 avalon/merlin/kernel/servlet/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/servlet/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 8 Apr 2004 14:51:45 -0000 1.11
+++ project.xml 9 Apr 2004 06:52:02 -0000 1.12
@@ -60,10 +60,9 @@
</dependency>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-main</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-main-id;</artifactId>
+ <version>&avalon-repository-main-version;</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
1.3 +1 -0 avalon/merlin/kernel/unit/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/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 9 Apr 2004 06:52:02 -0000 1.3
@@ -1 +1,2 @@
<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent">
%merlin-entities;
+<!ENTITY % repo-entities SYSTEM "file:../../../versioning/avalon-repository.ent">
%repo-entities;
1.30 +6 -3 avalon/merlin/kernel/unit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/project.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- project.xml 5 Apr 2004 14:04:54 -0000 1.29
+++ project.xml 9 Apr 2004 06:52:02 -0000 1.30
@@ -17,16 +17,19 @@
<inceptionYear>2002</inceptionYear>
<dependencies>
+
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-main</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-main-id;</artifactId>
+ <version>&avalon-repository-main-version;</version>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>
+
</dependencies>
<build>
1.5 +7 -5 avalon/repository/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/api/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 22 Feb 2004 19:10:35 -0000 1.4
+++ project.xml 9 Apr 2004 06:52:02 -0000 1.5
@@ -1,16 +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-repository</groupId>
- <id>avalon-repository-api</id>
- <name>Avalon Repository API</name>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
+ <groupId>&avalon-repository-id;</groupId>
+ <id>&avalon-repository-api-id;</id>
+ <currentVersion>&avalon-repository-api-version;</currentVersion>
+ <name>Avalon Repository API</name>
<package>org.apache.avalon.repository</package>
-
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Repository API</shortDescription>
1.1 avalon/repository/api/index.ent
Index: index.ent
===================================================================
<!ENTITY % repository-entities SYSTEM "file:../../versioning/avalon-repository.ent">
%repository-entities;
<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent">
%util-entities;
1.4 +18 -12 avalon/repository/cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/cli/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 8 Mar 2004 11:26:10 -0000 1.3
+++ project.xml 9 Apr 2004 06:52:02 -0000 1.4
@@ -1,34 +1,40 @@
<?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-repository</groupId>
- <id>avalon-repository-cli</id>
- <name>Avalon Repository CLI</name>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
+ <groupId>&avalon-repository-id;</groupId>
+ <id>&avalon-repository-cli-id;</id>
+ <currentVersion>&avalon-repository-cli-version;</currentVersion>
+ <name>Avalon Repository CLI</name>
<package>org.apache.avalon.repository.cli</package>
-
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Repository CLI</shortDescription>
<dependencies>
+
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-main</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-main-id;</artifactId>
+ <version>&avalon-repository-main-version;</version>
</dependency>
+
<dependency>
- <id>commons-cli</id>
- <version>1.0</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-i18n</artifactId>
+ <id>commons-cli</id>
<version>1.0</version>
</dependency>
+
</dependencies>
</project>
1.1 avalon/repository/cli/index.ent
Index: index.ent
===================================================================
<!ENTITY % repository-entities SYSTEM "file:../../versioning/avalon-repository.ent">
%repository-entities;
<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent">
%util-entities;
1.9 +34 -28 avalon/repository/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/impl/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 8 Mar 2004 11:26:10 -0000 1.8
+++ project.xml 9 Apr 2004 06:52:02 -0000 1.9
@@ -1,59 +1,65 @@
<?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-repository</groupId>
- <id>avalon-repository-impl</id>
+ <groupId>&avalon-repository-id;</groupId>
+ <id>&avalon-repository-impl-id;</id>
+ <currentVersion>&avalon-repository-impl-version;</currentVersion>
+
<name>Avalon Repository Implementation</name>
<package>org.apache.avalon.repository</package>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
-
<inceptionYear>2002</inceptionYear>
<shortDescription>Jar file repository implementation.</shortDescription>
<dependencies>
+
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-api-id;</artifactId>
+ <version>&avalon-repository-api-version;</version>
</dependency>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-spi</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-spi-id;</artifactId>
+ <version>&avalon-repository-spi-version;</version>
</dependency>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-util</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-util-id;</artifactId>
+ <version>&avalon-repository-util-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-criteria-id;</artifactId>
+ <version>&avalon-util-criteria-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-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-exception-id;</artifactId>
+ <version>&avalon-util-exception-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-env-id;</artifactId>
+ <version>&avalon-util-env-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-i18n-id;</artifactId>
+ <version>&avalon-util-i18n-version;</version>
</dependency>
+
</dependencies>
</project>
1.1 avalon/repository/impl/index.ent
Index: index.ent
===================================================================
<!ENTITY % repository-entities SYSTEM "file:../../versioning/avalon-repository.ent">
%repository-entities;
<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent">
%util-entities;
<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent">
%meta-entities;
1.7 +6 -1 avalon/repository/main/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/repository/main/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 17 Feb 2004 11:06:16 -0000 1.6
+++ maven.xml 9 Apr 2004 06:52:02 -0000 1.7
@@ -1,3 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
+
<project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
<!--
@@ -18,7 +23,7 @@
# Default repository implementation artifact identifier. #
#===================================================================#
-avalon.repository.implementation = ${avalon.repository.implementation}
+avalon.repository.implementation = &avalon-repository-artifact;
avalon.repository.hosts = ${avalon.repository.hosts}
</ant:echo>
1.7 +2 -0 avalon/repository/main/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/repository/main/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.properties 17 Mar 2004 08:46:58 -0000 1.6
+++ project.properties 9 Apr 2004 06:52:02 -0000 1.7
@@ -1,5 +1,7 @@
avalon.repository.implementation =
artifact:avalon-repository/avalon-repository-impl#2.0-SNAPSHOT
+
+
avalon.repository.hosts = http://www.dpml.net,http://www.ibiblio.org/maven
1.8 +33 -26 avalon/repository/main/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/main/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 22 Feb 2004 19:10:35 -0000 1.7
+++ project.xml 9 Apr 2004 06:52:02 -0000 1.8
@@ -1,54 +1,61 @@
<?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-repository</groupId>
- <id>avalon-repository-main</id>
- <name>Avalon Repository Bootstap</name>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
+ <groupId>&avalon-repository-id;</groupId>
+ <id>&avalon-repository-main-id;</id>
+ <currentVersion>&avalon-repository-main-version;</currentVersion>
+ <name>Avalon Repository Bootstap</name>
<package>org.apache.avalon.repository</package>
-
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Repository Bootstap</shortDescription>
<dependencies>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-api-id;</artifactId>
+ <version>&avalon-repository-api-version;</version>
+ </dependency>
+ <dependency>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-spi-id;</artifactId>
+ <version>&avalon-repository-spi-version;</version>
</dependency>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-spi</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-util-id;</artifactId>
+ <version>&avalon-repository-util-version;</version>
</dependency>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-util</artifactId>
- <version>2.0-SNAPSHOT</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-env</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-exception</artifactId>
- <version>1.0</version>
+ <groupId>&avalon-util-id;</groupId>
+ <artifactId>&avalon-util-criteria-id;</artifactId>
+ <version>&avalon-util-criteria-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-defaults-id;</artifactId>
+ <version>&avalon-util-defaults-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>
</dependencies>
1.1 avalon/repository/main/index.ent
Index: index.ent
===================================================================
<!ENTITY % repository-entities SYSTEM "file:../../versioning/avalon-repository.ent">
%repository-entities;
<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent">
%util-entities;
1.6 +10 -8 avalon/repository/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/spi/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 22 Feb 2004 19:10:35 -0000 1.5
+++ project.xml 9 Apr 2004 06:52:02 -0000 1.6
@@ -1,24 +1,26 @@
<?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-repository</groupId>
- <id>avalon-repository-spi</id>
- <name>Avalon Repository SPI</name>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
+ <groupId>&avalon-repository-id;</groupId>
+ <id>&avalon-repository-spi-id;</id>
+ <currentVersion>&avalon-repository-spi-version;</currentVersion>
+ <name>Avalon Repository SPI</name>
<package>org.apache.avalon.repository</package>
-
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Repository SPI</shortDescription>
<dependencies>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-api-id;</artifactId>
+ <version>&avalon-repository-api-version;</version>
</dependency>
</dependencies>
1.1 avalon/repository/spi/index.ent
Index: index.ent
===================================================================
<!ENTITY % repository-entities SYSTEM "file:../../versioning/avalon-repository.ent">
%repository-entities;
<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent">
%util-entities;
1.6 +17 -14 avalon/repository/test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/test/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 27 Feb 2004 22:39:37 -0000 1.5
+++ project.xml 9 Apr 2004 06:52:02 -0000 1.6
@@ -1,34 +1,37 @@
<?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-repository</groupId>
- <id>avalon-repository-test</id>
- <name>Avalon Repository Test</name>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
+ <groupId>&avalon-repository-id;</groupId>
+ <id>&avalon-repository-test-id;</id>
+ <currentVersion>&avalon-repository-test-version;</currentVersion>
+ <name>Avalon Repository Bootstap</name>
<package>org.apache.avalon.repository</package>
-
<inceptionYear>2002</inceptionYear>
+
<shortDescription>Avalon Repository Test</shortDescription>
<dependencies>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-main</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-main-id;</artifactId>
+ <version>&avalon-repository-main-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>
</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>
</dependencies>
1.1 avalon/repository/test/index.ent
Index: index.ent
===================================================================
<!ENTITY % repository-entities SYSTEM "file:../../versioning/avalon-repository.ent">
%repository-entities;
<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent">
%util-entities;
<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent">
%framework-entities;
1.5 +10 -8 avalon/repository/util/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/util/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 22 Feb 2004 19:10:35 -0000 1.4
+++ project.xml 9 Apr 2004 06:52:02 -0000 1.5
@@ -1,24 +1,26 @@
<?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-repository</groupId>
- <id>avalon-repository-util</id>
- <name>Avalon Repository Utilities</name>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
+ <groupId>&avalon-repository-id;</groupId>
+ <id>&avalon-repository-util-id;</id>
+ <currentVersion>&avalon-repository-util-version;</currentVersion>
+ <name>Avalon Repository Utilities</name>
<package>org.apache.avalon.repository</package>
-
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Repository Utilities</shortDescription>
<dependencies>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>&avalon-repository-id;</groupId>
+ <artifactId>&avalon-repository-api-id;</artifactId>
+ <version>&avalon-repository-api-version;</version>
</dependency>
</dependencies>
1.1 avalon/repository/util/index.ent
Index: index.ent
===================================================================
<!ENTITY % repository-entities SYSTEM "file:../../versioning/avalon-repository.ent">
%repository-entities;
<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent">
%util-entities;
1.2 +12 -14 avalon/versioning/avalon-repository.ent
Index: avalon-repository.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-repository.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avalon-repository.ent 6 Apr 2004 07:33:09 -0000 1.1
+++ avalon-repository.ent 9 Apr 2004 06:52:02 -0000 1.2
@@ -1,28 +1,26 @@
+<!ENTITY avalon-repository-id "avalon-repository">
<!ENTITY avalon-repository-api-id "avalon-repository-api">
-<!ENTITY avalon-repository-api-group "avalon-repository">
-<!ENTITY avalon-repository-api-version "2.0">
+<!ENTITY avalon-repository-api-version "2.0.0-dev">
<!ENTITY avalon-repository-cli-id "avalon-repository-cli">
-<!ENTITY avalon-repository-cli-group "avalon-repository">
-<!ENTITY avalon-repository-cli-version "2.0">
+<!ENTITY avalon-repository-cli-version "2.0.0-dev">
<!ENTITY avalon-repository-impl-id "avalon-repository-impl">
-<!ENTITY avalon-repository-impl-group "avalon-repository">
-<!ENTITY avalon-repository-impl-version "2.0">
+<!ENTITY avalon-repository-impl-version "2.0.0-dev">
<!ENTITY avalon-repository-main-id "avalon-repository-main">
-<!ENTITY avalon-repository-main-group "avalon-repository">
-<!ENTITY avalon-repository-main-version "2.0">
+<!ENTITY avalon-repository-main-version "2.0.0-dev">
<!ENTITY avalon-repository-spi-id "avalon-repository-spi">
-<!ENTITY avalon-repository-spi-group "avalon-repository">
-<!ENTITY avalon-repository-spi-version "2.0">
+<!ENTITY avalon-repository-spi-version "2.0.0-dev">
<!ENTITY avalon-repository-test-id "avalon-repository-test">
-<!ENTITY avalon-repository-test-group "avalon-repository">
-<!ENTITY avalon-repository-test-version "2.0">
+<!ENTITY avalon-repository-test-version "2.0.0-dev">
<!ENTITY avalon-repository-util-id "avalon-repository-util">
-<!ENTITY avalon-repository-util-group "avalon-repository">
-<!ENTITY avalon-repository-util-version "2.0">
+<!ENTITY avalon-repository-util-version "2.0.0-dev">
+
+<!ENTITY avalon-repository-artifact
+
"artifact:&avalon-repository-id;/&avalon-repository-impl-id;#&avalon-repository-impl-version;">
+
1.4 +1 -0 avalon/versioning/avalon-util.ent
Index: avalon-util.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-util.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- avalon-util.ent 8 Apr 2004 13:06:44 -0000 1.3
+++ avalon-util.ent 9 Apr 2004 06:52:02 -0000 1.4
@@ -24,3 +24,4 @@
<!ENTITY avalon-util-plugin-id "avalon-util-plugin">
<!ENTITY avalon-util-plugin-version "1.0.0-dev">
+
1.1 avalon/repository/index.ent
Index: index.ent
===================================================================
<!ENTITY % repository-entities SYSTEM "file:../versioning/avalon-repository.ent">
%repository-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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
