This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new 4a456a4a Split out Apache Ant Tasks into its own Maven module
commons-vfs2-ant
4a456a4a is described below
commit 4a456a4a7ff8c534e1758b6e5cc18e33b4c03cef
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Jan 7 14:43:52 2024 -0500
Split out Apache Ant Tasks into its own Maven module commons-vfs2-ant
---
{commons-vfs2-hdfs => commons-vfs2-ant}/pom.xml | 98 +++-------------------
.../commons/vfs2/tasks/AbstractSyncTask.java | 0
.../org/apache/commons/vfs2/tasks/CopyTask.java | 0
.../org/apache/commons/vfs2/tasks/DeleteTask.java | 0
.../org/apache/commons/vfs2/tasks/MkdirTask.java | 0
.../org/apache/commons/vfs2/tasks/MoveTask.java | 0
.../apache/commons/vfs2/tasks/ShowFileTask.java | 0
.../org/apache/commons/vfs2/tasks/SyncTask.java | 0
.../org/apache/commons/vfs2/tasks/VfsTask.java | 0
.../apache/commons/vfs2/tasks/package-info.java | 0
commons-vfs2-bom/pom.xml | 5 ++
commons-vfs2-distribution/pom.xml | 5 +-
commons-vfs2-hdfs/pom.xml | 2 +
commons-vfs2/pom.xml | 14 ++--
pom.xml | 72 +++++++---------
src/changes/changes.xml | 3 +
src/site/site.xml | 8 +-
17 files changed, 67 insertions(+), 140 deletions(-)
diff --git a/commons-vfs2-hdfs/pom.xml b/commons-vfs2-ant/pom.xml
similarity index 68%
copy from commons-vfs2-hdfs/pom.xml
copy to commons-vfs2-ant/pom.xml
index 32419ddd..04885761 100644
--- a/commons-vfs2-hdfs/pom.xml
+++ b/commons-vfs2-ant/pom.xml
@@ -28,27 +28,18 @@
<relativePath>../</relativePath>
</parent>
- <name>Apache Commons VFS HDFS</name>
- <artifactId>commons-vfs2-hdfs</artifactId>
- <description>Apache Commons VFS is a Virtual File System library - Apache
Hadoop HDFS provider.</description>
+ <name>Apache Commons VFS Ant Tasks</name>
+ <artifactId>commons-vfs2-ant</artifactId>
+ <description>Apache Commons VFS Ant Tasks.</description>
<dependencies>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs-client</artifactId>
- </dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-vfs2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -71,41 +62,15 @@
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
- <!-- Test HDFS with Apache Hadoop -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <!-- VFS-606 - tools.jar not available in Java 9
- This exclusion can be removed after upgrading Hadoop
- to 2.7.1 or later
- -->
- <groupId>jdk.tools</groupId>
- <artifactId>jdk.tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<properties>
<vfs.parent.dir>${basedir}/..</vfs.parent.dir>
- <commons.packageId>vfs2-hdfs</commons.packageId>
- <commons.module.name>org.apache.commons.vfs2.hdfs</commons.module.name>
+ <commons.packageId>vfs2-ant</commons.packageId>
+ <commons.module.name>org.apache.commons.vfs2.ant</commons.module.name>
<commons.osgi.import>
+ org.apache.tools.ant.*;resolution:=optional,
+ *
</commons.osgi.import>
<!-- Hadoop jars contain overlapping packages that blow up JPMS -->
<moditect.skip>true</moditect.skip>
@@ -151,23 +116,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <!-- surfire do not honor suite(), see MSUREFIRE-131 why our tests
wont work with maven 2 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <test.basedir>target/test-classes/test-data</test.basedir>
- <test.basedir.res>test-data</test.basedir.res>
- <derby.stream.error.file>target/derby.log</derby.stream.error.file>
- </systemPropertyVariables>
- <excludes>
- <!-- Need to port fully to JUnit 4 or 5. -->
- <!-- *Tests.java files with @Test methods should not be run since
these classes are in fact JUnit 3 classes used in custom JUnit 3 test suites.
-->
- <exclude>**/*Tests.java</exclude>
- </excludes>
- </configuration>
- </plugin>
<plugin>
<!-- Remove after 2.10.0 -->
<groupId>com.github.siom79.japicmp</groupId>
@@ -184,7 +132,7 @@
<parameter>
<includes>
<!-- Package moved to new module here -->
- <include>org.apache.commons.vfs2.provider.hdfs</include>
+ <include>org.apache.commons.vfs2.provider.ant</include>
</includes>
</parameter>
<dependencies>
@@ -260,26 +208,4 @@
</plugin>
</plugins>
</reporting>
- <profiles>
- <profile>
- <activation>
- <os>
- <family>Windows</family>
- </os>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/Hdfs*Test*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
b/commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
similarity index 100%
rename from
commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
rename to
commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/CopyTask.java
b/commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/CopyTask.java
similarity index 100%
rename from
commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/CopyTask.java
rename to
commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/CopyTask.java
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
b/commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
similarity index 100%
rename from
commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
rename to
commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/MkdirTask.java
b/commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/MkdirTask.java
similarity index 100%
rename from
commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/MkdirTask.java
rename to
commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/MkdirTask.java
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/MoveTask.java
b/commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/MoveTask.java
similarity index 100%
rename from
commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/MoveTask.java
rename to
commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/MoveTask.java
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java
b/commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java
similarity index 100%
rename from
commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java
rename to
commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/SyncTask.java
b/commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/SyncTask.java
similarity index 100%
rename from
commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/SyncTask.java
rename to
commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/SyncTask.java
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/VfsTask.java
b/commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/VfsTask.java
similarity index 100%
rename from
commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/VfsTask.java
rename to
commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/VfsTask.java
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/package-info.java
b/commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/package-info.java
similarity index 100%
rename from
commons-vfs2/src/main/java/org/apache/commons/vfs2/tasks/package-info.java
rename to
commons-vfs2-ant/src/main/java/org/apache/commons/vfs2/tasks/package-info.java
diff --git a/commons-vfs2-bom/pom.xml b/commons-vfs2-bom/pom.xml
index 33b50840..a1eeaaaa 100644
--- a/commons-vfs2-bom/pom.xml
+++ b/commons-vfs2-bom/pom.xml
@@ -45,6 +45,11 @@
<artifactId>commons-vfs2-examples</artifactId>
<version>2.10.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-ant</artifactId>
+ <version>2.10.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-hdfs</artifactId>
diff --git a/commons-vfs2-distribution/pom.xml
b/commons-vfs2-distribution/pom.xml
index 68e5c8d9..fe2bea4d 100644
--- a/commons-vfs2-distribution/pom.xml
+++ b/commons-vfs2-distribution/pom.xml
@@ -43,12 +43,12 @@ limitations under the License.
<profile>
<id>release</id>
<dependencies>
+ <!-- Core -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
@@ -73,13 +73,12 @@ limitations under the License.
<version>${project.version}</version>
<classifier>test-sources</classifier>
</dependency>
-
+ <!-- Examples -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2-examples</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2-examples</artifactId>
diff --git a/commons-vfs2-hdfs/pom.xml b/commons-vfs2-hdfs/pom.xml
index 32419ddd..b1350720 100644
--- a/commons-vfs2-hdfs/pom.xml
+++ b/commons-vfs2-hdfs/pom.xml
@@ -106,6 +106,8 @@
<commons.packageId>vfs2-hdfs</commons.packageId>
<commons.module.name>org.apache.commons.vfs2.hdfs</commons.module.name>
<commons.osgi.import>
+ org.apache.hadoop.*;resolution:=optional,
+ *
</commons.osgi.import>
<!-- Hadoop jars contain overlapping packages that blow up JPMS -->
<moditect.skip>true</moditect.skip>
diff --git a/commons-vfs2/pom.xml b/commons-vfs2/pom.xml
index 91ba3182..f593d64a 100644
--- a/commons-vfs2/pom.xml
+++ b/commons-vfs2/pom.xml
@@ -38,11 +38,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
@@ -150,14 +145,17 @@
<properties>
<vfs.parent.dir>${basedir}/..</vfs.parent.dir>
<commons.osgi.import>
- org.apache.hadoop.*;resolution:=optional,
- org.apache.tools.ant.*;resolution:=optional,
- org.apache.commons.httpclient.*;resolution:=optional,
+ org.apache.hc.client5.http.*;resolution:=optional,
*
</commons.osgi.import>
</properties>
<build>
+ <pluginManagement>
+ <plugins>
+
+ </plugins>
+ </pluginManagement>
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
diff --git a/pom.xml b/pom.xml
index dcf6a026..37503234 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
<modules>
<module>commons-vfs2</module>
+ <module>commons-vfs2-ant</module>
<module>commons-vfs2-hdfs</module>
<module>commons-vfs2-jackrabbit1</module>
<module>commons-vfs2-jackrabbit2</module>
@@ -168,7 +169,7 @@
<commons.jira.pid>12310495</commons.jira.pid>
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-vfs</commons.scmPubUrl>
<commons.siteOutputDirectory>${basedir}/../target/site</commons.siteOutputDirectory>
-
<commons.releaseNotesLocation>${basedir}/../RELEASE-NOTES.txt</commons.releaseNotesLocation>
+
<commons.releaseNotesLocation>${vfs.parent.dir}/RELEASE-NOTES.txt</commons.releaseNotesLocation>
<commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
<commons.release.version>2.10.0</commons.release.version>
<commons.release.next>2.10.1</commons.release.next>
@@ -264,6 +265,36 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ <configuration>
+ <parameter>
+ <overrideCompatibilityChangeParameters>
+ <overrideCompatibilityChangeParameter>
+ <compatibilityChange>METHOD_NEW_DEFAULT</compatibilityChange>
+ <binaryCompatible>true</binaryCompatible>
+ <sourceCompatible>true</sourceCompatible>
+ <semanticVersionLevel>PATCH</semanticVersionLevel>
+ </overrideCompatibilityChangeParameter>
+ <overrideCompatibilityChangeParameter>
+ <!-- BC is maintained, but no SC. -->
+
<compatibilityChange>METHOD_NO_LONGER_THROWS_CHECKED_EXCEPTION</compatibilityChange>
+ <binaryCompatible>true</binaryCompatible>
+ <sourceCompatible>true</sourceCompatible>
+ <semanticVersionLevel>PATCH</semanticVersionLevel>
+ </overrideCompatibilityChangeParameter>
+ </overrideCompatibilityChangeParameters>
+ <excludes>
+ <!-- Remove this section after 2.10.0 -->
+ <!-- Package moved to new module commons-vfs-hdfs -->
+ <exclude>org.apache.commons.vfs2.provider.hdfs</exclude>
+ <!-- Package moved to new module commons-vfs-ant -->
+ <exclude>org.apache.commons.vfs2.tasks</exclude>
+ </excludes>
+ </parameter>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
@@ -333,29 +364,6 @@
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
- <configuration>
- <parameter>
- <overrideCompatibilityChangeParameters>
- <overrideCompatibilityChangeParameter>
- <compatibilityChange>METHOD_NEW_DEFAULT</compatibilityChange>
- <binaryCompatible>true</binaryCompatible>
- <sourceCompatible>true</sourceCompatible>
- <semanticVersionLevel>PATCH</semanticVersionLevel>
- </overrideCompatibilityChangeParameter>
- <overrideCompatibilityChangeParameter>
- <!-- BC is maintained, but no SC. -->
-
<compatibilityChange>METHOD_NO_LONGER_THROWS_CHECKED_EXCEPTION</compatibilityChange>
- <binaryCompatible>true</binaryCompatible>
- <sourceCompatible>true</sourceCompatible>
- <semanticVersionLevel>PATCH</semanticVersionLevel>
- </overrideCompatibilityChangeParameter>
- </overrideCompatibilityChangeParameters>
- <excludes>
- <!-- Package moved to new module -->
- <exclude>org.apache.commons.vfs2.provider.hdfs</exclude>
- </excludes>
- </parameter>
- </configuration>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
@@ -415,22 +423,6 @@
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
- <configuration>
- <parameter>
- <overrideCompatibilityChangeParameters>
- <overrideCompatibilityChangeParameter>
- <compatibilityChange>METHOD_NEW_DEFAULT</compatibilityChange>
- <binaryCompatible>true</binaryCompatible>
- <sourceCompatible>true</sourceCompatible>
- <semanticVersionLevel>PATCH</semanticVersionLevel>
- </overrideCompatibilityChangeParameter>
- </overrideCompatibilityChangeParameters>
- <excludes>
- <!-- Package moved to new module -->
- <exclude>org.apache.commons.vfs2.provider.hdfs</exclude>
- </excludes>
- </parameter>
- </configuration>
</plugin>
<!-- cobertura breaks because it cannot parse annotations in methods. -->
<!--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a90011f8..d05db8b5 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -187,6 +187,9 @@ The <action> type attribute can be add,update,fix,remove.
<action type="add" issue="VFS-848" dev="ggregory" due-to="beise, Gary
Gregory">
Config option for trailing slash in webdav URI #425.
</action>
+ <action type="add" dev="ggregory" due-to="Gary Gregory">
+ Split out Apache Ant Tasks into its own Maven module commons-vfs2-ant.
+ </action>
<action type="add" issue="VFS-851" dev="ggregory" due-to="Gary Gregory">
Split out HDFS provider into its own Maven module commons-vfs2-hdfs.
</action>
diff --git a/src/site/site.xml b/src/site/site.xml
index bc7cddc3..2d100861 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -25,7 +25,7 @@
<body>
- <menu name="Commons VFS" inherit="top">
+ <menu name="Commons VFS" inherit="top">
<item name="Overview" href="/index.html"/>
<item name="Download" href="/download_vfs.html"/>
<item name="Build" href="/build.html"/>
@@ -37,15 +37,17 @@
<item name="Wiki"
href="https://cwiki.apache.org/confluence/display/commons/VFS"/>
</menu>
- <menu name="VFS Modules" inherit="top">
+ <menu name="Commons VFS Modules" inherit="top">
+ <item name="VFS Ant" href="commons-vfs2-ant/index.html"/>
<item name="VFS Core" href="commons-vfs2/index.html"/>
<item name="VFS Examples" href="commons-vfs2-examples/index.html"/>
+ <item name="VFS HDFS" href="commons-vfs2-hdfs/index.html"/>
<item name="VFS Jackrabbit 1"
href="commons-vfs2-jackrabbit1/index.html"/>
<item name="VFS Jackrabbit 2"
href="commons-vfs2-jackrabbit2/index.html"/>
<item name="VFS Sandbox" href="commons-vfs2-sandbox/index.html"/>
</menu>
- <menu name="VFS Development" inherit="top">
+ <menu name="Commons VFS Development" inherit="top">
<item name="Testing" href="/testing.html"/>
<item name="Mailing Lists" href="/mail-lists.html"/>
<item name="Issue Tracking" href="/issue-tracking.html"/>
