diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2006-11-10 09:23:19 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2006-11-10 09:23:19 +0000 |
| commit | 1aac35ef41780a6c082989794a6b918d64c91f1f (patch) | |
| tree | b2e4e7342ad3b72a4a45a08afdd69f76b4f92909 /java | |
| parent | c78a89e15c31c61d700112ae4a1a02ab2d878deb (diff) | |
| download | qpid-python-1aac35ef41780a6c082989794a6b918d64c91f1f.tar.gz | |
Created module.vm.version to set X-Compile-Source-JDK in jars default is 1.4 Broker overrides to 1.5
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473283 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/build-module.xml | 1 | ||||
| -rw-r--r-- | java/build.xml | 18 | ||||
| -rw-r--r-- | java/module.xml | 6 |
3 files changed, 8 insertions, 17 deletions
diff --git a/java/broker/build-module.xml b/java/broker/build-module.xml index 4c3aa56396..1f4d9022dc 100644 --- a/java/broker/build-module.xml +++ b/java/broker/build-module.xml @@ -18,5 +18,6 @@ <project name="AMQ Broker" default="build"> <property name="module.depends" value="common"/> <property name="module.main" value="org.apache.qpid.server.Main"/> + <property name="module.vm.version" value="1.5"/> <import file="../module.xml"/> </project> diff --git a/java/build.xml b/java/build.xml index ff3e6f86be..4bac00d261 100644 --- a/java/build.xml +++ b/java/build.xml @@ -147,23 +147,7 @@ <antcall target="copyreleasedocs"> <param name="todir" value="${build.release.prepare}"/> - </antcall> - - <!-- Copy all licenses to license directory --> - - <mkdir dir="${build.release.prepare}/licenses"/> - - <copy todir="${build.release.prepare}/licenses"> - <fileset dir="client/${lib.dir}" casesensitive="false"> - <include name="**/license.txt"/> - </fileset> - <fileset dir="broker/${lib.dir}" casesensitive="false"> - <include name="**/license.txt"/> - </fileset> - <fileset dir="common/${lib.dir}" casesensitive="false"> - <include name="**/license.txt"/> - </fileset> - </copy> + </antcall> </target> diff --git a/java/module.xml b/java/module.xml index e6bb5ba3eb..252871095a 100644 --- a/java/module.xml +++ b/java/module.xml @@ -200,12 +200,14 @@ <manifest file="${module.manifest}"> <attribute name="Main-Class" value="${module.main}"/> <attribute name="Class-Path" value="${module.manifest.classpath}"/> + <attribute name="X-Compile-Source-JDK" value="${module.vm.version}"/> </manifest> </target> <target name="manifest-lib" unless="module.main"> <manifest file="${module.manifest}"> <attribute name="Class-Path" value="${module.manifest.classpath}"/> + <attribute name="X-Compile-Source-JDK" value="${module.vm.version}"/> </manifest> </target> @@ -220,6 +222,10 @@ </and> </condition> + <condition property="module.vm.version" value="${module.vm.version}" else="1.4"> + <isset property="module.vm.version"/> + </condition> + <condition property="dist.destlib.dir" value="${dist.dest.dir}/${lib.dir}"> <isset property="dist.dest.dir"/> </condition> |