This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch release in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/release by this push: new 22fd281a Prepare for the next release candidate 22fd281a is described below commit 22fd281abd7eacb00cba6f40fbd4fe3bb232fd8f Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sun Mar 3 18:41:03 2024 -0500 Prepare for the next release candidate --- commons-vfs2-ant/pom.xml | 10 +++++----- commons-vfs2-bom/pom.xml | 18 +++++++----------- commons-vfs2-distribution/pom.xml | 10 +++++----- commons-vfs2-examples/pom.xml | 8 ++++---- commons-vfs2-hdfs/pom.xml | 10 +++++----- commons-vfs2-jackrabbit1/pom.xml | 10 +++++----- commons-vfs2-jackrabbit2/pom.xml | 10 +++++----- commons-vfs2-sandbox/pom.xml | 8 ++++---- commons-vfs2/pom.xml | 10 +++++----- pom.xml | 25 +++++++++++++------------ 10 files changed, 58 insertions(+), 61 deletions(-) diff --git a/commons-vfs2-ant/pom.xml b/commons-vfs2-ant/pom.xml index 0482402f..dd4e54b6 100644 --- 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.0</version> <relativePath>../</relativePath> </parent> @@ -65,7 +65,7 @@ </dependencies> <properties> - <vfs.parent.dir>${basedir}/..</vfs.parent.dir> + <commons.parent.dir>${basedir}/..</commons.parent.dir> <commons.packageId>vfs2-ant</commons.packageId> <commons.module.name>org.apache.commons.vfs2.ant</commons.module.name> <commons.osgi.import> @@ -74,7 +74,7 @@ </commons.osgi.import> <!-- Hadoop jars contain overlapping packages that blow up JPMS --> <moditect.skip>true</moditect.skip> - <project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp> </properties> <build> @@ -83,7 +83,7 @@ <directory>${project.basedir}/src/main/resources</directory> </resource> <resource> - <directory>${vfs.parent.dir}</directory> + <directory>${commons.parent.dir}</directory> <targetPath>META-INF</targetPath> <includes> <include>NOTICE.txt</include> @@ -97,7 +97,7 @@ <directory>${project.basedir}/src/test/resources</directory> </testResource> <testResource> - <directory>${vfs.parent.dir}</directory> + <directory>${commons.parent.dir}</directory> <targetPath>META-INF</targetPath> <includes> <include>NOTICE.txt</include> diff --git a/commons-vfs2-bom/pom.xml b/commons-vfs2-bom/pom.xml index 3cf792d9..3b439ded 100644 --- 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.0</version> <relativePath>../</relativePath> </parent> <artifactId>commons-vfs2-bom</artifactId> @@ -33,17 +33,12 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-vfs2</artifactId> - <version>2.10.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-vfs2-distribution</artifactId> - <version>2.10.0-SNAPSHOT</version> + <version>2.10.0</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-vfs2-examples</artifactId> - <version>2.10.0-SNAPSHOT</version> + <version>2.10.0</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -58,17 +53,18 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-vfs2-jackrabbit1</artifactId> - <version>2.10.0-SNAPSHOT</version> + <version>2.10.0</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-vfs2-jackrabbit2</artifactId> - <version>2.10.0-SNAPSHOT</version> + <version>2.10.0</version> </dependency> </dependencies> </dependencyManagement> <properties> + <commons.parent.dir>${basedir}/..</commons.parent.dir> <checkstyle.skip>true</checkstyle.skip> - <project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp> </properties> </project> diff --git a/commons-vfs2-distribution/pom.xml b/commons-vfs2-distribution/pom.xml index dbdca5e5..d48b4f81 100644 --- a/commons-vfs2-distribution/pom.xml +++ b/commons-vfs2-distribution/pom.xml @@ -28,16 +28,16 @@ limitations under the License. <parent> <groupId>org.apache.commons</groupId> <artifactId>commons-vfs2-project</artifactId> - <version>2.10.0-SNAPSHOT</version> + <version>2.10.0</version> <relativePath>../</relativePath> </parent> <properties> <!-- dist module contains no code and no checkstyle config --> <checkstyle.skip>true</checkstyle.skip> - <vfs.parent.dir>${basedir}/..</vfs.parent.dir> + <commons.parent.dir>${basedir}/..</commons.parent.dir> <commons.release.isDistModule>true</commons.release.isDistModule> - <project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp> </properties> <profiles> @@ -225,7 +225,7 @@ limitations under the License. naming the final artifact as -src not -source-release. --> <execution> - <id>vfs-source-release-assembly</id> + <id>src</id> <phase>package</phase> <goals> <goal>single</goal> @@ -239,7 +239,7 @@ limitations under the License. </configuration> </execution> <execution> - <id>binary</id> + <id>bin</id> <configuration> <finalName>commons-vfs-${project.version}</finalName> <descriptors> diff --git a/commons-vfs2-examples/pom.xml b/commons-vfs2-examples/pom.xml index 23267151..e4239ea3 100644 --- a/commons-vfs2-examples/pom.xml +++ b/commons-vfs2-examples/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.commons</groupId> <artifactId>commons-vfs2-project</artifactId> - <version>2.10.0-SNAPSHOT</version> + <version>2.10.0</version> <relativePath>../</relativePath> </parent> @@ -56,12 +56,12 @@ </dependencies> <properties> - <vfs.parent.dir>${basedir}/..</vfs.parent.dir> + <commons.parent.dir>${basedir}/..</commons.parent.dir> <japicmp.skip>true</japicmp.skip> <commons.osgi.import> * </commons.osgi.import> - <project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp> </properties> <build> @@ -70,7 +70,7 @@ <directory>src/main/resources</directory> </resource> <resource> - <directory>${vfs.parent.dir}</directory> + <directory>${commons.parent.dir}</directory> <targetPath>META-INF</targetPath> <includes> <include>NOTICE.txt</include> diff --git a/commons-vfs2-hdfs/pom.xml b/commons-vfs2-hdfs/pom.xml index 6919e5c5..a74e6017 100644 --- 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.0</version> <relativePath>../</relativePath> </parent> @@ -102,7 +102,7 @@ </dependencies> <properties> - <vfs.parent.dir>${basedir}/..</vfs.parent.dir> + <commons.parent.dir>${basedir}/..</commons.parent.dir> <commons.packageId>vfs2-hdfs</commons.packageId> <commons.module.name>org.apache.commons.vfs2.hdfs</commons.module.name> <commons.osgi.import> @@ -111,7 +111,7 @@ </commons.osgi.import> <!-- Hadoop jars contain overlapping packages that blow up JPMS --> <moditect.skip>true</moditect.skip> - <project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp> </properties> <build> @@ -120,7 +120,7 @@ <directory>${project.basedir}/src/main/resources</directory> </resource> <resource> - <directory>${vfs.parent.dir}</directory> + <directory>${commons.parent.dir}</directory> <targetPath>META-INF</targetPath> <includes> <include>NOTICE.txt</include> @@ -134,7 +134,7 @@ <directory>${project.basedir}/src/test/resources</directory> </testResource> <testResource> - <directory>${vfs.parent.dir}</directory> + <directory>${commons.parent.dir}</directory> <targetPath>META-INF</targetPath> <includes> <include>NOTICE.txt</include> diff --git a/commons-vfs2-jackrabbit1/pom.xml b/commons-vfs2-jackrabbit1/pom.xml index dbb517d6..3de67bd5 100644 --- 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.0</version> <relativePath>../</relativePath> </parent> @@ -117,7 +117,7 @@ </dependencies> <properties> - <vfs.parent.dir>${basedir}/..</vfs.parent.dir> + <commons.parent.dir>${basedir}/..</commons.parent.dir> <commons.packageId>vfs2-jackrabbit1</commons.packageId> <commons.module.name>org.apache.commons.vfs2.jackrabbit1</commons.module.name> <commons.osgi.import> @@ -125,7 +125,7 @@ org.apache.commons.httpclient.*;resolution:=optional, * </commons.osgi.import> - <project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp> </properties> <build> @@ -134,7 +134,7 @@ <directory>${project.basedir}/src/main/resources</directory> </resource> <resource> - <directory>${vfs.parent.dir}</directory> + <directory>${commons.parent.dir}</directory> <targetPath>META-INF</targetPath> <includes> <include>NOTICE.txt</include> @@ -148,7 +148,7 @@ <directory>${project.basedir}/src/test/resources</directory> </testResource> <testResource> - <directory>${vfs.parent.dir}</directory> + <directory>${commons.parent.dir}</directory> <targetPath>META-INF</targetPath> <includes> <include>NOTICE.txt</include> diff --git a/commons-vfs2-jackrabbit2/pom.xml b/commons-vfs2-jackrabbit2/pom.xml index 7fe7bdfe..68bc3a6b 100644 --- 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.0</version> <relativePath>../</relativePath> </parent> @@ -117,14 +117,14 @@ </dependencies> <properties> - <vfs.parent.dir>${basedir}/..</vfs.parent.dir> + <commons.parent.dir>${basedir}/..</commons.parent.dir> <commons.packageId>vfs2-jackrabbit2</commons.packageId> <commons.module.name>org.apache.commons.vfs2.jackrabbit2</commons.module.name> <commons.osgi.import> org.apache.jackrabbit.*;resolution:=optional, * </commons.osgi.import> - <project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp> </properties> <build> @@ -133,7 +133,7 @@ <directory>${project.basedir}/src/main/resources</directory> </resource> <resource> - <directory>${vfs.parent.dir}</directory> + <directory>${commons.parent.dir}</directory> <targetPath>META-INF</targetPath> <includes> <include>NOTICE.txt</include> @@ -147,7 +147,7 @@ <directory>${project.basedir}/src/test/resources</directory> </testResource> <testResource> - <directory>${vfs.parent.dir}</directory> + <directory>${commons.parent.dir}</directory> <targetPath>META-INF</targetPath> <includes> <include>NOTICE.txt</include> diff --git a/commons-vfs2-sandbox/pom.xml b/commons-vfs2-sandbox/pom.xml index 9af41535..b9845f01 100644 --- a/commons-vfs2-sandbox/pom.xml +++ b/commons-vfs2-sandbox/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.commons</groupId> <artifactId>commons-vfs2-project</artifactId> - <version>2.10.0-SNAPSHOT</version> + <version>2.10.0</version> <relativePath>../</relativePath> </parent> @@ -88,7 +88,7 @@ <properties> <commons.componentid>vfs-sandbox</commons.componentid> - <vfs.parent.dir>${basedir}/..</vfs.parent.dir> + <commons.parent.dir>${basedir}/..</commons.parent.dir> </properties> <build> @@ -97,7 +97,7 @@ <directory>${project.basedir}/src/main/resources</directory> </resource> <resource> - <directory>${vfs.parent.dir}</directory> + <directory>${commons.parent.dir}</directory> <targetPath>META-INF</targetPath> <includes> <include>NOTICE.txt</include> @@ -108,7 +108,7 @@ <!-- include NOTICE/LICENSE in generated test jar --> <testResources> <testResource> - <directory>${vfs.parent.dir}</directory> + <directory>${commons.parent.dir}</directory> <targetPath>META-INF</targetPath> <includes> <include>NOTICE.txt</include> diff --git a/commons-vfs2/pom.xml b/commons-vfs2/pom.xml index 321aa19e..8949c2f4 100644 --- a/commons-vfs2/pom.xml +++ b/commons-vfs2/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.0</version> <relativePath>../</relativePath> </parent> @@ -143,12 +143,12 @@ </dependencies> <properties> - <vfs.parent.dir>${basedir}/..</vfs.parent.dir> + <commons.parent.dir>${basedir}/..</commons.parent.dir> <commons.osgi.import> org.apache.hc.client5.http.*;resolution:=optional, * </commons.osgi.import> - <project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp> </properties> <build> @@ -163,7 +163,7 @@ </resource> <!-- include NOTICE/LICENSE in generated jar --> <resource> - <directory>${vfs.parent.dir}</directory> + <directory>${commons.parent.dir}</directory> <targetPath>META-INF</targetPath> <includes> <include>NOTICE.txt</include> @@ -178,7 +178,7 @@ </testResource> <!-- include NOTICE/LICENSE in generated test jar --> <testResource> - <directory>${vfs.parent.dir}</directory> + <directory>${commons.parent.dir}</directory> <targetPath>META-INF</targetPath> <includes> <include>NOTICE.txt</include> diff --git a/pom.xml b/pom.xml index 8a14d5d8..d4a26104 100644 --- 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.0</version> <url>https://commons.apache.org/proper/commons-vfs/</url> <inceptionYear>2002</inceptionYear> @@ -41,8 +41,8 @@ <module>commons-vfs2-jackrabbit1</module> <module>commons-vfs2-jackrabbit2</module> <module>commons-vfs2-examples</module> - <module>commons-vfs2-distribution</module> <module>commons-vfs2-bom</module> + <module>commons-vfs2-distribution</module> </modules> <!-- commons-vfs2-sandbox is in profile include-sandbox --> @@ -168,8 +168,8 @@ <commons.jira.id>VFS</commons.jira.id> <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>${vfs.parent.dir}/RELEASE-NOTES.txt</commons.releaseNotesLocation> + <commons.siteOutputDirectory>${basedir}/target/site</commons.siteOutputDirectory> + <commons.releaseNotesLocation>${commons.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> @@ -185,8 +185,9 @@ <commons.rc.version>RC1</commons.rc.version> <commons.release.name>commons-vfs-${commons.release.version}</commons.release.name> <commons.release.desc>(requires Java 8 or above)</commons.release.desc> + <commons.release.isDistModule>false</commons.release.isDistModule> - <vfs.parent.dir>${basedir}</vfs.parent.dir> + <commons.parent.dir>${basedir}</commons.parent.dir> <!-- make sure bundle plugin has dependency informations for 'optional' --> <commons.osgi.excludeDependencies /> <commons.osgi.import> @@ -213,7 +214,7 @@ <clirr.skip>true</clirr.skip> <japicmp.skip>false</japicmp.skip> <jacoco.skip>false</jacoco.skip> - <project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2024-03-03T15:45:26Z</project.build.outputTimestamp> </properties> <build> @@ -240,9 +241,9 @@ <artifactId>maven-checkstyle-plugin</artifactId> <!-- Keep build/reporting in sync --> <configuration> - <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation> --> - <configLocation>${vfs.parent.dir}/checkstyle.xml</configLocation> - <suppressionsLocation>${vfs.parent.dir}/checkstyle-suppressions.xml</suppressionsLocation> + <!--<propertiesLocation>${commons.parent.dir}/checkstyle.properties</propertiesLocation> --> + <configLocation>${commons.parent.dir}/checkstyle.xml</configLocation> + <suppressionsLocation>${commons.parent.dir}/checkstyle-suppressions.xml</suppressionsLocation> <enableRulesSummary>false</enableRulesSummary> <propertyExpansion>basedir=${basedir}</propertyExpansion> <!-- <includeTestSourceDirectory>true</includeTestSourceDirectory> --> @@ -336,7 +337,7 @@ <configuration> <target> <copy todir="${project.build.directory}/apidocs/META-INF"> - <fileset dir="${vfs.parent.dir}"> + <fileset dir="${commons.parent.dir}"> <include name="LICENSE.txt" /> <include name="NOTICE.txt" /> </fileset> @@ -372,7 +373,7 @@ <configuration> <threshold>Normal</threshold> <effort>Default</effort> - <excludeFilterFile>${vfs.parent.dir}/findbugs-exclude-filter.xml</excludeFilterFile> + <excludeFilterFile>${commons.parent.dir}/findbugs-exclude-filter.xml</excludeFilterFile> </configuration> </plugin> </plugins> @@ -410,7 +411,7 @@ <configuration> <threshold>Normal</threshold> <effort>Default</effort> - <excludeFilterFile>${vfs.parent.dir}/findbugs-exclude-filter.xml</excludeFilterFile> + <excludeFilterFile>${commons.parent.dir}/findbugs-exclude-filter.xml</excludeFilterFile> </configuration> </plugin> <plugin>