Merge branch 'release'

apache · Feb 14, 2025 · 38c08e7 · 38c08e7
2 parents fc087e3 + b810c6f
commit 38c08e7
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 37 deletions.
diff --git a/commons-vfs2-ant/pom.xml b/commons-vfs2-ant/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-vfs2-project</artifactId>
-    <version>2.10.0-SNAPSHOT</version>
+    <version>2.10.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -76,7 +76,7 @@
     <!-- Hadoop jars contain overlapping packages that blow up JPMS -->
     <moditect.skip>true</moditect.skip>
     <!-- project.build.outputTimestamp is managed by Maven plugins, see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
-    <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-02-14T13:36:40Z</project.build.outputTimestamp>
   </properties>
 
   <build>

diff --git a/commons-vfs2-bom/pom.xml b/commons-vfs2-bom/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-vfs2-project</artifactId>
-    <version>2.10.0-SNAPSHOT</version>
+    <version>2.10.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>commons-vfs2-bom</artifactId>
@@ -33,39 +33,39 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-vfs2</artifactId>
-        <version>2.10.0-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-vfs2-examples</artifactId>
-        <version>2.10.0-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-vfs2-ant</artifactId>
-        <version>2.10.0-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-vfs2-hdfs</artifactId>
-        <version>2.10.0-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-vfs2-jackrabbit1</artifactId>
-        <version>2.10.0-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-vfs2-jackrabbit2</artifactId>
-        <version>2.10.0-SNAPSHOT</version>
+        <version>2.10.1-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
   <properties>
     <commons.parent.dir>${basedir}/..</commons.parent.dir>
 	<checkstyle.skip>true</checkstyle.skip>
     <!-- project.build.outputTimestamp is managed by Maven plugins, see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
-    <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-02-14T13:36:40Z</project.build.outputTimestamp>
   </properties>
 </project>
diff --git a/commons-vfs2-distribution/pom.xml b/commons-vfs2-distribution/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-vfs2-project</artifactId>
-    <version>2.10.0-SNAPSHOT</version>
+    <version>2.10.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -38,7 +38,7 @@ limitations under the License.
     <commons.parent.dir>${basedir}/..</commons.parent.dir>
     <commons.release.isDistModule>true</commons.release.isDistModule>
     <!-- project.build.outputTimestamp is managed by Maven plugins, see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
-    <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-02-14T13:36:40Z</project.build.outputTimestamp>
   </properties>
 
   <profiles>

diff --git a/commons-vfs2-examples/pom.xml b/commons-vfs2-examples/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-vfs2-project</artifactId>
-    <version>2.10.0-SNAPSHOT</version>
+    <version>2.10.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -63,7 +63,7 @@
         *
     </commons.osgi.import>
     <!-- project.build.outputTimestamp is managed by Maven plugins, see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
-    <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-02-14T13:36:40Z</project.build.outputTimestamp>
   </properties>
 
   <build>

diff --git a/commons-vfs2-hdfs/pom.xml b/commons-vfs2-hdfs/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-vfs2-project</artifactId>
-    <version>2.10.0-SNAPSHOT</version>
+    <version>2.10.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -116,7 +116,7 @@
     </commons.osgi.import>
     <!-- Hadoop jars contain overlapping packages that blow up JPMS -->
     <moditect.skip>true</moditect.skip>
-    <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-02-14T13:36:40Z</project.build.outputTimestamp>
   </properties>
 
   <build>

diff --git a/commons-vfs2-jackrabbit1/pom.xml b/commons-vfs2-jackrabbit1/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-vfs2-project</artifactId>
-    <version>2.10.0-SNAPSHOT</version>
+    <version>2.10.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -127,7 +127,7 @@
         *
     </commons.osgi.import>
     <!-- project.build.outputTimestamp is managed by Maven plugins, see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
-    <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-02-14T13:36:40Z</project.build.outputTimestamp>
   </properties>
 
   <build>

diff --git a/commons-vfs2-jackrabbit2/pom.xml b/commons-vfs2-jackrabbit2/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-vfs2-project</artifactId>
-    <version>2.10.0-SNAPSHOT</version>
+    <version>2.10.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -113,7 +113,7 @@
         *
     </commons.osgi.import>
     <!-- project.build.outputTimestamp is managed by Maven plugins, see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
