diff options
| -rw-r--r-- | java/common/pom.xml | 2 | ||||
| -rw-r--r-- | java/common/protocol-version.xml | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/java/common/pom.xml b/java/common/pom.xml index e655054453..bbc70bf7f6 100644 --- a/java/common/pom.xml +++ b/java/common/pom.xml @@ -39,7 +39,7 @@ <spec.stylesheet>${basedir}/src/main/xsl/framing.xsl</spec.stylesheet> <registry.stylesheet>${basedir}/src/main/xsl/registry.xsl</registry.stylesheet> <registry.template>${basedir}/src/main/xsl/registry.template</registry.template> - <generated.path>${project.build.directory}/generated/xsl</generated.path> + <generated.path>${project.build.directory}/generated-sources/xsl</generated.path> <generated.package>org/apache/qpid/framing</generated.package> <generated.dir>${generated.path}/${generated.package}</generated.dir> <specs.dir>${topDirectoryLocation}/../specs</specs.dir> diff --git a/java/common/protocol-version.xml b/java/common/protocol-version.xml index 8341dea707..96ce348523 100644 --- a/java/common/protocol-version.xml +++ b/java/common/protocol-version.xml @@ -21,6 +21,8 @@ <project name="Qpid Common Protocol Versions" default="generate"> <property name="saxon.jar" value="lib/saxon/saxon8.jar"/> + <!-- temporarily hard-wired XML spec version for build avoidance --> + <property name="amqp.xml" value="${specs.dir}/amqp-8.0.xml"/> <macrodef name="saxon"> <attribute name="out"/> @@ -85,11 +87,10 @@ </sequential> </macrodef> -<!-- <uptodate property="generated" targetfile="${generated.dir}/results.out" - srcfile="${amqp.xml}"/> --> + <uptodate property="generated" targetfile="${generated.dir}/results.out" + srcfile="${amqp.xml}"/> -<!-- <target name="generate" unless="generated"> --> - <target name="generate"> + <target name="generate" unless="generated"> <mkdir dir="${generated.dir}"/> <copy file="src/main/versions/ProtocolVersionList.java.tmpl" tofile="${proto_version}" overwrite="true"/> |