You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2007/06/22 00:12:46 UTC
svn commit: r549629 - in /logging/log4j/branches/v1_2-branch: build.xml
pom.xml
Author: carnold
Date: Thu Jun 21 15:12:45 2007
New Revision: 549629
URL: http://svn.apache.org/viewvc?view=rev&rev=549629
Log:
Bug 37930: Update clirr task for Maven build
Modified:
logging/log4j/branches/v1_2-branch/build.xml
logging/log4j/branches/v1_2-branch/pom.xml
Modified: logging/log4j/branches/v1_2-branch/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/build.xml?view=diff&rev=549629&r1=549628&r2=549629
==============================================================================
--- logging/log4j/branches/v1_2-branch/build.xml (original)
+++ logging/log4j/branches/v1_2-branch/build.xml Thu Jun 21 15:12:45 2007
@@ -613,32 +613,38 @@
<!-- Compare the current API with a previous release -->
<!-- ================================================================= -->
<target name="clirr" depends="jar" description="Check binary compatibility with arbitrary release">
- <fail unless="clirr-core.jar">-Dclirr-core.jar=PATH must be specified.</fail>
- <fail unless="bcel.jar">-Dbcel.jar=PATH must be specified.</fail>
- <fail unless="reference.jar">-Dreference.jar=PATH must be specified.</fail>
+ <property name="clirr.version" value="0.6"/>
+ <property name="clirr-core.jar" value="${m2_repo}/net/sf/clirr/clirr-core/${clirr.version}/clirr-core-${clirr.version}.jar"/>
+ <available property="clirr-core.jar-available" file="${clirr-core.jar}"/>
+ <fail unless="clirr-core.jar-available">clirr-core-${clirr.version}.jar not in maven repo. Run mvn clirr:check to download.</fail>
+ <property name="bcel.version" value="5.1"/>
+ <property name="bcel.jar" value="${m2_repo}/bcel/bcel/${bcel.version}/bcel-${bcel.version}.jar"/>
+ <available property="bcel.jar-available" file="${bcel.jar}"/>
+ <fail unless="bcel.jar-available">bcel-${bcel.version}.jar not in maven repo. Run mvn clirr:check to download.</fail>
+ <property name="reference.version" value="1.2.14"/>
+ <property name="reference.jar" value="${m2_repo}/log4j/log4j/${reference.version}/log4j-${reference.version}.jar"/>
+ <available property="reference.jar-available" file="${reference.jar}"/>
+ <fail unless="reference.jar-available">reference-${reference.version}.jar not in maven repo. Run mvn clirr:check to download.</fail>
<taskdef resource="clirrtask.properties"
classpath="${clirr-core.jar};${bcel.jar}"/>
- <delete dir="build/clirr"/>
- <mkdir dir="build/clirr/orig"/>
- <mkdir dir="build/clirr/new"/>
- <copy todir="build/clirr/orig">
+ <delete dir="target/clirr"/>
+ <mkdir dir="target/clirr/orig"/>
+ <mkdir dir="target/clirr/new"/>
+ <copy todir="target/clirr/orig">
<fileset file="${jms.jar}"/>
<fileset file="${jmx.jar}"/>
<fileset file="${reference.jar}"/>
</copy>
- <copy todir="build/clirr/new">
+ <copy todir="target/clirr/new">
<fileset file="${jms.jar}"/>
<fileset file="${jmx.jar}"/>
<fileset dir="${jar.dest}" includes="${jar.filename}"/>
</copy>
<clirr failOnBinError="no" failOnSrcError="no">
- <origfiles dir="build/clirr/orig" includes="*.jar"/>
- <newfiles dir="build/clirr/new" includes="*.jar"/>
- <formatter type="xml" outfile="${docs.dest}/compatibility.xml"/>
+ <origfiles dir="target/clirr/orig" includes="*.jar"/>
+ <newfiles dir="target/clirr/new" includes="*.jar"/>
+ <formatter type="xml" outfile="target/clirr/compatibility.xml"/>
</clirr>
- <xslt in="${docs.dest}/compatibility.xml"
- out="${docs.dest}/compatibility.html"
- style="${basedir}/src/xdocs/stylesheets/compatibility.xslt"/>
</target>
<!-- ============================================== -->
Modified: logging/log4j/branches/v1_2-branch/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/pom.xml?view=diff&rev=549629&r1=549628&r2=549629
==============================================================================
--- logging/log4j/branches/v1_2-branch/pom.xml (original)
+++ logging/log4j/branches/v1_2-branch/pom.xml Thu Jun 21 15:12:45 2007
@@ -297,6 +297,20 @@
</execution>
</executions>
</plugin>
+ <!--
+ clirr:check will fail with NullPointerException
+ due to missing javax.jms.MessageListener,
+ however it will trigger download of supporting components
+ which can allow "ant clirr" to succeed.
+ Could possibly run on a JavaEE platform.
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <comparisonVersion>1.2.14</comparisonVersion>
+ </configuration>
+ </plugin>
</plugins>
<testSourceDirectory>tests/src/java</testSourceDirectory>
<testResources>
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org