You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by io...@apache.org on 2014/05/03 16:08:16 UTC
svn commit: r1592211 - in /manifoldcf/trunk: build.xml framework/build.xml
framework/buildfiles/connector-build.xml
Author: iorixxx
Date: Sat May 3 14:08:15 2014
New Revision: 1592211
URL: http://svn.apache.org/r1592211
Log:
CONNECTORS-935 : use 1.7 as source and target in ant build.xml files
Modified:
manifoldcf/trunk/build.xml
manifoldcf/trunk/framework/build.xml
manifoldcf/trunk/framework/buildfiles/connector-build.xml
Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1592211&r1=1592210&r2=1592211&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Sat May 3 14:08:15 2014
@@ -17,6 +17,10 @@
<project name="manifoldcf" default="help">
+ <presetdef name="javac">
+ <javac includeantruntime="false" />
+ </presetdef>
+
<import file="site-options.xml" optional="true"/>
<import file="common-build.xml"/>
Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1592211&r1=1592210&r2=1592211&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Sat May 3 14:08:15 2014
@@ -84,7 +84,7 @@
<target name="doc">
<mkdir dir="dist/doc"/>
- <javadoc destdir="dist/doc" maxmemory="256M" source="1.6" useexternalfile="true">
+ <javadoc destdir="dist/doc" maxmemory="256M" source="1.7" useexternalfile="true">
<classpath>
<path refid="framework-classpath"/>
</classpath>
@@ -102,7 +102,7 @@
<copy todir="build/core/classes">
<fileset dir="core/src/main/resources"/>
</copy>
- <javac srcdir="core/src/main/java" destdir="build/core/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="core/src/main/java" destdir="build/core/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
</classpath>
@@ -111,7 +111,7 @@
<target name="compile-ui-core" depends="compile-core">
<mkdir dir="build/ui-core/classes"/>
- <javac srcdir="ui-core/src/main/java" destdir="build/ui-core/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="ui-core/src/main/java" destdir="build/ui-core/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -122,7 +122,7 @@
<target name="compile-agents" depends="compile-core">
<mkdir dir="build/agents/classes"/>
- <javac srcdir="agents/src/main/java" destdir="build/agents/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="agents/src/main/java" destdir="build/agents/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -132,7 +132,7 @@
<target name="compile-pull-agent" depends="compile-core,compile-agents">
<mkdir dir="build/pull-agent/classes"/>
- <javac srcdir="pull-agent/src/main/java" destdir="build/pull-agent/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="pull-agent/src/main/java" destdir="build/pull-agent/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -143,7 +143,7 @@
<target name="compile-jetty-runner" depends="compile-core,compile-agents">
<mkdir dir="build/jetty-runner/classes"/>
- <javac srcdir="jetty-runner/src/main/java" destdir="build/jetty-runner/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="jetty-runner/src/main/java" destdir="build/jetty-runner/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -155,7 +155,7 @@
<target name="compile-script-engine" depends="compile-core">
<mkdir dir="build/script-engine/classes"/>
- <javac srcdir="script-engine/src/main/java" destdir="build/script-engine/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="script-engine/src/main/java" destdir="build/script-engine/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -165,7 +165,7 @@
<target name="compile-authority-servlet" depends="compile-core,compile-agents,compile-pull-agent">
<mkdir dir="build/authority-servlet/classes"/>
- <javac srcdir="authority-servlet/src/main/java" destdir="build/authority-servlet/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="authority-servlet/src/main/java" destdir="build/authority-servlet/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -177,7 +177,7 @@
<target name="compile-authority-service" depends="compile-core,compile-agents,compile-pull-agent,compile-authority-servlet">
<mkdir dir="build/authority-service/classes"/>
- <javac srcdir="authority-service/src/main/java" destdir="build/authority-service/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="authority-service/src/main/java" destdir="build/authority-service/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -190,7 +190,7 @@
<target name="compile-api-servlet" depends="compile-core,compile-ui-core,compile-agents,compile-pull-agent">
<mkdir dir="build/api-servlet/classes"/>
- <javac srcdir="api-servlet/src/main/java" destdir="build/api-servlet/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="api-servlet/src/main/java" destdir="build/api-servlet/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -203,7 +203,7 @@
<target name="compile-api-service" depends="compile-core,compile-ui-core,compile-agents,compile-pull-agent,compile-api-servlet">
<mkdir dir="build/api-service/classes"/>
- <javac srcdir="api-service/src/main/java" destdir="build/api-service/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="api-service/src/main/java" destdir="build/api-service/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -217,7 +217,7 @@
<target name="compile-combined-service" depends="compile-core,compile-ui-core,compile-agents,compile-pull-agent,compile-api-servlet,compile-authority-servlet">
<mkdir dir="build/combined-service/classes"/>
- <javac srcdir="combined-service/src/main/java" destdir="build/combined-service/classes" deprecation="true" target="1.6" source="1.6" encoding="utf-8" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="combined-service/src/main/java" destdir="build/combined-service/classes" deprecation="true" target="1.7" source="1.7" encoding="utf-8" debug="true" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -232,7 +232,7 @@
<target name="compile-crawler-ui" depends="compile-core,compile-ui-core,compile-agents,compile-pull-agent">
<mkdir dir="build/crawler-ui/classes"/>
- <javac srcdir="crawler-ui/src/main/java" destdir="build/crawler-ui/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="crawler-ui/src/main/java" destdir="build/crawler-ui/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -258,7 +258,7 @@
<jasper2 validateXml="false" uriroot="crawler-ui/src/main/webapp" webXmlFragment="build/crawler-ui/web-generated.xml" outputDir="build/crawler-ui/java" />
<!-- Compile java classes -->
<mkdir dir="build/crawler-ui/classes"/>
- <javac srcdir="build/crawler-ui/java" destdir="build/crawler-ui/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="build/crawler-ui/java" destdir="build/crawler-ui/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath id="classpath">
<pathelement location="${java.home}/../lib/tools.jar"/>
<path refid="framework-classpath"/>
@@ -1516,7 +1516,7 @@
<target name="compile-core-tests" depends="compile-core">
<mkdir dir="build/core-tests/classes"/>
- <javac srcdir="core/src/test/java" destdir="build/core-tests/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="core/src/test/java" destdir="build/core-tests/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -1526,7 +1526,7 @@
<target name="compile-agents-tests" depends="compile-core-tests,compile-agents">
<mkdir dir="build/agents-tests/classes"/>
- <javac srcdir="agents/src/test/java" destdir="build/agents-tests/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="agents/src/test/java" destdir="build/agents-tests/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -1538,7 +1538,7 @@
<target name="compile-pull-agent-tests" depends="compile-agents-tests,compile-pull-agent">
<mkdir dir="build/pull-agent-tests/classes"/>
- <javac srcdir="pull-agent/src/test/java" destdir="build/pull-agent-tests/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="pull-agent/src/test/java" destdir="build/pull-agent-tests/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -1552,7 +1552,7 @@
<target name="compile-script-engine-tests" depends="compile-core,compile-script-engine">
<mkdir dir="build/script-engine-tests/classes"/>
- <javac srcdir="script-engine/src/test/java" destdir="build/script-engine-tests/classes" deprecation="true" target="1.6" source="1.6" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="script-engine/src/test/java" destdir="build/script-engine-tests/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1592211&r1=1592210&r2=1592211&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Sat May 3 14:08:15 2014
@@ -284,7 +284,7 @@
<target name="compile-stubs" depends="build-stubs-check" if="buildStubs">
<mkdir dir="build/stubclasses"/>
- <javac srcdir="build-stub/src/main/java" destdir="build/stubclasses" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="build-stub/src/main/java" destdir="build/stubclasses" deprecation="true" target="1.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
</classpath>
</javac>
@@ -376,7 +376,7 @@
<target name="compile-wsdls" depends="has-wsdls-check" if="hasWSDLs">
<mkdir dir="build/wsdlclasses"/>
- <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" deprecation="true" target="1.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<fileset dir="${mcf-dist}/lib">
<include name="axis*.jar"/>
@@ -398,7 +398,7 @@
<target name="compile-xsds" depends="has-xsds-check" if="hasXSDs">
<mkdir dir="build/xsdclasses"/>
- <javac srcdir="build/xsdjava" destdir="build/xsdclasses" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="build/xsdjava" destdir="build/xsdclasses" deprecation="true" target="1.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<fileset dir="${mcf-dist}/lib">
<include name="castor*.jar"/>
@@ -427,7 +427,7 @@
<target name="doc-rmi" depends="compile-wsdls,compile-xsds,has-RMI-check" if="hasRMI">
<mkdir dir="dist/doc"/>
- <javadoc destdir="dist/doc" source="1.6">
+ <javadoc destdir="dist/doc" source="1.7">
<classpath>
<path refid="connector-classpath"/>
</classpath>
@@ -438,7 +438,7 @@
<target name="doc" depends="compile-stubs,doc-rmi,compile-wsdls,compile-xsds,has-RMI-check,precompile-check" if="canBuild" unless="hasRMI">
<mkdir dir="dist/doc"/>
- <javadoc destdir="dist/doc" source="1.6">
+ <javadoc destdir="dist/doc" source="1.7">
<classpath>
<path refid="connector-classpath"/>
</classpath>
@@ -475,7 +475,7 @@
<target name="compile-server" depends="compile-interface,compile-implementation,compile-rmic,has-RMI-check" if="hasRMI">
<mkdir dir="build/server/classes"/>
- <javac srcdir="server/src/main/java" destdir="build/server/classes" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="server/src/main/java" destdir="build/server/classes" deprecation="true" target="1.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<pathelement location="build/interface/classes"/>
<pathelement location="build/implementation/classes"/>
@@ -487,7 +487,7 @@
<target name="compile-registry" depends="compile-interface,has-RMI-check" if="hasRMI">
<mkdir dir="build/registry/classes"/>
- <javac srcdir="registry/src/main/java" destdir="build/registry/classes" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="registry/src/main/java" destdir="build/registry/classes" deprecation="true" target="1.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<pathelement location="build/interface/classes"/>
</classpath>
@@ -496,7 +496,7 @@
<target name="compile-connector" depends="compile-stubs,compile-connector-native2ascii,compile-connector-resources,compile-wsdls,compile-xsds,compile-interface,compile-rmic,precompile-check" if="canBuild">
<mkdir dir="build/connector/classes"/>
- <javac srcdir="connector/src/main/java" destdir="build/connector/classes" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="connector/src/main/java" destdir="build/connector/classes" deprecation="true" target="1.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<path refid="connector-classpath"/>
</classpath>
@@ -505,7 +505,7 @@
<target name="compile-implementation" depends="compile-stubs,compile-interface,has-RMI-check" if="hasRMI">
<mkdir dir="build/implementation/classes"/>
- <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" deprecation="true" target="1.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<path refid="implementation-classpath"/>
</classpath>
@@ -514,7 +514,7 @@
<target name="compile-interface" depends="has-RMI-check" if="hasRMI">
<mkdir dir="build/interface/classes"/>
- <javac srcdir="interface/src/main/java" destdir="build/interface/classes" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="interface/src/main/java" destdir="build/interface/classes" deprecation="true" target="1.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<path refid="interface-classpath"/>
</classpath>
@@ -530,7 +530,7 @@
<target name="compile-tests" depends="compile-connector,compile-test-resources,has-tests-check" if="hasTests">
<mkdir dir="build/connector-tests/classes"/>
- <javac srcdir="connector/src/test/java" destdir="build/connector-tests/classes" deprecation="true" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="connector/src/test/java" destdir="build/connector-tests/classes" deprecation="true" target="1.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<path refid="connector-test-classpath"/>
</classpath>