You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/06/24 23:57:35 UTC
cvs commit: avalon-sandbox/merlin/merlin-extensions/merlin-jndi-new project.xml
mcconnell 2003/06/24 14:57:35
Modified: merlin project.xml
merlin/merlin-extensions/merlin-jndi-new project.xml
Log:
Housekeeping.
Revision Changes Path
1.19 +8 -2 avalon-sandbox/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 24 Jun 2003 16:04:49 -0000 1.18
+++ project.xml 24 Jun 2003 21:57:35 -0000 1.19
@@ -4,7 +4,7 @@
<pomVersion>3</pomVersion>
<groupId>merlin</groupId>
- <id>merlin-home</id>
+ <id>merlin</id>
<name>Merlin Service Management POM</name>
<currentVersion>1.0</currentVersion>
@@ -193,6 +193,12 @@
<include>**/*.jar</include>
</includes>
</resource>
+ <resource>
+ <directory>${maven.conf.dir}</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
</resources>
</unitTest>
@@ -213,7 +219,7 @@
</includes>
</resource>
<resource>
- <directory>${basedir}/../merlin-platform/src/etc</directory>
+ <directory>${basedir}/../</directory>
<includes>
<include>LICENSE.txt</include>
</includes>
1.2 +7 -27 avalon-sandbox/merlin/merlin-extensions/merlin-jndi-new/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-jndi-new/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 24 Jun 2003 21:36:44 -0000 1.1
+++ project.xml 24 Jun 2003 21:57:35 -0000 1.2
@@ -2,44 +2,24 @@
<project>
- <groupId>merlin</groupId>
+ <extend>${basedir}/../../project.xml</extend>
+
<id>merlin-jndi-new</id>
<name>Merlin JNDI Provider</name>
<package>org.apache.avalon.merlin.jndi</package>
<currentVersion>1.0</currentVersion>
<inceptionYear>2003</inceptionYear>
- <shortDescription>Merlin JNDI Provider Implementation.</shortDescription>
+ <shortDescription>Merlin JNDI Provider Implementation</shortDescription>
<dependencies>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-jmx</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-tools</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-dev</version>
- </dependency>
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5-dev</version>
- </dependency>
+ <!-- none -->
</dependencies>
<build>
- <nagEmailAddress>dev@avalon.apache.org</nagEmailAddress>
+
<sourceDirectory>${basedir}/src/main</sourceDirectory>
<unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
- <integrationUnitTestSourceDirectory/>
- <aspectSourceDirectory/>
<unitTest>
<includes>
@@ -89,9 +69,9 @@
</includes>
</resource>
<resource>
- <directory>${basedir}/../../merlin-platform/src/etc</directory>
+ <directory>${maven.conf.dir}</directory>
<includes>
- <include>LICENSE.txt</include>
+ <include>**/*.properties</include>
</includes>
</resource>
</resources>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org