-    <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-02-14T13:36:40Z</project.build.outputTimestamp>
   </properties>
 
   <build>

diff --git a/commons-vfs2-sandbox/pom.xml b/commons-vfs2-sandbox/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-vfs2-project</artifactId>
-    <version>2.10.0-SNAPSHOT</version>
+    <version>2.10.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/commons-vfs2/pom.xml b/commons-vfs2/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-vfs2-project</artifactId>
-    <version>2.10.0-SNAPSHOT</version>
+    <version>2.10.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>
@@ -156,13 +156,12 @@
         org.apache.hc.client5.http.*;resolution:=optional,
         *
     </commons.osgi.import>
-    <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-02-14T13:36:40Z</project.build.outputTimestamp>
   </properties>
 
   <build>
     <pluginManagement>
       <plugins>
-
       </plugins>
     </pluginManagement>
     <resources>

diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
@@ -235,7 +235,7 @@ public String getExtension() {
     /**
      * Returns the URI without a password.
      *
-     * @return Returns the URI without a password.
+     * @return the URI without a password.
      */
     @Override
     public String getFriendlyURI() {

diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
@@ -1890,7 +1890,7 @@ public boolean setWritable(final boolean readable, final boolean ownerOnly) thro
     /**
      * Returns the URI as a String.
      *
-     * @return Returns the URI as a String.
+     * @return the URI as a String.
      */
     @Override
     public String toString() {

diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java
@@ -124,7 +124,7 @@ public boolean equals(final Object o) {
     }
 
     /**
-     * @return Returns the children.
+     * @return the children.
      */
     Collection<RamFileData> getChildren() {
         if (name == null) {
@@ -134,28 +134,28 @@ Collection<RamFileData> getChildren() {
     }
 
     /**
-     * @return Returns the buffer.
+     * @return the buffer.
      */
     byte[] getContent() {
         return content;
     }
 
     /**
-     * @return Returns the lastModified.
+     * @return the lastModified.
      */
     long getLastModified() {
         return lastModifiedMillis;
     }
 
     /**
-     * @return Returns the name.
+     * @return the name.
      */
     FileName getName() {
         return name;
     }
 
     /**
-     * @return Returns the type.
+     * @return the type.
      */
     FileType getType() {
         return type;
@@ -234,7 +234,7 @@ void setType(final FileType type) {
     }
 
     /**
-     * @return Returns the size of the buffer
+     * @return the size of the buffer
      */
     int size() {
         return content.length;

diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileObject.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileObject.java
@@ -203,7 +203,7 @@ protected void endOutput() throws Exception {
     }
 
     /**
-     * @return Returns the data.
+     * @return the data.
      */
     RamFileData getData() {
         return data;
@@ -248,7 +248,7 @@ void setData(final RamFileData data) {
     }
 
     /**
-     * @return Returns the size of the {@link RamFileData}.
+     * @return the size of the {@link RamFileData}.
      */
     int size() {
         return data == null ? 0 : data.size();

diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileSystem.java
@@ -208,7 +208,7 @@ void save(final RamFileObject file) throws FileSystemException {
     }
 
     /**
-     * @return Returns the size of the FileSystem
+     * @return the size of the FileSystem
      */
     long size() {
         synchronized (cache) {

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
   <name>Apache Commons VFS Project</name>
   <description>Apache Commons VFS is a Virtual File System library.</description>
   <packaging>pom</packaging>
-  <version>2.10.0-SNAPSHOT</version>
+  <version>2.10.1-SNAPSHOT</version>
 
   <url>https://commons.apache.org/proper/commons-vfs/</url>
   <inceptionYear>2002</inceptionYear>
@@ -114,7 +114,7 @@
     <japicmp.skip>false</japicmp.skip>
     <jacoco.skip>false</jacoco.skip>
     <!-- project.build.outputTimestamp is managed by Maven plugins, see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
-    <project.build.outputTimestamp>2025-02-01T21:47:58Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-02-14T13:36:40Z</project.build.outputTimestamp>
   </properties>
 
   <build>