brett 2004/12/04 20:07:53
Modified: jelly project.xml
jelly/jelly-tags tag-project.xml
Added: jelly parent-project.xml
Removed: jelly commonDependencies.ent
Log:
replace entities with inheritence for dependencies
Revision Changes Path
1.157 +6 -13 jakarta-commons/jelly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/project.xml,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- project.xml 22 Nov 2004 03:27:47 -0000 1.156
+++ project.xml 5 Dec 2004 04:07:53 -0000 1.157
@@ -14,12 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE project [
- <!-- see file for description -->
- <!ENTITY commonDeps SYSTEM "file:commonDependencies.ent">
-]>
<project>
+ <extend>parent-project.xml</extend>
<pomVersion>3</pomVersion>
<name>commons-jelly</name>
<id>commons-jelly</id>
@@ -162,6 +159,11 @@
<id>dfs</id>
<email>dfs -> apache.org</email>
</developer>
+ <developer>
+ <name>Brett Porter</name>
+ <id>brett</id>
+ <email>[EMAIL PROTECTED]</email>
+ </developer>
</developers>
<contributors>
<contributor>
@@ -293,15 +295,6 @@
</contributor>
</contributors>
<dependencies>
-
- <!--
- the common Maven dependencies for Jelly shared by the core
- build and all individual taglib builds. Use this
- file to keep all dependency versions in sync.
- Does not include CLI (Command Line Interface).
- -->
- &commonDeps;
-
<!-- for servlet support -->
<dependency>
<id>servletapi</id>
1.1 jakarta-commons/jelly/parent-project.xml
Index: parent-project.xml
===================================================================
<!--
Copyright 2002,2004 The Apache Software Foundation.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<!-- TODO: should this inherit commons-build? -->
<artifactId>commons-jelly-parent</artifactId>
<dependencies>
<!--
the common Maven dependencies for Jelly shared by the core
build and all individual taglib builds. Use this
file to keep all dependency versions in sync.
Does not include CLI (Command Line Interface).
-->
<dependency>
<id>commons-jexl</id>
<version>1.0</version>
</dependency>
<dependency>
<id>xml-apis</id>
<version>1.0.b2</version>
</dependency>
<dependency>
<id>commons-beanutils</id>
<version>1.6</version>
</dependency>
<dependency>
<id>commons-collections</id>
<version>2.1</version>
</dependency>
<dependency>
<id>commons-logging</id>
<version>1.0.3</version>
</dependency>
<dependency>
<id>dom4j</id>
<version>1.5</version>
</dependency>
<dependency>
<id>jaxen</id>
<version>1.1-beta-2</version>
</dependency>
<dependency>
<id>xerces</id>
<version>2.2.1</version>
</dependency>
</dependencies>
</project>
1.17 +1 -4 jakarta-commons/jelly/jelly-tags/tag-project.xml
Index: tag-project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/tag-project.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tag-project.xml 12 Sep 2004 15:15:11 -0000 1.16
+++ tag-project.xml 5 Dec 2004 04:07:53 -0000 1.17
@@ -1,8 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!-- see file for description -->
- <!ENTITY commonDeps SYSTEM "file:../commonDependencies.ent">
-]>
<!--
Copyright 2002-2004 The Apache Software Foundation
@@ -19,6 +15,7 @@
limitations under the License.
-->
<project>
+ <extend>../parent-project.xml</extend>
<pomVersion>3</pomVersion>
<groupId>commons-jelly</groupId>
<currentVersion>1.0-SNAPSHOT</currentVersion>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
