Author: carnold
Date: Wed Jun 27 12:30:34 2007
New Revision: 551285
URL: http://svn.apache.org/viewvc?view=rev&rev=551285
Log:
Bug 42099: Filters release prep
Modified:
logging/log4j/companions/filters/trunk/build.xml
logging/log4j/companions/filters/trunk/pom.xml
logging/log4j/companions/filters/trunk/src/changes/changes.xml
logging/log4j/companions/filters/trunk/src/site/apt/download.apt
Modified: logging/log4j/companions/filters/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/build.xml?view=diff&rev=551285&r1=551284&r2=551285
==============================================================================
--- logging/log4j/companions/filters/trunk/build.xml (original)
+++ logging/log4j/companions/filters/trunk/build.xml Wed Jun 27 12:30:34 2007
@@ -21,6 +21,8 @@
This is a minimal build file to support Gump.
Use of Maven to build this component is recommended.
+Specify -Dcompanion.jar=foo.jar to test a previously prepared jar.
+
-->
<project default="test">
<!-- use build.properties file or command line to override these
properties -->
@@ -36,8 +38,8 @@
<property name="m2_repo" location="${user.home}/.m2/repository"/>
<!-- Versions for dependencies -->
- <property name="log4j.version" value="1.2.8"/>
- <property name="junit.version" value="4.3.1"/>
+ <property name="log4j.version" value="1.2.9"/>
+ <property name="junit.version" value="3.8.1"/>
<property name="oro.version" value="2.0.8"/>
<!-- Dependency locations - assumed to be in Maven 2 repository -->
@@ -61,7 +63,7 @@
</target>
- <target name="compile" depends="init" description="Compile implementation
files">
+ <target name="compile" depends="init" unless="companion.jar"
description="Compile implementation files">
<mkdir dir="target/classes"/>
<javac destdir="target/classes"
srcdir="src/main/java"
@@ -75,7 +77,7 @@
</copy>
</target>
- <target name="jar" depends="compile" description="Create jar">
+ <target name="jar" depends="compile" unless="companion.jar"
description="Create jar">
<jar destfile="target/${project.jar}"
basedir="target/classes">
<manifest>
@@ -89,15 +91,16 @@
</jar>
</target>
- <target name="test-compile" depends="compile" description="Compile test
files">
- <mkdir dir="target/test-classes"/>
+ <target name="test-compile" depends="jar" description="Compile test files">
+ <property name="companion.jar" value="target/${project.jar}"/>
+ <mkdir dir="target/test-classes"/>
<javac destdir="target/test-classes"
srcdir="src/test/java"
deprecation="${javac.deprecation}"
debug="${javac.debug}"
target="${javac.target}"
source="${javac.source}"
- classpath="${log4j.jar}:${junit.jar}:${oro.jar}:target/classes"/>
+ classpath="${log4j.jar}:${junit.jar}:${oro.jar}:${companion.jar}"/>
<copy todir="target/test-classes">
<fileset dir="src/test/resources"/>
</copy>
@@ -106,7 +109,7 @@
<target name="test" depends="test-compile" description="Run unit tests">
<junit printsummary="yes" fork="yes" dir="target">
- <classpath
path="target/test-classes:target/classes:${log4j.jar}:${oro.jar}"/>
+ <classpath
path="target/test-classes:${companion.jar}:${log4j.jar}:${oro.jar}"/>
<batchtest>
<fileset dir="src/test/java/">
<include name="**/*TestCase.java"/>
Modified: logging/log4j/companions/filters/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/pom.xml?view=diff&rev=551285&r1=551284&r2=551285
==============================================================================
--- logging/log4j/companions/filters/trunk/pom.xml (original)
+++ logging/log4j/companions/filters/trunk/pom.xml Wed Jun 27 12:30:34 2007
@@ -137,6 +137,7 @@
<descriptors>
<descriptor>src/assembly/bin.xml</descriptor>
</descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
@@ -173,13 +174,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.3.1</version>
+ <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.8</version>
+ <version>1.2.9</version>
</dependency>
<dependency>
<groupId>oro</groupId>
Modified: logging/log4j/companions/filters/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/changes/changes.xml?view=diff&rev=551285&r1=551284&r2=551285
==============================================================================
--- logging/log4j/companions/filters/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/filters/trunk/src/changes/changes.xml Wed Jun 27
12:30:34 2007
@@ -20,7 +20,7 @@
<title>Filters</title>
</properties>
<body>
- <release version="1.0" date="2007-06-05" description="First release">
+ <release version="1.0" date="2007-06-27" description="First release">
<action issue="42099" type="add">
Initial release of filters backported from log4j 1.3.
</action>
Modified: logging/log4j/companions/filters/trunk/src/site/apt/download.apt
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/filters/trunk/src/site/apt/download.apt?view=diff&rev=551285&r1=551284&r2=551285
==============================================================================
--- logging/log4j/companions/filters/trunk/src/site/apt/download.apt (original)
+++ logging/log4j/companions/filters/trunk/src/site/apt/download.apt Wed Jun 27
12:30:34 2007
@@ -30,9 +30,9 @@
*-------------------------+---------+----------+-----------+
| | Mirrors | Checksum | Signature |
*-------------------------+---------+----------+-----------+
-| apache-log4j-filters-1.0-bin (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0-bin.tar.gz}
apache-log4j-filters-1.0-bin.tar.gz}} |
{{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0-bin.tar.gz.md5}
apache-log4j-filters-1.0-bin.tar.gz.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0-bin.tar.gz.asc}
apache-log4j-filters-1.0-bin.tar.gz.asc}} |
+| apache-log4j-filters-1.0 (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0.tar.gz}
apache-log4j-filters-1.0.tar.gz}} |
{{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0.tar.gz.md5}
apache-log4j-filters-1.0.tar.gz.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0.tar.gz.asc}
apache-log4j-filters-1.0.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| apache-log4j-filters-1.0-bin (zip) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0-bin.zip}
apache-log4j-filters-1.0-bin.zip}} |
{{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0-bin.zip.md5}
apache-log4j-filters-1.0-bin.zip.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0-bin.zip.asc}
apache-log4j-filters-1.0-bin.zip.asc}} |
+| apache-log4j-filters-1.0 (zip) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0.zip}
apache-log4j-filters-1.0.zip}} |
{{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0.zip.md5}
apache-log4j-filters-1.0.zip.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/filters/1.0/apache-log4j-filters-1.0.zip.asc}
apache-log4j-filters-1.0.zip.asc}} |
*-------------------------+---------+----------+-----------+
Please read {{{http://httpd.apache.org/dev/verification.html}Verifying
Apache HTTP Server Releases}}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
