niclas 2004/04/13 22:42:11
Modified: merlin-test/merlin-jmx-demo project.properties project.xml
merlin-test/merlin-jmx-demo/versioning build.numbers
merlin-jmx-demo.ent
Log:
Stuff to make the versioning test work.
Revision Changes Path
1.2 +1 -0 avalon-sandbox/merlin-test/merlin-jmx-demo/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 13 Apr 2004 17:56:33 -0000 1.1
+++ project.properties 14 Apr 2004 05:42:11 -0000 1.2
@@ -1 +1,2 @@
maven.increment.enable = true
+maven.remote.group=avalon
\ No newline at end of file
1.4 +13 -12 avalon-sandbox/merlin-test/merlin-jmx-demo/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 13 Apr 2004 17:56:33 -0000 1.3
+++ project.xml 14 Apr 2004 05:42:11 -0000 1.4
@@ -4,16 +4,23 @@
]>
<project>
-
- <groupId>merlin</groupId>
+ <pomVersion>3</pomVersion>
<id>merlin-jmx-demo</id>
<name>Merlin JMX RMI Test Case</name>
- <package>my.avalon.jmx</package>
+ <groupId>merlin</groupId>
<currentVersion>&merlin-jmx-demo-version;</currentVersion>
<inceptionYear>2003</inceptionYear>
+ <package>my.avalon.jmx</package>
+
<shortDescription>Test for the Merlin RMI JMX Connection.</shortDescription>
+ <siteAddress>avalon.apache.org</siteAddress>
+ <siteDirectory>/www/avalon.apache.org/sandbox</siteDirectory>
+
+ <distributionSite>www.apache.org</distributionSite>
+ <distributionDirectory>/www/www.apache.org/dist/avalon</distributionDirectory>
+
<dependencies>
<dependency>
<groupId>mx4j</groupId>
@@ -46,22 +53,16 @@
<sourceDirectory>${basedir}/src/main</sourceDirectory>
<unitTestSourceDirectory></unitTestSourceDirectory>
<unitTest></unitTest>
- <testResources></testResources>
- <integrationUnitTestPatterns></integrationUnitTestPatterns>
-
+ <integrationTestSourceDirectory></integrationTestSourceDirectory>
<resources>
<resource>
<directory>${basedir}/src/main</directory>
<includes>
<include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>${maven.build.src}</directory>
- <includes>
<include>**/*.x*</include>
</includes>
</resource>
+
<resource>
<directory>${basedir}/conf</directory>
<targetPath>BLOCK-INF</targetPath>
@@ -69,6 +70,7 @@
<include>block.xml</include>
</includes>
</resource>
+
<resource>
<directory>${basedir}/conf</directory>
<includes>
@@ -77,7 +79,6 @@
</includes>
</resource>
</resources>
-
<jars></jars>
</build>
1.3 +1 -1
avalon-sandbox/merlin-test/merlin-jmx-demo/versioning/build.numbers
Index: build.numbers
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/versioning/build.numbers,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.numbers 14 Apr 2004 03:45:06 -0000 1.2
+++ build.numbers 14 Apr 2004 05:42:11 -0000 1.3
@@ -2,4 +2,4 @@
build.major=1
build.minor=0
build.phase=rc-
-build.number=3
+build.number=7
1.3 +1 -1
avalon-sandbox/merlin-test/merlin-jmx-demo/versioning/merlin-jmx-demo.ent
Index: merlin-jmx-demo.ent
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/versioning/merlin-jmx-demo.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlin-jmx-demo.ent 14 Apr 2004 03:45:06 -0000 1.2
+++ merlin-jmx-demo.ent 14 Apr 2004 05:42:11 -0000 1.3
@@ -1,6 +1,6 @@
<!ENTITY merlin-jmx-demo-group "merlin-jmx-demo">
<!ENTITY merlin-jmx-demo-id "merlin-jmx-demo">
-<!ENTITY merlin-jmx-demo-version "1.0.rc-3">
+<!ENTITY merlin-jmx-demo-version "1.0.rc-7">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
