Revision 8828
Added by Jing Tao over 10 years ago
| build.xml | ||
|---|---|---|
| 33 | 33 |
xmlns:artifact="antlib:org.apache.maven.artifact.ant"> |
| 34 | 34 |
<property environment="env" /> |
| 35 | 35 |
<property file="build.properties" /><!-- USER SPECIFIC PROPS --> |
| 36 |
<property name="java.target.version" value="1.6" /> <!-- the target version for java compile--> |
|
| 36 |
<property name="java.target.version" value="1.6" /> <!-- the target version for java compilation--> |
|
| 37 |
<property name="java.source.version" value="1.6" /> <!-- the source code version for java compilation--> |
|
| 37 | 38 |
|
| 38 |
|
|
| 39 | 39 |
<!-- Configure the maven2 ant tasks --> |
| 40 | 40 |
<path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.0.jar" /> |
| 41 | 41 |
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" |
| ... | ... | |
| 511 | 511 |
|
| 512 | 512 |
<javac srcdir="${build.src}" destdir="${build.dest}"
|
| 513 | 513 |
target="${java.target.version}"
|
| 514 |
source="${java.target.version}"
|
|
| 514 |
source="${java.source.version}"
|
|
| 515 | 515 |
debug="${debug}"
|
| 516 | 516 |
excludes="**/*.sql **/client/*.java **/harvesterClient/*.java"> |
| 517 | 517 |
<classpath> |
| ... | ... | |
| 540 | 540 |
description="Compiles metacat-client java code to build dir"> |
| 541 | 541 |
<javac srcdir="${build.src}" destdir="${build.dest}"
|
| 542 | 542 |
target="${java.target.version}"
|
| 543 |
source="${java.target.version}"
|
|
| 543 |
source="${java.source.version}"
|
|
| 544 | 544 |
includes="edu/ucsb/nceas/metacat/client/*"> |
| 545 | 545 |
<classpath> |
| 546 | 546 |
<path refid="compile.classpath" /> |
| ... | ... | |
| 566 | 566 |
description="Compiles harvester java code to build dir"> |
| 567 | 567 |
<javac srcdir="${build.src}" destdir="${build.dest}"
|
| 568 | 568 |
target="${java.target.version}"
|
| 569 |
source="${java.target.version}"
|
|
| 569 |
source="${java.source.version}"
|
|
| 570 | 570 |
includes="edu/ucsb/nceas/metacat/harvesterClient/*"> |
| 571 | 571 |
<classpath> |
| 572 | 572 |
<path refid="compile.classpath" /> |
| ... | ... | |
| 1646 | 1646 |
destdir="${lsid.build.dir}/WEB-INF/classes" debug="${compile.debug}"
|
| 1647 | 1647 |
deprecation="${compile.deprecation}"
|
| 1648 | 1648 |
target="${java.target.version}"
|
| 1649 |
source="${java.target.version}"
|
|
| 1649 |
source="${java.source.version}"
|
|
| 1650 | 1650 |
optimize="${compile.optimize}">
|
| 1651 | 1651 |
<classpath> |
| 1652 | 1652 |
<path refid="compile.classpath" /> |
Also available in: Unified diff
Separate the target and source version for the java compilation.