niclas 2004/02/26 06:55:23
Modified: component maven.xml
logger maven.xml project.xml
sourceresolve maven.xml project.xml
store maven.xml
thread maven.xml
Log:
Various smaller fixes to get everything buildable without being a rocket scientist.
Revision Changes Path
1.6 +8 -6 avalon-excalibur/component/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/component/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 26 Feb 2004 13:14:43 -0000 1.5
+++ maven.xml 26 Feb 2004 14:55:23 -0000 1.6
@@ -39,8 +39,10 @@
</postGoal>
<postGoal name="jar:jar">
- <ant:jar
jarFile="${maven.build.dir}/excalibur-testcases-${pom.currentVersion}.jar" >
- <fileset dir="${basedir}/target/test-classes" />
+ <ant:jar
jarFile="${maven.build.dir}/excalibur-testcase-${pom.currentVersion}.jar" >
+ <fileset dir="${basedir}/target/classes/" >
+ <include name="org/apache/avalon/excalibur/testcase/**" />
+ </fileset>
</ant:jar>
</postGoal>
@@ -52,11 +54,11 @@
artifactDirectory = 'excalibur-testcases'
</ant:echo>
- <ant:property name="jardir__"
value="${maven.repo.local}/excalibur-testcases/jars"/>
- <ant:mkdir dir="${jardir__}"/>
+ <ant:property name="jardir2__"
value="${maven.repo.local}/excalibur-component/jars"/>
+ <ant:mkdir dir="${jardir2__}"/>
<ant:copy
- file="${maven.build.dir}/excalibur-testcases-${pom.currentVersion}.jar"
- todir="${jardir__}"
+ file="${maven.build.dir}/excalibur-testcase-${pom.currentVersion}.jar"
+ todir="${jardir2__}"
overwrite="true"
/>
</postGoal>
1.2 +1 -1 avalon-excalibur/logger/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/logger/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 25 Feb 2004 21:16:50 -0000 1.1
+++ maven.xml 26 Feb 2004 14:55:23 -0000 1.2
@@ -1,4 +1,4 @@
-<project xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util"
xmlns:ant="jelly:ant">
+<project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
<preGoal name="java:compile">
<ant:path
1.5 +7 -4 avalon-excalibur/logger/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/logger/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 25 Feb 2004 21:02:52 -0000 1.4
+++ project.xml 26 Feb 2004 14:55:23 -0000 1.5
@@ -54,6 +54,7 @@
<version>4.1.4</version>
<groupId>framework</groupId>
</dependency>
+
<dependency>
<id>logkit</id>
<version>1.2.2</version>
@@ -68,17 +69,16 @@
<version>download from sun</version>
</dependency>-->
<dependency>
- <!-- optional -->
<id>log4j</id>
<version>1.2.7</version>
</dependency>
+
<dependency>
- <!-- optional -->
<id>javamail</id>
- <version>1.3</version>
+ <version>1.3.1</version>
</dependency>
+
<dependency>
- <!-- optional -->
<id>jms</id>
<version>1.1</version>
</dependency>
@@ -88,17 +88,20 @@
<id>commons-collections</id>
<version>2.1</version>
</dependency>
+
<dependency>
<!-- testing only -->
<id>excalibur-component</id>
<version>1.2</version>
</dependency>
+
<dependency>
<!-- testing only -->
<id>excalibur-testcase</id>
<version>1.2</version>
<groupId>excalibur-component</groupId>
</dependency>
+
<dependency>
<!-- testing only -->
<id>excalibur-pool</id>
1.5 +1 -1 avalon-excalibur/sourceresolve/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/sourceresolve/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 25 Feb 2004 21:15:46 -0000 1.4
+++ maven.xml 26 Feb 2004 14:55:23 -0000 1.5
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<project default="java:jar"
+<project default="jar:install"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant">
1.5 +4 -0 avalon-excalibur/sourceresolve/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/sourceresolve/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 25 Feb 2004 21:15:46 -0000 1.4
+++ project.xml 26 Feb 2004 14:55:23 -0000 1.5
@@ -51,10 +51,14 @@
<id>jsse</id>
<version>1.0.3_02</version>
</dependency>
+
+<!-- Not USED ???
<dependency>
<id>xml-commons-resolver</id>
<version>1.0</version>
</dependency>
+-->
+
<dependency>
<!-- for testing only -->
<id>commons-logging</id>
1.5 +1 -1 avalon-excalibur/store/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/store/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 25 Feb 2004 21:15:47 -0000 1.4
+++ maven.xml 26 Feb 2004 14:55:23 -0000 1.5
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<project default="java:jar"
+<project default="jar:install"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant">
1.4 +1 -1 avalon-excalibur/thread/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/thread/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 21 Feb 2004 14:11:14 -0000 1.3
+++ maven.xml 26 Feb 2004 14:55:23 -0000 1.4
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project default="java:jar"
+<project default="jar:install"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
