This is an automated email from the ASF dual-hosted git repository.
piergiorgio pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/manifoldcf.git
The following commit(s) were added to refs/heads/trunk by this push:
new 56348f761 CONNECTORS-1772: Error with Windows repository
56348f761 is described below
commit 56348f761e5f80993fc3ac5353625f2a3d1798fb
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Mon May 12 13:02:36 2025 +0200
CONNECTORS-1772: Error with Windows repository
---
CHANGES.txt | 3 +++
build.xml | 26 +++++++++++++-------------
connectors/jcifs/build.xml | 6 +-----
connectors/jcifs/pom.xml | 2 +-
framework/build.xml | 7 +++++++
5 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index ba9eb8857..a5c0711a6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,9 @@ ManifoldCF Change Log
CONNECTORS-1775: The 'exclude buckets' option in the Amazon S3 repository
connector does not work
(Mingchun Zhao)
+CONNECTORS-1772: Error with Windows repository
+(Mario Bisonti, Piergiorgio Lucidi)
+
======================= Release 2.28 =========================
CONNECTORS-1765: Fixing vulnerabilities in MCF
diff --git a/build.xml b/build.xml
index b5a8fa90a..c551c02c4 100644
--- a/build.xml
+++ b/build.xml
@@ -140,7 +140,7 @@
<property name="aspectjrt.version" value="1.8.6"/>
<property name="jhighlight.version" value="1.0.3"/>
<property name="xmlbeans.version" value="3.1.0"/>
- <property name="bc.version" value="1.70"/>
+ <property name="bc18.version" value="1.79"/>
<property name="SparseBitSet.version" value="1.2"/>
<property name="HikariCP-java7.version" value="2.4.13"/>
<property name="tukaani.version" value="1.9"/>
@@ -3060,28 +3060,28 @@ Use Apache Forrest version forrest-0.9-dev or higher.
<param name="artifact-version" value="${xmlbeans.version}"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <antcall target="download-via-maven"><param name="target"
value="lib"/>
<param name="project-path" value="org/bouncycastle"/>
- <param name="artifact-name" value="bcmail-jdk15on"/>
- <param name="artifact-version" value="${bc.version}"/>
+ <param name="artifact-name" value="bcmail-jdk18on"/>
+ <param name="artifact-version" value="${bc18.version}"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <antcall target="download-via-maven"><param name="target"
value="lib"/>
<param name="project-path" value="org/bouncycastle"/>
- <param name="artifact-name" value="bcutil-jdk15on"/>
- <param name="artifact-version" value="${bc.version}"/>
+ <param name="artifact-name" value="bcutil-jdk18on"/>
+ <param name="artifact-version" value="${bc18.version}"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <antcall target="download-via-maven"><param name="target"
value="lib"/>
<param name="project-path" value="org/bouncycastle"/>
- <param name="artifact-name" value="bcprov-jdk15on"/>
- <param name="artifact-version" value="${bc.version}"/>
+ <param name="artifact-name" value="bcprov-jdk18on"/>
+ <param name="artifact-version" value="${bc18.version}"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <antcall target="download-via-maven"><param name="target"
value="lib"/>
<param name="project-path" value="org/bouncycastle"/>
- <param name="artifact-name" value="bcpkix-jdk15on"/>
- <param name="artifact-version" value="${bc.version}"/>
+ <param name="artifact-name" value="bcpkix-jdk18on"/>
+ <param name="artifact-version" value="${bc18.version}"/>
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
diff --git a/connectors/jcifs/build.xml b/connectors/jcifs/build.xml
index 376097d14..b5d51e661 100644
--- a/connectors/jcifs/build.xml
+++ b/connectors/jcifs/build.xml
@@ -30,11 +30,7 @@
<import file="${mcf-dist}/connector-build.xml"/>
- <property name="jcifs-ng.version" value="2.1.2"/>
-
- <!--groupId>eu.agno3.jcifs</groupId>
- <artifactId>jcifs-ng</artifactId>
- <version>2.1.2</version/-->
+ <property name="jcifs-ng.version" value="2.1.10"/>
<target name="calculate-condition">
<available file="lib-proprietary/jcifs-ng-${jcifs-ng.version}.jar"
property="jcifsStatus"/>
diff --git a/connectors/jcifs/pom.xml b/connectors/jcifs/pom.xml
index 13e05c4b6..16887d8d7 100644
--- a/connectors/jcifs/pom.xml
+++ b/connectors/jcifs/pom.xml
@@ -206,7 +206,7 @@
<dependency>
<groupId>eu.agno3.jcifs</groupId>
<artifactId>jcifs-ng</artifactId>
- <version>2.1.2</version>
+ <version>2.1.10</version>
</dependency>
<!-- Testing dependencies -->
diff --git a/framework/build.xml b/framework/build.xml
index 5ea92cfc3..1a806b5ab 100644
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -162,10 +162,17 @@
<include name="jempbox*.jar"/>
<include name="xmpbox*.jar"/>
<include name="preflight*.jar"/>
+ <!--
<include name="bcmail-jdk15on*.jar"/>
<include name="bcutil-jdk15on*.jar"/>
<include name="bcprov-jdk15on*.jar"/>
<include name="bcpkix-jdk15on*.jar"/>
+ -->
+ <include name="bcmail-jdk18on*.jar"/>
+ <include name="bcutil-jdk18on*.jar"/>
+ <include name="bcprov-jdk18on*.jar"/>
+ <include name="bcpkix-jdk18on*.jar"/>
+
<include name="SparseBitSet*.jar"/>
<include name="HikariCP-java7*.jar"/>
<include name="geronimo-stax-api_1.0_spec*.jar"/>
