incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1327086 - in /incubator/lcf/branches/CONNECTORS-459: build.xml connectors/connector-build.xml framework/build.xml tests/test-build.xml
Date Tue, 17 Apr 2012 13:17:49 GMT
Author: kwright
Date: Tue Apr 17 13:17:48 2012
New Revision: 1327086

URL: http://svn.apache.org/viewvc?rev=1327086&view=rev
Log:
Make all ant build scripts require JDK 1.6

Modified:
    incubator/lcf/branches/CONNECTORS-459/build.xml
    incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml
    incubator/lcf/branches/CONNECTORS-459/framework/build.xml
    incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml

Modified: incubator/lcf/branches/CONNECTORS-459/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/build.xml?rev=1327086&r1=1327085&r2=1327086&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/build.xml Tue Apr 17 13:17:48 2012
@@ -164,7 +164,7 @@
     
     <target name="build-json">
         <mkdir dir="build/json/classes"/>
-        <javac srcdir="json" destdir="build/json/classes" target="1.5" source="1.4" debug="true"
debuglevel="lines,vars,source">
+        <javac srcdir="json" destdir="build/json/classes" target="1.6" source="1.4" debug="true"
debuglevel="lines,vars,source">
             <classpath>
             </classpath>
         </javac>
@@ -1740,9 +1740,6 @@
     <target name="calculate-elasticsearch-tests-condition" depends="calculate-elasticsearch-testmaterials-condition,calculate-elasticsearch-condition,calculate-cmis-condition">
       <condition property="elasticsearch-tests.include">
         <and>
-        	  <not>
-                <equals arg1="${ant.java.version}" arg2="1.5" />
-            </not>
             <isset property="elasticsearch.include"/>
             <isset property="elasticsearch-testmaterials.include"/>
             <isset property="cmis.include"/>

Modified: incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml?rev=1327086&r1=1327085&r2=1327086&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/connectors/connector-build.xml Tue Apr 17 13:17:48
2012
@@ -212,7 +212,7 @@
 
     <target name="compile-wsdls" depends="has-wsdls-check" if="hasWSDLs">
         <mkdir dir="build/wsdlclasses"/>
-        <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" target="1.5" source="1.5"
debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+        <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" target="1.6" source="1.6"
debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
                 <fileset dir="../../lib">
                     <include name="axis*.jar"/>
@@ -234,7 +234,7 @@
 
     <target name="compile-xsds" depends="has-xsds-check" if="hasXSDs">
         <mkdir dir="build/xsdclasses"/>
-        <javac srcdir="build/xsdjava" destdir="build/xsdclasses" target="1.5" source="1.5"
debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+        <javac srcdir="build/xsdjava" destdir="build/xsdclasses" target="1.6" source="1.6"
debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
             <classpath>
                 <fileset dir="../../lib">
                     <include name="castor*.jar"/>
@@ -263,7 +263,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.5">
+        <javadoc destdir="dist/doc" source="1.6">
             <classpath>
                 <path refid="connector-classpath"/>
             </classpath>
@@ -274,7 +274,7 @@
 
     <target name="doc" depends="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.5">
+        <javadoc destdir="dist/doc" source="1.6">
             <classpath>
                 <path refid="connector-classpath"/>
             </classpath>
@@ -311,7 +311,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" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="server/src/main/java" destdir="build/server/classes" target="1.6"
source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <pathelement location="build/interface/classes"/>
                 <pathelement location="build/implementation/classes"/>
@@ -323,7 +323,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" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="registry/src/main/java" destdir="build/registry/classes" target="1.6"
source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <pathelement location="build/interface/classes"/>
             </classpath>
@@ -332,7 +332,7 @@
 
     <target name="compile-connector" depends="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" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.6"
source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="connector-classpath"/>
             </classpath>
@@ -341,7 +341,7 @@
 
     <target name="compile-implementation" depends="compile-interface,has-RMI-check" if="hasRMI">
         <mkdir dir="build/implementation/classes"/>
-        <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes"
target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes"
target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="implementation-classpath"/>
             </classpath>
@@ -350,7 +350,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" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="interface/src/main/java" destdir="build/interface/classes" target="1.6"
source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="interface-classpath"/>
             </classpath>
@@ -366,7 +366,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"
target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="connector/src/test/java" destdir="build/connector-tests/classes"
target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="connector-test-classpath"/>
             </classpath>

Modified: incubator/lcf/branches/CONNECTORS-459/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/framework/build.xml?rev=1327086&r1=1327085&r2=1327086&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/framework/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/framework/build.xml Tue Apr 17 13:17:48 2012
@@ -74,7 +74,7 @@
     
     <target name="doc">
         <mkdir dir="dist/doc"/>
-        <javadoc destdir="dist/doc" maxmemory="256M" source="1.5" useexternalfile="true">
+        <javadoc destdir="dist/doc" maxmemory="256M" source="1.6" useexternalfile="true">
             <classpath>
                 <path refid="framework-classpath"/>
             </classpath>
@@ -89,7 +89,7 @@
     
     <target name="compile-core">
         <mkdir dir="build/core/classes"/>
-        <javac srcdir="core/src/main/java" destdir="build/core/classes" target="1.5" source="1.5"
debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="core/src/main/java" destdir="build/core/classes" target="1.6" source="1.6"
debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
             </classpath>
@@ -98,7 +98,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" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="ui-core/src/main/java" destdir="build/ui-core/classes" target="1.6"
source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -109,7 +109,7 @@
 
     <target name="compile-agents" depends="compile-core">
         <mkdir dir="build/agents/classes"/>
-        <javac srcdir="agents/src/main/java" destdir="build/agents/classes" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="agents/src/main/java" destdir="build/agents/classes" target="1.6"
source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -119,7 +119,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" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="pull-agent/src/main/java" destdir="build/pull-agent/classes" target="1.6"
source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -130,7 +130,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"
target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="jetty-runner/src/main/java" destdir="build/jetty-runner/classes"
target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -142,7 +142,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"
target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="script-engine/src/main/java" destdir="build/script-engine/classes"
target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -152,7 +152,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"
target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="authority-servlet/src/main/java" destdir="build/authority-servlet/classes"
target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -164,7 +164,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"
target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="api-servlet/src/main/java" destdir="build/api-servlet/classes"
target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -192,7 +192,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" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="build/crawler-ui/java" destdir="build/crawler-ui/classes" target="1.6"
source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath id="classpath">
                 <pathelement location="${java.home}/../lib/tools.jar"/>
                 <path refid="framework-classpath"/>
@@ -1007,7 +1007,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" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="core/src/test/java" destdir="build/core-tests/classes" target="1.6"
source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -1017,7 +1017,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" target="1.5"
source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="agents/src/test/java" destdir="build/agents-tests/classes" target="1.6"
source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -1029,7 +1029,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"
target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="pull-agent/src/test/java" destdir="build/pull-agent-tests/classes"
target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
@@ -1043,7 +1043,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"
target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="script-engine/src/test/java" destdir="build/script-engine-tests/classes"
target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>

Modified: incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml?rev=1327086&r1=1327085&r2=1327086&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-459/tests/test-build.xml Tue Apr 17 13:17:48 2012
@@ -101,7 +101,7 @@
 
     <target name="compile-tests" depends="compile-test-resources">
         <mkdir dir="build/test/classes"/>
-        <javac srcdir="src/test/java" destdir="build/test/classes" target="1.5" source="1.5"
debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="src/test/java" destdir="build/test/classes" target="1.6" source="1.6"
debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="test-classpath"/>
             </classpath>



Mime
View raw message