This is an automated email from the ASF dual-hosted git repository.
OpenPj pushed a commit to branch CONNECTORS-1784
in repository https://gitbox.apache.org/repos/asf/manifoldcf.git
The following commit(s) were added to refs/heads/CONNECTORS-1784 by this push:
new e36184f2c aligned the Ant build CONNECTORS-1784
e36184f2c is described below
commit e36184f2c6116a7994f557f642642b0f891132b8
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Mon May 25 18:43:21 2026 +0200
aligned the Ant build CONNECTORS-1784
---
build.xml | 48 +++++++++++++++++++++-----------
common-build.xml | 6 ++++
connectors/cmis/build.xml | 4 +--
connectors/solr/build.xml | 2 +-
framework/build.xml | 2 --
framework/buildfiles/connector-build.xml | 6 ++++
6 files changed, 46 insertions(+), 22 deletions(-)
diff --git a/build.xml b/build.xml
index 3f5935317..0df93b686 100644
--- a/build.xml
+++ b/build.xml
@@ -17,10 +17,6 @@
<project name="manifoldcf" default="help">
- <presetdef name="javac">
- <javac includeantruntime="false" />
- </presetdef>
-
<import file="site-options.xml" optional="true"/>
<import file="common-build.xml"/>
@@ -31,7 +27,7 @@
<property name="javax-activation.version" value="1.2.0"/>
<property name="hsqldb.version" value="2.6.1"/>
- <property name="jetty.version" value="12.0.10"/>
+ <property name="jetty.version" value="12.1.8"/>
<property name="httpclient.version" value="4.5.13"/>
<property name="httpmime.version" value="4.5.13"/>
<property name="httpcore.version" value="4.4.15"/>
@@ -58,7 +54,7 @@
<property name="commons-logging.version" value="1.2"/>
<property name="commons-configuration.version" value="1.6"/>
<property name="commons-cli.version" value="1.2"/>
- <property name="slf4j.version" value="1.7.36"/>
+ <property name="slf4j.version" value="2.0.13"/>
<property name="xalan.version" value="2.7.1"/>
<property name="poi.version" value="4.1.2"/>
<property name="avalon.version" value="4.3.1"/>
@@ -98,7 +94,7 @@
<property name="selenium.version" value="4.21.0"/>
<property name="hamcrest.version" value="1.3"/>
<property name="log4j12.version" value="1.2.17"/>
- <property name="log4j.version" value="2.17.2"/>
+ <property name="log4j.version" value="2.25.4"/>
<property name="mail.version" value="2.1.3"/>
<property name="mimepull.version" value="1.9.11"/>
<property name="opensaml.version" value="1.1"/>
@@ -133,7 +129,7 @@
<property name="jetty-schemas.version" value="5.0"/>
<property name="alfresco-indexer.version" value="0.8.1"/>
<property name="gson.version" value="2.8.0"/>
- <property name="guava.version" value="25.1-jre"/>
+ <property name="guava.version" value="21.0"/>
<property name="mockito.version" value="5.20.0"/>
<property name="bytebuddy.version" value="1.17.7"/>
<property name="wiremock.version" value="3.13.1"/>
@@ -1419,10 +1415,6 @@ Use Apache Forrest version forrest-0.9-dev or higher.
<param name="artifact-name" value="slf4j-api"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${slf4j-package}"/><param name="artifact-version"
value="${slf4j.version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="slf4j-simple"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
<antcall target="download-via-maven"><param name="project-path"
value="${slf4j-package}"/><param name="artifact-version"
value="${slf4j.version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jcl-over-slf4j"/>
<param name="artifact-type" value="jar"/>
@@ -1439,6 +1431,7 @@ Use Apache Forrest version forrest-0.9-dev or higher.
<property name="jetty-ee10-package" value="org/eclipse/jetty/ee10"/>
<property name="jetty-ee-package" value="org/eclipse/jetty/ee"/>
<property name="jetty-http2-package" value="org/eclipse/jetty/http2"/>
+ <property name="jetty-compression-package"
value="org/eclipse/jetty/compression"/>
<antcall target="download-via-maven"><param name="project-path"
value="${jetty-ee10-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jetty-ee10-apache-jsp"/>
<param name="artifact-type" value="jar"/>
@@ -1447,10 +1440,6 @@ Use Apache Forrest version forrest-0.9-dev or higher.
<param name="artifact-name" value="jetty-ee-webapp"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-maven"><param name="project-path"
value="${jetty-ee-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
- <param name="artifact-name" value="jetty-ee-core"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
<antcall target="download-via-maven"><param name="project-path"
value="${jetty-ee10-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jetty-ee10-glassfish-jstl"/>
<param name="artifact-type" value="jar"/>
@@ -1521,7 +1510,11 @@ Use Apache Forrest version forrest-0.9-dev or higher.
<param name="artifact-name" value="jetty-jndi"/>
<param name="artifact-type" value="jar"/>
</antcall>
-
+ <antcall target="download-via-maven"><param name="project-path"
value="${jetty-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="jetty-annotations"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+
<!-- EE10 support for Jetty 12 -->
<antcall target="download-via-maven"><param name="project-path"
value="${jetty-ee10-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jetty-ee10-webapp"/>
@@ -1548,6 +1541,15 @@ Use Apache Forrest version forrest-0.9-dev or higher.
<param name="artifact-type" value="jar"/>
</antcall>
+ <antcall target="download-via-maven"><param name="project-path"
value="${jetty-compression-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="jetty-compression-gzip"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="project-path"
value="${jetty-compression-package}"/><param name="artifact-version"
value="${jetty.version}"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="jetty-compression-common"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+
<antcall target="download-via-maven"><param name="project-path"
value="${jetty-package}/toolchain"/><param name="artifact-version"
value="${jetty-jsp-jdt.version}"/><param name="target" value="lib"/>
<param name="artifact-name" value="jetty-jsp-jdt"/>
<param name="artifact-type" value="jar"/>
@@ -2110,6 +2112,18 @@ Use Apache Forrest version forrest-0.9-dev or higher.
<param name="artifact-name" value="log4j-1.2-api"/>
<param name="artifact-type" value="jar"/>
</antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/logging/log4j"/>
+ <param name="artifact-version" value="${log4j.version}"/>
+ <param name="artifact-name" value="log4j-slf4j2-impl"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/logging/log4j"/>
+ <param name="artifact-version" value="${log4j.version}"/>
+ <param name="artifact-name" value="log4j-jcl"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-mail">
diff --git a/common-build.xml b/common-build.xml
index 89b66df8b..f05820f82 100644
--- a/common-build.xml
+++ b/common-build.xml
@@ -17,6 +17,12 @@
<project name="mcf-common-build">
+ <presetdef name="javac">
+ <javac includeantruntime="false" target="25" source="25">
+ <compilerarg value="--enable-preview"/>
+ </javac>
+ </presetdef>
+
<target name="setup-maven-url">
<property name="maven-base-url"
value="https://repo1.maven.org/maven2"/>
</target>
diff --git a/connectors/cmis/build.xml b/connectors/cmis/build.xml
index 3cb4c29cd..1bfc0419f 100644
--- a/connectors/cmis/build.xml
+++ b/connectors/cmis/build.xml
@@ -33,8 +33,8 @@
<property name="chemistry.version" value="1.1.0"/>
<property name="chemistry.jaxws.version" value="2.3.1"/>
<property name="chemistry.activation.version" value="1.1.1"/>
- <property name="chemistry.log4j.version" value="2.17.2"/>
- <property name="chemistry.cxf.version" value="3.5.2"/>
+ <property name="chemistry.log4j.version" value="2.25.4"/>
+ <property name="chemistry.cxf.version" value="3.5.9"/>
<target name="download-dependencies">
<property name="chemistry-package"
value="org/apache/chemistry/opencmis"/>
diff --git a/connectors/solr/build.xml b/connectors/solr/build.xml
index b321fc6a7..7e5e4aff8 100644
--- a/connectors/solr/build.xml
+++ b/connectors/solr/build.xml
@@ -30,7 +30,7 @@
<import file="${mcf-dist}/connector-build.xml"/>
- <property name="jetty.version" value="12.0.10"/>
+ <property name="jetty.version" value="12.1.8"/>
<path id="connector-classpath">
<path refid="mcf-connector-build.connector-classpath"/>
diff --git a/framework/build.xml b/framework/build.xml
index cc861c9a8..6fe069d61 100644
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -1443,7 +1443,6 @@
<include name="zookeeper*.jar"/>
<include name="netty-handler*.jar"/>
<include name="slf4j-api*.jar"/>
- <include name="slf4j-simple*.jar"/>
<include name="log4j-1.2.*.jar"/>
</fileset>
</path>
@@ -1475,7 +1474,6 @@
<include name="ecj-*.jar"/> <include name="ecj*.jar"/>
<include name="velocity*.jar"/>
<include name="slf4j-api*.jar"/>
- <include name="slf4j-simple*.jar"/>
<include name="httpcore*.jar"/>
<include name="httpclient*.jar"/>
<include name="httpmime*.jar"/>
diff --git a/framework/buildfiles/connector-build.xml
b/framework/buildfiles/connector-build.xml
index 17674ad67..1dd2f9106 100644
--- a/framework/buildfiles/connector-build.xml
+++ b/framework/buildfiles/connector-build.xml
@@ -17,6 +17,12 @@
<project name="mcf-connector-build">
+ <presetdef name="javac">
+ <javac includeantruntime="false" target="25" source="25">
+ <compilerarg value="--enable-preview"/>
+ </javac>
+ </presetdef>
+
<property environment="env"/>
<target name="setup-maven-url">
