This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git
commit 03e99ad1fff2601a1a4cab06c1396867e3485e15 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sat Feb 18 21:34:13 2023 +0100 Revert "use directory, not folder" This reverts commit ec74b081fc8c183782154adc8332f48e32a6fee1. --- .../website/deploy-component-reference-documentation.md | 2 +- content/markdown/docs/3.3.1/release-notes.md | 8 ++++---- content/markdown/docs/3.3.9/release-notes.md | 4 ++-- content/markdown/faq-unoffical.md | 8 ++++---- content/markdown/guides/mini/guide-3rd-party-jars-local.md | 2 +- content/markdown/guides/mini/guide-encryption.md | 2 +- content/markdown/guides/mini/guide-releasing.md | 2 +- content/markdown/install.md.vm | 2 +- content/markdown/maven-jsr330.md | 2 +- content/markdown/plugin-developers/common-bugs.md | 2 +- content/markdown/plugins/index.md | 4 ++-- content/markdown/plugins/localization.md | 2 +- content/markdown/security-plexus-archiver.md | 2 +- content/markdown/security.md | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/content/markdown/developers/website/deploy-component-reference-documentation.md b/content/markdown/developers/website/deploy-component-reference-documentation.md index 976a785c..91c20a34 100644 --- a/content/markdown/developers/website/deploy-component-reference-documentation.md +++ b/content/markdown/developers/website/deploy-component-reference-documentation.md @@ -63,7 +63,7 @@ under the License. 1 prerequisite: eventually build the component if it has not been done previously, or some reports may miss build or integration information: - Notice: In cases where you have prepared a release you can simple change into `target/checkout` directory and continue with 2. + Notice: In cases where you have prepared a release you can simple change into `target/checkout` folder and continue with 2. diff --git a/content/markdown/docs/3.3.1/release-notes.md b/content/markdown/docs/3.3.1/release-notes.md index 69950e46..e777a8d7 100644 --- a/content/markdown/docs/3.3.1/release-notes.md +++ b/content/markdown/docs/3.3.1/release-notes.md @@ -58,7 +58,7 @@ The new [Maven 3.3.1 Release is just out](http://mail-archives.apache.org/mod_mb * The handling of the [`toolchains.xml`][MNG-3891] file has been adjusted with the handling of `settings.xml` which means it will be searched within the - `${maven.home}/conf/` directory and furthermore within the `${user.home}/.m2/` directory. + `${maven.home}/conf/` folder and furthermore within the `${user.home}/.m2/` folder. * For a better understanding and as an example of the `toolchains.xml` file has been added to the [Maven distribution][MNG-5745]. @@ -75,7 +75,7 @@ The new [Maven 3.3.1 Release is just out](http://mail-archives.apache.org/mod_mb it simpler to use. * The old way (up to Maven 3.2.5) was to create a jar (must be shaded if you have other dependencies) - which contains the extension and put it manually into the `${MAVEN_HOME}/lib/ext` directory. + which contains the extension and put it manually into the `${MAVEN_HOME}/lib/ext` folder. This means you had to change the Maven installation. The consequence was that everyone who likes to use this needed to change it's installation and makes the on-boarding for a developer much more inconvenient. The other option was to give the path to the jar on command line via @@ -124,8 +124,8 @@ The new [Maven 3.3.1 Release is just out](http://mail-archives.apache.org/mod_mb --fail-at-end`. So you only have to call maven just by using `mvn clean package` instead of `mvn -T3 -U --fail-at-end clean package` and not to miss the `-T3 -U --fail-at-end` options. The `${maven.projectBasedir}/.mvn/maven.config` - is located in the `${maven.projectBasedir}/.mvn/` directory which is in the root - of a multi module build. This directory is part of the project and will be checked + is located in the `${maven.projectBasedir}/.mvn/` folder which is in the root + of a multi module build. This folder is part of the project and will be checked in into your version control. This results in being picked by everybody who checks out the project and no need to remember to call this project via `mvn -T3 -U --fail-at-end clean package` instead of `mvn clean package`. diff --git a/content/markdown/docs/3.3.9/release-notes.md b/content/markdown/docs/3.3.9/release-notes.md index d38486bd..1d73af31 100644 --- a/content/markdown/docs/3.3.9/release-notes.md +++ b/content/markdown/docs/3.3.9/release-notes.md @@ -123,7 +123,7 @@ Bugs `MAVEN_OPTS` and debugging options which has been fixed by [MNG-5813][MNG-5813]. * Since Maven 3.3.1 it is possible to have configurations stored on a per project base in the - `${maven.projectBasedir}/.mvn` directory of the project. There you can use the `maven.config` + `${maven.projectBasedir}/.mvn` folder of the project. There you can use the `maven.config` file to store command line options instead of repeating them every time you call Maven. In cases where this file has been empty Maven ended with a failure. This has been fixed with [MNG-5816][MNG-5816]. @@ -147,7 +147,7 @@ Bugs has been fixed with [MNG-5721]. * There had been several issues with the `mvn` script which are for example - wrong locating the `.mvn` directory, nonportable shell constructs, wrongly setting + wrong locating the `.mvn` folder, nonportable shell constructs, wrongly setting 'maven.multiModuleProjectDirectory' variable or directories which contain spaces. Those issues have been fixed [MNG-5786][MNG-5786], [MNG-5858][MNG-5858], [MNG-5882][MNG-5882] and [MNG-5884][MNG-5884]. diff --git a/content/markdown/faq-unoffical.md b/content/markdown/faq-unoffical.md index bfaafe59..4adb12de 100644 --- a/content/markdown/faq-unoffical.md +++ b/content/markdown/faq-unoffical.md @@ -40,7 +40,7 @@ This page serves as a collection of questions *with* answers. If you have a freq ### Eclipse -[How do I specify which output directories the Eclipse plugin puts into the .classpath file?](#How do I specify which output directories the Eclipse plugin puts into the .classpath file?] +[How do I specify which output folders the Eclipse plugin puts into the .classpath file?](#How do I specify which output folders the Eclipse plugin puts into the .classpath file?] [Where can I get the Maven plugin for Eclipse?](#Where can I get the Maven plugin for Eclipse?] [I issued\- mvn \-Declipse.downloadSources=true eclipse eclipse goal. It created .classpath and .project for both modules, and in my local repository it downloaded sources Ho do I access them in eclipse?](#I issued- mvn -Declipse.downloadSources=true eclipse eclipse goal. It created .classpath and .project for both modules, and in my local repository it downloaded sources Ho do I access them in eclipse?] [Is it possible that if I do mvn eclipse eclipse goal that my project would get disconnected from the subversion repository?](#Is it possible that if I do mvn eclipse eclipse goal that my project would get disconnected from the subversion repository?] @@ -517,7 +517,7 @@ To specify a remote repo in Maven, add the `<repositories>` element to the POM: Or, refer to the following page [http://maven.apache.org/guides/mini/guide-multiple-repositories.html) _Repositories_ -### How do I specify which output directories the Eclipse plugin puts into the .classpath file? +### How do I specify which output folders the Eclipse plugin puts into the .classpath file? ``` <build> @@ -1518,7 +1518,7 @@ Wagon wagon; ### How do I set the base directory for creating the packages created by assembly? -The assembly plugin, by default, saves the packages to your project.build.directory from your pom or +The assembly plugin, by default, saves the packages to your project.build.directory folder from your pom or ``` <project> ... @@ -1968,4 +1968,4 @@ This sometimes happens when $M2_HOME is not the same as your $PATH. That is, wh If you want to `mvn --encrypt-password` a password with an ampersand you will get an error, e.g. `mvn --encrypt-password test&Password` On the one hand the ampersand has to be encoded as entity with &. On the other hand the ampersand has to be escaped for the command line. Result would be `mvn --encrypt-password test &Password` -Also a dollar sign $ has to be escaped for the command line. +Also a dollar sign $ has to be escaped for the command line. \ No newline at end of file diff --git a/content/markdown/guides/mini/guide-3rd-party-jars-local.md b/content/markdown/guides/mini/guide-3rd-party-jars-local.md index 28343a29..fca1ef3b 100644 --- a/content/markdown/guides/mini/guide-3rd-party-jars-local.md +++ b/content/markdown/guides/mini/guide-3rd-party-jars-local.md @@ -46,7 +46,7 @@ mvn install:install-file -Dfile=<path-to-file> -DgroupId=<group-id> -DartifactId mvn install:install-file -Dfile=<path-to-file> -DpomFile=<path-to-pomfile> ``` - With version 2.5 of the maven-install-plugin, it can get even simpler: if the JAR was built by Apache Maven, it'll contain a pom.xml in a subdirectory of the META-INF/ directory, which will be read by default. In that case, all you need to do is: + With version 2.5 of the maven-install-plugin, it can get even simpler: if the JAR was built by Apache Maven, it'll contain a pom.xml in a subfolder of the META-INF/ directory, which will be read by default. In that case, all you need to do is: diff --git a/content/markdown/guides/mini/guide-encryption.md b/content/markdown/guides/mini/guide-encryption.md index 9046c2d6..4dc3e2d2 100644 --- a/content/markdown/guides/mini/guide-encryption.md +++ b/content/markdown/guides/mini/guide-encryption.md @@ -58,7 +58,7 @@ under the License. - - authorized users have an additional `settings-security.xml` file in their `${user.home}/.m2` directory + - authorized users have an additional `settings-security.xml` file in their `${user.home}/.m2` folder - this file either contains encrypted **master password**, used to encrypt other passwords diff --git a/content/markdown/guides/mini/guide-releasing.md b/content/markdown/guides/mini/guide-releasing.md index 196c9d80..61f7593e 100644 --- a/content/markdown/guides/mini/guide-releasing.md +++ b/content/markdown/guides/mini/guide-releasing.md @@ -169,7 +169,7 @@ mvn release:prepare \ - **A Desired SCM provider tag name**. - This is a SCM provider specific value, in the case of the Subversion SCM provider this value is equal to the directory name that will appear under the URL provided by the the tagBase parameter. + This is a SCM provider specific value, in the case of the Subversion SCM provider this value is equal to the folder name that will appear under the URL provided by the the tagBase parameter. diff --git a/content/markdown/install.md.vm b/content/markdown/install.md.vm index 7e003d4a..6c1d059c 100644 --- a/content/markdown/install.md.vm +++ b/content/markdown/install.md.vm @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> The installation of Apache Maven is a simple process of extracting the archive -and adding the `bin` directory with the `mvn` command to the `PATH`. +and adding the `bin` folder with the `mvn` command to the `PATH`. Detailed steps are: diff --git a/content/markdown/maven-jsr330.md b/content/markdown/maven-jsr330.md index 41acdc14..0ce05fbc 100644 --- a/content/markdown/maven-jsr330.md +++ b/content/markdown/maven-jsr330.md @@ -123,7 +123,7 @@ Ok, so let's take a look at the POM: ``` So, as mentioned, we have the `javax.inject` dependency and the `sisu-maven-plugin` configured to create -the JSR-330 component index. When you build and place the extension JAR in the `${MAVEN_HOME}/lib/ext` directory, +the JSR-330 component index. When you build and place the extension JAR in the `${MAVEN_HOME}/lib/ext` folder, it will automatically get picked up by Maven. In the case of this example, we have an implementation of an `EventSpy` that times the executions of individual mojos within a phase in the lifecycle. diff --git a/content/markdown/plugin-developers/common-bugs.md b/content/markdown/plugin-developers/common-bugs.md index 63fb6a7b..947be36d 100644 --- a/content/markdown/plugin-developers/common-bugs.md +++ b/content/markdown/plugin-developers/common-bugs.md @@ -287,7 +287,7 @@ public MyMojo extends AbstractMojo a Embedded Maven Invocations - Other tools, most notably IDEs, that run Maven under the hood may have set the current working directory to their installation directory or whatever they like. + Other tools, most notably IDEs, that run Maven under the hood may have set the current working directory to their installation folder or whatever they like. diff --git a/content/markdown/plugins/index.md b/content/markdown/plugins/index.md index b92246ce..e3564f51 100644 --- a/content/markdown/plugins/index.md +++ b/content/markdown/plugins/index.md @@ -35,7 +35,7 @@ under the License. ### Supported By The Maven Project - To see the most up-to-date list browse the Maven repository, specifically the [ `org/apache/maven/plugins`](https://repo.maven.apache.org/maven2/org/apache/maven/plugins/) subdirectory. _(Plugins are organized according to a directory structure that resembles the standard Java package naming convention)_ + To see the most up-to-date list browse the Maven repository, specifically the [ `org/apache/maven/plugins`](https://repo.maven.apache.org/maven2/org/apache/maven/plugins/) subfolder. _(Plugins are organized according to a directory structure that resembles the standard Java package naming convention)_ <!-- TODO: the repository manager should be able to produce a page like this. Ensure all descriptions are in the POM of these plugins. --> @@ -141,7 +141,7 @@ under the License. |**Plugin** (see [complete list with version](https://www.mojohaus.org/plugins.html))|**Description**| |---|---| |[ `animal-sniffer`](https://www.mojohaus.org/animal-sniffer/animal-sniffer-maven-plugin/)|Build signatures of APIs (JDK for example) and checks your classes against them.| -|[ `build-helper`](https://www.mojohaus.org/build-helper-maven-plugin/)|Attach extra artifacts and source directories to build.| +|[ `build-helper`](https://www.mojohaus.org/build-helper-maven-plugin/)|Attach extra artifacts and source folders to build.| |[ `buildplan`](https://www.mojohaus.org/buildplan-maven-plugin/)|Inspect the lifecycle of your build.| |[ `castor`](https://www.mojohaus.org/castor-maven-plugin/)|Generate sources from an XSD using Castor.| |[ `clirr`](https://www.mojohaus.org/clirr-maven-plugin/)|Compare binaries or sources for compatibility using Clirr| diff --git a/content/markdown/plugins/localization.md b/content/markdown/plugins/localization.md index a4874e93..51b6d210 100644 --- a/content/markdown/plugins/localization.md +++ b/content/markdown/plugins/localization.md @@ -60,7 +60,7 @@ under the License. - Check out the source code for the plugin you want to add a translation to. - - Find the resource bundles that needs to be translated. They are often found in the `src/main/resources` directory. + - Find the resource bundles that needs to be translated. They are often found in the `src/main/resources` folder. - Copy the basefile for the bundle, i.e. the one **without** a language extension. The copy should have the same name as the original file, except for the addition of a language extension. If, for example, you want to translate the Checkstyle Plugin into Spanish, you would copy `src/main/resources/checkstyle-report.properties` to `src/main/resources/checkstyle-report_es.properties`. diff --git a/content/markdown/security-plexus-archiver.md b/content/markdown/security-plexus-archiver.md index 49decd71..6c6829c4 100644 --- a/content/markdown/security-plexus-archiver.md +++ b/content/markdown/security-plexus-archiver.md @@ -23,7 +23,7 @@ an arbitrary file write generic vulnerability, that can be achieved using a specially crafted zip (or bzip2, gzip, tar, xz, war) archive, that holds path traversal filenames. So when the filename gets concatenated to the target extraction directory, if the extraction tool used does not make -sufficient checks, the final path ends up outside of the target directory. +sufficient checks, the final path ends up outside of the target folder. The Apache Maven team has been informed because the plexus-archiver library did not make sufficient checks and it is a library used by most of the diff --git a/content/markdown/security.md b/content/markdown/security.md index 6ef1552d..cea1c2e6 100644 --- a/content/markdown/security.md +++ b/content/markdown/security.md @@ -77,7 +77,7 @@ an arbitrary file write generic vulnerability, that can be achieved using a specially crafted zip (or bzip2, gzip, tar, xz, war) archive, that holds path traversal filenames. So when the filename gets concatenated to the target extraction directory, if the extraction tool used does not make -sufficient checks, the final path ends up outside of the target directory. +sufficient checks, the final path ends up outside of the target folder. The affected plugins use plexus-archiver to unpack dependencies to disk and have been identified as potential triggers for exposing the vulnerability if dependencies are compromised.
