Author: kwright
Date: Thu Sep 28 05:29:48 2023
New Revision: 1912569
URL: http://svn.apache.org/viewvc?rev=1912569&view=rev
Log:
Finish requiring Java 11 everywhere - pr 150
Modified:
manifoldcf/trunk/DEPENDENCIES.txt
manifoldcf/trunk/README.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/dist-license/DEPENDENCIES.txt
manifoldcf/trunk/framework/build.xml
manifoldcf/trunk/framework/buildfiles/connector-build.xml
manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperBase.java
manifoldcf/trunk/pom.xml
Modified: manifoldcf/trunk/DEPENDENCIES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/DEPENDENCIES.txt?rev=1912569&r1=1912568&r2=1912569&view=diff
==============================================================================
--- manifoldcf/trunk/DEPENDENCIES.txt (original)
+++ manifoldcf/trunk/DEPENDENCIES.txt Thu Sep 28 05:29:48 2023
@@ -1,8 +1,8 @@
ManifoldCF requires
------------------
-* JRE 1.8 or above
+* JRE 11 or above
* SVN client, version 1.7 or above
-* Apache Ant, version 1.7 or above
+* Apache Ant, version 1.10 or above
* Apache Forrest, version 0.9-dev or above
* Many other libraries, available from the ManifoldCF XXX-lib distribution, or
by running
the "make-core-deps" ant target
Modified: manifoldcf/trunk/README.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/README.txt?rev=1912569&r1=1912568&r2=1912569&view=diff
==============================================================================
--- manifoldcf/trunk/README.txt (original)
+++ manifoldcf/trunk/README.txt Thu Sep 28 05:29:48 2023
@@ -32,12 +32,12 @@ Instructions for Building Apache Manifol
3. Copy the lib folder in the lib distribution into the source distribution.
-4. Download the Java SE 8 JDK (Java Development Kit), or greater, from
http://www.oracle.com/technetwork/java/index.html.
+4. Download the Java SE 11 JDK (Java Development Kit), or greater, from
http://www.oracle.com/technetwork/java/index.html.
You will need the JDK installed, and the %JAVA_HOME%\bin directory included
on your command path. To test this, issue a "java -version" command from
your
- shell and verify that the Java version is 1.8 or greater.
+ shell and verify that the Java version is 11 or greater.
-5. Download the Apache Ant binary distribution (1.7.0 or greater) from
http://ant.apache.org.
+5. Download the Apache Ant binary distribution (1.10.0 or greater) from
http://ant.apache.org.
You will need Ant installed and the %ANT_HOME%\bin directory included on
your
command path. To test this, issue a "ant -version" command from your
shell and verify that Ant is available.
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1912569&r1=1912568&r2=1912569&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Thu Sep 28 05:29:48 2023
@@ -36,7 +36,9 @@
<property name="httpmime.version" value="4.5.13"/>
<property name="httpcore.version" value="4.4.15"/>
<property name="xerces.version" value="2.12.2"/>
- <property name="zookeeper.version" value="3.5.6"/>
+ <property name="zookeeper.version" value="3.8.0"/>
+ <property name="metrics-core.version" value="4.1.12.1"/>
+ <property name="snappy-java.version" value="1.1.7.7"/>
<property name="mongodb.version" value="2.14.3"/>
<property name="postgresql.version" value="42.1.3"/>
<property name="axis.version" value="1.4"/>
@@ -2210,7 +2212,7 @@ Use Apache Forrest version forrest-0.9-d
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="org/xerial/snappy"/>
- <param name="artifact-version" value="1.1.2"/>
+ <param name="artifact-version" value="${snappy-java.version}"/>
<param name="artifact-name" value="snappy-java"/>
<param name="artifact-type" value="jar"/>
</antcall>
@@ -2504,6 +2506,13 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-name" value="zookeeper-jute"/>
<param name="artifact-type" value="jar"/>
</antcall>
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="io/dropwizard/metrics"/>
+ <param name="artifact-name" value="metrics-core"/>
+ <param name="artifact-version" value="${metrics-core.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-commons-exec">
Modified: manifoldcf/trunk/dist-license/DEPENDENCIES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/dist-license/DEPENDENCIES.txt?rev=1912569&r1=1912568&r2=1912569&view=diff
==============================================================================
--- manifoldcf/trunk/dist-license/DEPENDENCIES.txt (original)
+++ manifoldcf/trunk/dist-license/DEPENDENCIES.txt Thu Sep 28 05:29:48 2023
@@ -1,6 +1,6 @@
ManifoldCF requires
------------------
-* JRE 1.8 or above
+* JRE 11 or above
* Many other libraries, available from the ManifoldCF XXX-lib distribution
For running ManifoldCF:
Modified: manifoldcf/trunk/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1912569&r1=1912568&r2=1912569&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Thu Sep 28 05:29:48 2023
@@ -43,6 +43,8 @@
<path id="framework-classpath">
<fileset dir="../lib">
<include name="zookeeper*.jar"/>
+ <include name="metrics-core*.jar" />
+ <include name="snappy-java*.jar" />
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections-*.jar"/>
@@ -237,7 +239,7 @@
<target name="doc">
<mkdir dir="dist/doc"/>
- <javadoc destdir="dist/doc" maxmemory="256M" source="1.8"
useexternalfile="true" use="true" locale="en_US">
+ <javadoc destdir="dist/doc" maxmemory="256M" source="11"
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>
@@ -256,7 +258,7 @@
<target name="compile-less-compiler">
<mkdir dir="build/less-compiler/classes"/>
- <javac srcdir="less-compiler/src/main/java"
destdir="build/less-compiler/classes" deprecation="true" target="1.8"
source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="less-compiler/src/main/java"
destdir="build/less-compiler/classes" deprecation="true" target="11"
source="11" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="less-classpath"/>
</classpath>
@@ -265,7 +267,7 @@
<target name="compile-core">
<mkdir dir="build/core/classes"/>
- <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">
+ <javac srcdir="core/src/main/java" destdir="build/core/classes"
deprecation="true" target="11" source="11" debug="true" encoding="utf-8"
debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
</classpath>
@@ -274,18 +276,17 @@
<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.8" source="1.8" debug="true" encoding="utf-8"
debuglevel="lines,vars,source">
+ <javac srcdir="ui-core/src/main/java" destdir="build/ui-core/classes"
deprecation="true" target="11" source="11" debug="true" encoding="utf-8"
debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
</classpath>
</javac>
- <native2ascii encoding="UTF-8" src="ui-core/src/main/native2ascii"
dest="build/ui-core/classes" includes="**/*.properties" />
</target>
<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.8" source="1.8" debug="true" encoding="utf-8"
debuglevel="lines,vars,source">
+ <javac srcdir="agents/src/main/java" destdir="build/agents/classes"
deprecation="true" target="11" source="11" debug="true" encoding="utf-8"
debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -298,7 +299,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.8"
source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="connector-common/src/main/java"
destdir="build/connector-common/classes" deprecation="true" target="11"
source="11" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<path refid="connector-common-classpath"/>
@@ -311,7 +312,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.8" source="1.8"
debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="pull-agent/src/main/java"
destdir="build/pull-agent/classes" deprecation="true" target="11" source="11"
debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -322,7 +323,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.8"
source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="jetty-runner/src/main/java"
destdir="build/jetty-runner/classes" deprecation="true" target="11" source="11"
debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -334,7 +335,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.8"
source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="script-engine/src/main/java"
destdir="build/script-engine/classes" deprecation="true" target="11"
source="11" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -344,7 +345,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.8"
source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="authority-servlet/src/main/java"
destdir="build/authority-servlet/classes" deprecation="true" target="11"
source="11" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -356,7 +357,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.8"
source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="authority-service/src/main/java"
destdir="build/authority-service/classes" deprecation="true" target="11"
source="11" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -369,7 +370,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.8"
source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="api-servlet/src/main/java"
destdir="build/api-servlet/classes" deprecation="true" target="11" source="11"
debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -382,7 +383,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.8"
source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="api-service/src/main/java"
destdir="build/api-service/classes" deprecation="true" target="11" source="11"
debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -396,7 +397,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.8"
source="1.8" encoding="utf-8" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="combined-service/src/main/java"
destdir="build/combined-service/classes" deprecation="true" target="11"
source="11" encoding="utf-8" debug="true" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -425,7 +426,7 @@
<target name="compile-crawler-ui"
depends="less-compiler-invocation,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.8" source="1.8"
debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="crawler-ui/src/main/java"
destdir="build/crawler-ui/classes" deprecation="true" target="11" source="11"
debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -451,7 +452,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.8" source="1.8"
debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="build/crawler-ui/java"
destdir="build/crawler-ui/classes" deprecation="true" target="11" source="11"
debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath id="classpath">
<pathelement location="${java.home}/../lib/tools.jar"/>
<path refid="framework-classpath"/>
@@ -1976,7 +1977,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.8" source="1.8" debug="true" encoding="utf-8"
debuglevel="lines,vars,source">
+ <javac srcdir="core/src/test/java" destdir="build/core-tests/classes"
deprecation="true" target="11" source="11" debug="true" encoding="utf-8"
debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -1986,7 +1987,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.8"
source="1.8" 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="11"
source="11" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -1998,7 +1999,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.8"
source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <javac srcdir="agents/src/test/java"
destdir="build/agents-tests/classes" deprecation="true" target="11" source="11"
debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -2010,7 +2011,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.8"
source="1.8" 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="11"
source="11" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
<path refid="framework-classpath"/>
<pathelement location="build/core/classes"/>
@@ -2024,7 +2025,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.8"
source="1.8" 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="11"
source="11" 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=1912569&r1=1912568&r2=1912569&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Thu Sep 28
05:29:48 2023
@@ -376,7 +376,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.8" source="1.8" debug="true"
debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="build-stub/src/main/java" destdir="build/stubclasses"
deprecation="true" target="11" source="11" debug="true"
debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
</classpath>
</javac>
@@ -550,7 +550,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.8" source="1.8" debug="true"
debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="build/wsdljava" destdir="build/wsdlclasses"
deprecation="true" target="11" source="11" debug="true"
debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<!-- JDK 11 requirements -->
<fileset dir="${mcf-dist}/connector-common-lib">
@@ -581,7 +581,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.8" source="1.8" debug="true"
debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="build/xsdjava" destdir="build/xsdclasses"
deprecation="true" target="11" source="11" debug="true"
debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<fileset dir="${mcf-dist}/connector-common-lib">
<include name="castor*.jar"/>
@@ -610,7 +610,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.8" use="true" locale="en_US">
+ <javadoc destdir="dist/doc" source="11" 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>
@@ -623,7 +623,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.8" use="true" locale="en_US">
+ <javadoc destdir="dist/doc" source="11" 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>
@@ -662,7 +662,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.8" source="1.8" debug="true"
debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="server/src/main/java" destdir="build/server/classes"
deprecation="true" target="11" source="11" debug="true"
debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<pathelement location="build/interface/classes"/>
<pathelement location="build/implementation/classes"/>
@@ -674,7 +674,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.8" source="1.8"
debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="registry/src/main/java"
destdir="build/registry/classes" deprecation="true" target="11" source="11"
debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<pathelement location="build/interface/classes"/>
</classpath>
@@ -683,7 +683,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.8" source="1.8"
debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="connector/src/main/java"
destdir="build/connector/classes" deprecation="true" target="11" source="11"
debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<path refid="connector-classpath"/>
</classpath>
@@ -692,7 +692,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.8"
source="1.8" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="implementation/src/main/java"
destdir="build/implementation/classes" deprecation="true" target="11"
source="11" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<path refid="implementation-classpath"/>
</classpath>
@@ -701,7 +701,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.8" source="1.8"
debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="interface/src/main/java"
destdir="build/interface/classes" deprecation="true" target="11" source="11"
debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<path refid="interface-classpath"/>
</classpath>
@@ -717,7 +717,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.8"
source="1.8" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
+ <javac srcdir="connector/src/test/java"
destdir="build/connector-tests/classes" deprecation="true" target="11"
source="11" debug="true" debuglevel="lines,vars,source" encoding="UTF-8">
<classpath>
<path refid="connector-test-classpath"/>
</classpath>
Modified:
manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperBase.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperBase.java?rev=1912569&r1=1912568&r2=1912569&view=diff
==============================================================================
---
manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperBase.java
(original)
+++
manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperBase.java
Thu Sep 28 05:29:48 2023
@@ -25,11 +25,11 @@ import static org.junit.Assert.*;
public class ZooKeeperBase
{
- protected File tempDir;
- protected ZooKeeperInstance instance;
+ static protected File tempDir;
+ static protected ZooKeeperInstance instance;
- @Before
- public void startZooKeeper()
+ @BeforeClass
+ public static void startZooKeeper()
throws Exception
{
tempDir = new File("zookeeper");
@@ -38,8 +38,8 @@ public class ZooKeeperBase
instance.start();
}
- @After
- public void stopZookeeper()
+ @AfterClass
+ public static void stopZookeeper()
throws Exception
{
instance.stop();
Modified: manifoldcf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1912569&r1=1912568&r2=1912569&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Thu Sep 28 05:29:48 2023
@@ -173,14 +173,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.11.0</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
<fork>true</fork>
<meminitial>128m</meminitial>
- <maxmem>512m</maxmem>
- </configuration>
+ <maxmem>512m</maxmem> </configuration>
</plugin>
<plugin>
