Author: robbie
Date: Wed Apr 30 10:58:50 2014
New Revision: 1591241
URL: http://svn.apache.org/r1591241
Log:
QPID-5048: update formatting to ensure the release plugin doesnt change it later
Modified:
qpid/maven/trunk/qpid-parent/pom.xml
Modified: qpid/maven/trunk/qpid-parent/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/maven/trunk/qpid-parent/pom.xml?rev=1591241&r1=1591240&r2=1591241&view=diff
==============================================================================
--- qpid/maven/trunk/qpid-parent/pom.xml (original)
+++ qpid/maven/trunk/qpid-parent/pom.xml Wed Apr 30 10:58:50 2014
@@ -432,7 +432,7 @@
<target if="${dependency-change-verification}">
<!-- Set the output location for the generated file -->
<condition property="dependency-verification-output-file"
value="${dependency-verification-reference-file}"
else="${dependency-verification-generated-file}">
- <istrue value="${update-dependency-reference}"/>
+ <istrue value="${update-dependency-reference}" />
</condition>
<!-- Output the ALv2 header and a title, then append the
DEPENDENCIES file contents,
processing to strip out the qpid module version info
-->
@@ -462,33 +462,30 @@
# TRIMMED 3RD PARTY DEPENDENCY INFORMATION FOR
MODIFICATION CHECKS
#
</header>
- <path
path="${project.build.outputDirectory}/META-INF/DEPENDENCIES"/>
+ <path
path="${project.build.outputDirectory}/META-INF/DEPENDENCIES" />
</concat>
<replaceregexp
file="${dependency-verification-output-file}" flags="gm" replace="">
- <regexp id="stripqpidcontentheader" pattern="^\/\/\
.*\n|^Qpid\ .*\n"/>
+ <regexp id="stripqpidcontentheader" pattern="^\/\/\
.*\n|^Qpid\ .*\n" />
</replaceregexp>
<replaceregexp
file="${dependency-verification-output-file}" flags="gm">
- <regexp id="stripqpidcontentversions"
pattern="(^.*org.apache.qpid:.*:.*):.*"/>
- <substitution expression="\1"/>
+ <regexp id="stripqpidcontentversions"
pattern="(^.*org.apache.qpid:.*:.*):.*" />
+ <substitution expression="\1" />
</replaceregexp>
<!-- Ensure the reference file is present -->
- <fail message="Dependency info reference file was not
present at: ${dependency-verification-reference-file}.
-You can generate an initial reference file by running again with
-Dupdate-dependency-reference.">
+ <fail message="Dependency info reference file was not
present at: ${dependency-verification-reference-file}. You can generate an
initial reference file by running again with -Dupdate-dependency-reference.">
<condition>
<not>
- <available
file="${dependency-verification-reference-file}"/>
+ <available
file="${dependency-verification-reference-file}" />
</not>
</condition>
</fail>
<!-- Compare output to the reference file to check they
are the same, fail if they arent -->
<echo>Comparing to against reference info at:
${dependency-verification-reference-file}</echo>
- <fail message="Generated dependency info does not match
the reference.
-Ensure LICENCE and NOTICE files are correct and then update the reference by
running again with -Dupdate-dependency-reference.
-Generated file: '${dependency-verification-output-file}'. Reference file:
'${dependency-verification-reference-file}'.">
+ <fail message="Generated dependency info does not match
the reference. Ensure LICENCE and NOTICE files are correct and then update the
reference by running again with -Dupdate-dependency-reference. Generated file:
'${dependency-verification-output-file}'. Reference file:
'${dependency-verification-reference-file}'.">
<condition>
<not>
- <filesmatch
file1="${dependency-verification-output-file}"
file2="${dependency-verification-reference-file}" textfile="true"/>
+ <filesmatch
file1="${dependency-verification-output-file}"
file2="${dependency-verification-reference-file}" textfile="true" />
</not>
</condition>
</fail>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
