Merge 5732bddf17 into 6546134471

Allow customization  ‘dataFilePattern’

build-release.xml

@@ -655,7 +655,7 @@
         </generate-tagsdoc>
     </target>
 
-  <target name="define-cyclonedx-components">
+  <target name="define-cyclonedx-components" if="jdk9+">
     <ivy:cachepath organisation="org.apache.ant"
                    module="ant-cyclonedx"
                    revision="${ant-cyclonedx.version}"
@@ -744,7 +744,7 @@
     </cdx:externalreferenceset>
   </target>
 
-  <target name="jar-sbom" depends="define-cyclonedx-components,jar">
+  <target name="jar-sbom" depends="define-cyclonedx-components,jar" if="jdk9+">
     <cdx:componentbom
         bomName="ivy-${build.version}.cdx"
         outputdirectory="${artifacts.build.dir}/jars"
@@ -937,7 +937,9 @@
     </cdx:componentbom>
   </target>
 
-  <target name="prepare-distribution-sboms" depends="define-cyclonedx-components">
+  <target name="prepare-distribution-sboms"
+          depends="define-cyclonedx-components"
+          if="jdk9+">
     <macrodef name="create-tarball-bom">
       <attribute name="binsrc"/>
       <attribute name="binarysource"/>
@@ -1010,12 +1012,14 @@
   </target>
 
   <target name="src-tarball-sboms"
-          depends="snapshot-src,prepare-distribution-sboms">
+          depends="snapshot-src,prepare-distribution-sboms"
+          if="jdk9+">
     <create-tarball-boms binsrc="src" binarysource="Source Distribution"/>
   </target>
 
   <target name="bin-tarball-sboms"
-          depends="snapshot-bin,prepare-distribution-sboms">
+          depends="snapshot-bin,prepare-distribution-sboms"
+          if="jdk9+">
     <create-tarball-boms binsrc="bin"
                          binarysource="Binary Distribution">
       <component>

build.xml

@@ -24,6 +24,10 @@
 
     <property name="final.name" value="ivy.jar"/>
 
+    <condition property="jdk9+">
+      <javaversion atleast="9"/>
+    </condition>
+
     <target name="init-ivy-user-home" unless="ivy.use.local.home">
         <condition property="ivy.home" value="${env.IVY_HOME}">
             <isset property="env.IVY_HOME"/>

ivy.xml

@@ -52,7 +52,7 @@
                     conf="default,pack200->default,optional">
           <exclude org="com.github.luben"/>
           <exclude org="org.brotli"/>
-          <exclude org="org.tikaani"/>
+          <exclude org="org.tukaani"/>
         </dependency>
         <dependency org="org.apache.commons" name="commons-vfs2" rev="${commons-vfs2.version}" conf="default,vfs"/>
         <dependency org="oro" name="oro" rev="${oro.version}" conf="default,oro"/>

src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java

@@ -110,7 +110,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv
 
     private String ivyPattern;
 
-    private String dataFilePattern = DEFAULT_DATA_FILE_PATTERN;
+    private String dataFilePattern;
 
     private String artifactPattern;
 
@@ -223,6 +223,16 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv
     }
 
     public String getDataFilePattern() {
+        
+         if (dataFilePattern == null) {
+            if (settings != null) {
+                dataFilePattern = settings.getVariable("ivy.cache.ivydata.pattern");
+            }
+            if (dataFilePattern == null) {
+                dataFilePattern = DEFAULT_DATA_FILE_PATTERN;
+            }
+        }
+        
         return dataFilePattern;
     }