You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2017/04/12 21:32:31 UTC
svn commit: r1791188 - in /manifoldcf/trunk: framework/build.xml
framework/buildfiles/connector-build.xml pom.xml
Author: kwright
Date: Wed Apr 12 21:32:31 2017
New Revision: 1791188
URL: http://svn.apache.org/viewvc?rev=1791188&view=rev
Log:
Insist on Java 8 source code.
Modified:
manifoldcf/trunk/framework/build.xml
manifoldcf/trunk/framework/buildfiles/connector-build.xml
manifoldcf/trunk/pom.xml
Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1791188&r1=1791187&r2=1791188&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Wed Apr 12 21:32:31 2017
@@ -182,8 +182,8 @@
<target name="doc">
<mkdir dir="dist/doc"/>
- <javadoc destdir="dist/doc" maxmemory="256M" source="1.7" useexternalfile="true" use="true" locale="en_US">
- <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+ <javadoc destdir="dist/doc" maxmemory="256M" source="1.8" useexternalfile="true" use="true" locale="en_US">
+ <link href="http://docs.oracle.com/javase/8/docs/api/"/>
<link href="http://manifoldcf.apache.org/release/trunk/api/framework/"/>
<classpath>
<path refid="framework-classpath"/>
@@ -201,7 +201,7 @@
<target name="compile-core">
<mkdir dir="build/core/classes"/>
- <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">
+ <javac srcdir="core/src/main/java" destdir="build/core/classes" deprecation="true" target="1.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
</classpath>
@@ -210,7 +210,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.7" source="1.7" 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.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -221,7 +221,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.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="agents/src/main/java" destdir="build/agents/classes" deprecation="true" target="1.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -234,7 +234,7 @@
<copy todir="build/connector-common/classes">
<fileset dir="connector-common/src/main/resources"/>
</copy>
- <javac srcdir="connector-common/src/main/java" destdir="build/connector-common/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="connector-common/src/main/java" destdir="build/connector-common/classes" deprecation="true" target="1.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<path refid="connector-common-classpath"/>
@@ -247,7 +247,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.7" source="1.7" 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.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -258,7 +258,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.7" source="1.7" 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.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -270,7 +270,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.7" source="1.7" 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.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -280,7 +280,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.7" source="1.7" 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.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -292,7 +292,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.7" source="1.7" 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.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -305,7 +305,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.7" source="1.7" 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.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -318,7 +318,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.7" source="1.7" 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.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -332,7 +332,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.7" source="1.7" 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.8" source="1.8" encoding="utf-8" debug="true" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -347,7 +347,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.7" source="1.7" 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.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -373,7 +373,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.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="build/crawler-ui/java" destdir="build/crawler-ui/classes" deprecation="true" target="1.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath id="classpath">
<pathelement location="${java.home}/../lib/tools.jar"/>
<path refid="framework-classpath"/>
@@ -1776,7 +1776,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.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="core/src/test/java" destdir="build/core-tests/classes" deprecation="true" target="1.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -1786,7 +1786,7 @@
<target name="compile-connector-common-tests" depends="compile-connector-common">
<mkdir dir="build/connector-common-tests/classes"/>
- <javac srcdir="connector-common/src/test/java" destdir="build/connector-common-tests/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="connector-common/src/test/java" destdir="build/connector-common-tests/classes" deprecation="true" target="1.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -1798,7 +1798,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.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="agents/src/test/java" destdir="build/agents-tests/classes" deprecation="true" target="1.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -1810,7 +1810,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.7" source="1.7" 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.8" source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -1824,7 +1824,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.7" source="1.7" 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.8" source="1.8" 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=1791188&r1=1791187&r2=1791188&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Wed Apr 12 21:32:31 2017
@@ -364,7 +364,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.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="build-stub/src/main/java" destdir="build/stubclasses" deprecation="true" target="1.8" source="1.8" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
</classpath>
</javac>
@@ -462,7 +462,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.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" deprecation="true" target="1.8" source="1.8" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<fileset dir="${mcf-dist}/connector-common-lib">
<include name="axis*.jar"/>
@@ -484,7 +484,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.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="build/xsdjava" destdir="build/xsdclasses" deprecation="true" target="1.8" source="1.8" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<fileset dir="${mcf-dist}/connector-common-lib">
<include name="castor*.jar"/>
@@ -513,8 +513,8 @@
<target name="doc-rmi" depends="compile-wsdls,compile-xsds,has-RMI-check" if="hasRMI">
<mkdir dir="dist/doc"/>
- <javadoc destdir="dist/doc" source="1.7" use="true" locale="en_US">
- <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+ <javadoc destdir="dist/doc" source="1.8" use="true" locale="en_US">
+ <link href="http://docs.oracle.com/javase/8/docs/api/"/>
<link href="http://manifoldcf.apache.org/release/trunk/api/framework/"/>
<classpath>
<path refid="connector-classpath"/>
@@ -526,8 +526,8 @@
<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.7" use="true" locale="en_US">
- <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+ <javadoc destdir="dist/doc" source="1.8" use="true" locale="en_US">
+ <link href="http://docs.oracle.com/javase/8/docs/api/"/>
<link href="http://manifoldcf.apache.org/release/trunk/api/framework/"/>
<classpath>
<path refid="connector-classpath"/>
@@ -565,7 +565,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.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="server/src/main/java" destdir="build/server/classes" deprecation="true" target="1.8" source="1.8" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<pathelement location="build/interface/classes"/>
<pathelement location="build/implementation/classes"/>
@@ -577,7 +577,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.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="registry/src/main/java" destdir="build/registry/classes" deprecation="true" target="1.8" source="1.8" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<pathelement location="build/interface/classes"/>
</classpath>
@@ -586,7 +586,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.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="connector/src/main/java" destdir="build/connector/classes" deprecation="true" target="1.8" source="1.8" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<path refid="connector-classpath"/>
</classpath>
@@ -595,7 +595,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.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" deprecation="true" target="1.8" source="1.8" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<path refid="implementation-classpath"/>
</classpath>
@@ -604,7 +604,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.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="interface/src/main/java" destdir="build/interface/classes" deprecation="true" target="1.8" source="1.8" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<path refid="interface-classpath"/>
</classpath>
@@ -620,7 +620,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.7" source="1.7" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="connector/src/test/java" destdir="build/connector-tests/classes" deprecation="true" target="1.8" source="1.8" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<path refid="connector-test-classpath"/>
</classpath>
Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1791188&r1=1791187&r2=1791188&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Wed Apr 12 21:32:31 2017
@@ -172,8 +172,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<fork>true</fork>
<meminitial>128m</meminitial>
<maxmem>512m</maxmem>