This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git
The following commit(s) were added to refs/heads/master by this push: new 03afe84 syntax color fixes 03afe84 is described below commit 03afe84af2c230bb7e30b33dc0ddc3df75d95a51 Author: Hervé Boutemy <hbout...@apache.org> AuthorDate: Sat Jun 6 11:00:43 2020 +0200 syntax color fixes --- .../guides/introduction/introduction-to-plugins.apt | 4 ++-- .../guides/introduction/introduction-to-profiles.apt | 12 ++++++------ .../guides/introduction/introduction-to-the-pom.apt | 16 ++++++++-------- .../guide-building-for-different-environments.apt | 4 ++-- content/apt/guides/mini/guide-configuring-maven.apt | 8 ++++---- .../apt/guides/mini/guide-creating-archetypes.apt | 4 ++-- content/apt/guides/mini/guide-encryption.apt | 16 ++++++++-------- content/apt/guides/mini/guide-maven-classloading.apt | 10 +++++----- content/apt/guides/mini/guide-new-committers.apt | 2 +- content/apt/guides/mini/guide-snippet-macro.apt | 20 ++++++++++---------- .../guides/mini/guide-using-one-source-directory.apt | 8 ++++---- content/apt/guides/mini/guide-using-toolchains.apt | 10 +++++----- 12 files changed, 57 insertions(+), 57 deletions(-) diff --git a/content/apt/guides/introduction/introduction-to-plugins.apt b/content/apt/guides/introduction/introduction-to-plugins.apt index 6ac2401..cde9507 100644 --- a/content/apt/guides/introduction/introduction-to-plugins.apt +++ b/content/apt/guides/introduction/introduction-to-plugins.apt @@ -60,7 +60,7 @@ Introduction to Maven Plugin Development * What is a Mojo (<And Why the H--- is it Named 'Mojo'>)? - A Mojo is really just a goal in Maven, and plug-ins consist of + A Mojo is really just a <<goal>> in Maven, and plug-ins consist of any number of goals (Mojos). Mojos can be defined as annotated Java classes or Beanshell script. A Mojo specifies metadata about a goal: a goal name, which phase of the lifecycle it fits into, @@ -75,7 +75,7 @@ Introduction to Maven Plugin Development * What is the Build Lifecycle? (Overview) - The build lifecycle is a series of common stages through which all project + The build lifecycle is a series of common <<stage>>s through which all project builds naturally progress. Plugin goals are bound to specific stages in the lifecycle. diff --git a/content/apt/guides/introduction/introduction-to-profiles.apt b/content/apt/guides/introduction/introduction-to-profiles.apt index 218ba61..3b2b7d2 100644 --- a/content/apt/guides/introduction/introduction-to-profiles.apt +++ b/content/apt/guides/introduction/introduction-to-profiles.apt @@ -624,11 +624,11 @@ mvn -Denv=production integration-test activation property of "env=dev" together with the source where it was declared. See sample below. -+---+ +--- The following profiles are active: - appserverConfig-dev (source: pom) -+---+ +--- Now if we have a profile declared in <<<settings.xml>>> (refer to the sample of profile in <<<settings.xml>>>) and that have been set to be an active profile and execute: @@ -639,11 +639,11 @@ The following profiles are active: The result should be something like this -+---+ +--- The following profiles are active: - appserverConfig (source: settings.xml) -+---+ +--- Even though we don't have an activation property, a profile has been listed as active. Why? Like we mentioned before, a profile that has been set as an active profile @@ -659,12 +659,12 @@ The following profiles are active: This will list the activated profiles: -+---+ +--- The following profiles are active: - appserverConfig-dev (source: pom) - appserverConfig (source: settings.xml) -+---+ +--- Even though it listed the two active profiles, we are not sure which one of them has been applied. To see the effect on the build execute: diff --git a/content/apt/guides/introduction/introduction-to-the-pom.apt b/content/apt/guides/introduction/introduction-to-the-pom.apt index 0e1256f..c07641d 100644 --- a/content/apt/guides/introduction/introduction-to-the-pom.apt +++ b/content/apt/guides/introduction/introduction-to-the-pom.apt @@ -236,13 +236,13 @@ Introduction to the POM But what if the parent is not yet installed and if the directory structure is as in the following example? -+-----+ +----- . |-- my-module | `-- pom.xml `-- parent `-- pom.xml -+-----+ +----- *** The Solution @@ -309,12 +309,12 @@ Introduction to the POM <<directory structure>> -+-----+ +----- . |-- my-module | `-- pom.xml `-- pom.xml -+-----+ +----- *** The Solution @@ -351,13 +351,13 @@ Introduction to the POM But what if we change the directory structure to the following: -+-----+ +----- . |-- my-module | `-- pom.xml `-- parent `-- pom.xml -+-----+ +----- How would the parent POM specify its modules? @@ -433,13 +433,13 @@ Introduction to the POM and this <<directory structure>> -+-----+ +----- . |-- my-module | `-- pom.xml `-- parent `-- pom.xml -+-----+ +----- *** The Solution diff --git a/content/apt/guides/mini/guide-building-for-different-environments.apt b/content/apt/guides/mini/guide-building-for-different-environments.apt index 2fd757c..b1813f5 100644 --- a/content/apt/guides/mini/guide-building-for-different-environments.apt +++ b/content/apt/guides/mini/guide-building-for-different-environments.apt @@ -68,7 +68,7 @@ src/ In the project descriptor, you need to configure the different profiles. Only the test profile is showed here. ----- ++----+ <profiles> <profile> <id>test</id> @@ -119,7 +119,7 @@ src/ .. Other profiles go here .. </profiles> ----- ++----+ Three things are configured in this snippet: diff --git a/content/apt/guides/mini/guide-configuring-maven.apt b/content/apt/guides/mini/guide-configuring-maven.apt index 9306b87..cc1652e 100644 --- a/content/apt/guides/mini/guide-configuring-maven.apt +++ b/content/apt/guides/mini/guide-configuring-maven.apt @@ -55,13 +55,13 @@ Configuring Maven The location of your local repository can be changed in your user configuration. The default value is <<<$\{user.home\}/.m2/repository/>>>. -------------- ++-------------+ <settings> ... <localRepository>/path/to/local/repo/</localRepository> ... </settings> -------------- ++-------------+ <<Note:>> The local repository must be an absolute path. @@ -100,7 +100,7 @@ export MAVEN_OPTS=-Dmaven.artifact.threads=3 only SCP deployments and file deployments are supported by default, so only the following SCP configuration is needed: -------------- ++-------------+ <settings> ... <servers> @@ -117,7 +117,7 @@ export MAVEN_OPTS=-Dmaven.artifact.threads=3 </servers> ... </settings> -------------- ++-------------+ To encrypt passwords in these sections, refer to {{{./guide-encryption.html} Encryption Settings}}. diff --git a/content/apt/guides/mini/guide-creating-archetypes.apt b/content/apt/guides/mini/guide-creating-archetypes.apt index c01aa3d..0f10ae1 100644 --- a/content/apt/guides/mini/guide-creating-archetypes.apt +++ b/content/apt/guides/mini/guide-creating-archetypes.apt @@ -133,7 +133,7 @@ Guide to Creating Archetypes Thus the quickstart archetype shown above defines the following directory structure: -+----+ +---- archetype |-- pom.xml @@ -153,7 +153,7 @@ archetype `-- java `-- AppTest.java -+----+ +---- * 3. Create the prototype files and the prototype pom.xml diff --git a/content/apt/guides/mini/guide-encryption.apt b/content/apt/guides/mini/guide-encryption.apt index c9630c4..20dcc2b 100644 --- a/content/apt/guides/mini/guide-encryption.apt +++ b/content/apt/guides/mini/guide-encryption.apt @@ -78,9 +78,9 @@ mvn --encrypt-master-password <password> This command will produce an encrypted version of the password, something like -+------------------------------------+ +------------------------------------ {jSMOWnoPFgsHVpMvz5VrIt5kRbzGpI8u+9EF1iFQyJQ=} -+------------------------------------+ +------------------------------------ Store this password in the <<<$\{user.home\}/.m2/settings-security.xml>>>; it should look like @@ -104,9 +104,9 @@ mvn --encrypt-password <password> This command produces an encrypted version of it, something like -+------------------------------------+ +------------------------------------ {COQLCE6DU6GtcS5P=} -+------------------------------------+ +------------------------------------ Copy and paste it into the servers section of your <<<settings.xml>>> file. This will look like: @@ -195,15 +195,15 @@ mvn deploy:deploy-file -Durl=https://maven.corp.com/repo \ You can do this with the widely used '\' escape character. If your password looks like this: -+---+ +----- jSMOWnoPFgsHVpMvz5VrIt5kRbzGpI8u+{EF1iFQyJQ= -+---+ +----- Then, the value you would add to your settings.xml looks like this: -+---+ +----- {jSMOWnoPFgsHVpMvz5VrIt5kRbzGpI8u+\{EF1iFQyJQ=} -+---+ +----- ** Password Security diff --git a/content/apt/guides/mini/guide-maven-classloading.apt b/content/apt/guides/mini/guide-maven-classloading.apt index 86d727d..7215d24 100644 --- a/content/apt/guides/mini/guide-maven-classloading.apt +++ b/content/apt/guides/mini/guide-maven-classloading.apt @@ -53,12 +53,12 @@ Guide to Maven Classloading An Ant script like this will show the contents of the system classloader: ---- ++---+ <target name="info"> <echo>java.class.path=${java.class.path}</echo> </target> ---- - ++---+ + * 2. {Core Classloader} @@ -86,7 +86,7 @@ Guide to Maven Classloading Here is a sample of adding <<<ant-nodeps>>> to the plugin classloader of the Antrun Plugin and hereby enabling the use of additional/optional Ant tasks: ---- ++---+ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> @@ -100,7 +100,7 @@ Guide to Maven Classloading </dependencies> ... </plugin> ---- ++---+ Plugins can inspect their effective runtime class path via the expressions <<<$\{plugin.artifacts\}>>> or <<<$\{plugin.artifactMap\}>>> to have a list or map, respectively, of resolved artifacts injected from the diff --git a/content/apt/guides/mini/guide-new-committers.apt b/content/apt/guides/mini/guide-new-committers.apt index d29938f..ae216d2 100644 --- a/content/apt/guides/mini/guide-new-committers.apt +++ b/content/apt/guides/mini/guide-new-committers.apt @@ -26,7 +26,7 @@ ~~ NOTE: For help with the syntax of this file, see: ~~ http://maven.apache.org/doxia/references/apt-format.html -Guide for new commiters +Guide for new committers First thing is to sort out some administrative tasks. Before your account is created and commit access granted you must complete and fax back to diff --git a/content/apt/guides/mini/guide-snippet-macro.apt b/content/apt/guides/mini/guide-snippet-macro.apt index e6533f5..151ae52 100644 --- a/content/apt/guides/mini/guide-snippet-macro.apt +++ b/content/apt/guides/mini/guide-snippet-macro.apt @@ -57,18 +57,18 @@ Guide to the Snippet Macro ** Java ------ ++----- // START SNIPPET: snip-id public static void main( String[] args ) { System.out.println( "Hello World!" ); } // END SNIPPET: snip-id ------ ++----- ** XML ------ ++----- <!-- START SNIPPET: snip-id --> <navigation-rule> <from-view-id>/logon.jsp</from-view-id> @@ -78,37 +78,37 @@ Guide to the Snippet Macro </navigation-case> </navigation-rule> <!-- END SNIPPET: snip-id --> ------ ++----- ** JSP ------- ++------ <%-- START SNIPPET: snip-id --%> <ul> <li><a href="newPerson!input.action">Create</a> a new person</li> <li><a href="listPeople.action">List</a> all people</li> </ul> <%-- END SNIPPET: snip-id --%> ------- ++------ * Snippets in Documentation ** APT ------- ++------ %{snippet|id=snip-id|url=http://svn.example.com/path/to/Sample.java} %{snippet|id=snip-id|url=file:///path/to/Sample.java} ------- ++------ As of doxia-core version 1.0-alpha-9, a 'file' parameter is also available. If a full path is not specified, the location is assumed to be relative to $\{basedir\}. ------- ++------ ~~ Since doxia-core 1.0-alpha-9 %{snippet|id=abc|file=src/main/webapp/index.jsp} ------- ++------ * Macros in apt <<must not>> be indented. diff --git a/content/apt/guides/mini/guide-using-one-source-directory.apt b/content/apt/guides/mini/guide-using-one-source-directory.apt index 119598a..129fcb6 100644 --- a/content/apt/guides/mini/guide-using-one-source-directory.apt +++ b/content/apt/guides/mini/guide-using-one-source-directory.apt @@ -108,7 +108,7 @@ Using Maven When You Can't Use the Conventions First, you set up your <<<pom.xml>>> at the top level not to produce anything, but to include the other modules we plan to create: --------- ++-------- <project> <artifactId>my-parent</artifactId> <packaging>pom</packaging> @@ -118,12 +118,12 @@ Using Maven When You Can't Use the Conventions <module>module</module> </modules> </project> --------- ++-------- Next, the modules themselves are created. Here is the <<<core/pom.xml>>> file you should create. The one in the <<<module>>> subdirectory will be similar. --------- ++-------- <project> <modelVersion>4.0.0</modelVersion> <parent> @@ -148,7 +148,7 @@ Using Maven When You Can't Use the Conventions </plugins> </build> </project> --------- ++-------- In this example, the sources are found in the parent directory <<<../src/main/java>>>, and only Java files within a <<<core>>> package are included. diff --git a/content/apt/guides/mini/guide-using-toolchains.apt b/content/apt/guides/mini/guide-using-toolchains.apt index 07724f0..06b300c 100644 --- a/content/apt/guides/mini/guide-using-toolchains.apt +++ b/content/apt/guides/mini/guide-using-toolchains.apt @@ -59,15 +59,15 @@ Guide to Using Toolchains *-----------------*----------------------------------------------------------------------------------------------+---------------------+----------------+ | jdk | <<<{{{/plugins/maven-surefire-plugin/}maven-surefire-plugin}}>>> | 2.5 | Apache Maven *-----------------*----------------------------------------------------------------------------------------------+---------------------+----------------+ -| jdk | <<<{{{https://www.mojohaus.org/animal-sniffer/animal-sniffer-maven-plugin/}animal-sniffer-maven-plugin}}>>> | 1.3 | Codehaus Mojo +| jdk | <<<{{{https://www.mojohaus.org/animal-sniffer/animal-sniffer-maven-plugin/}animal-sniffer-maven-plugin}}>>> | 1.3 | MojoHaus *-----------------*----------------------------------------------------------------------------------------------+---------------------+----------------+ -| jdk | <<<{{{https://www.mojohaus.org/cassandra-maven-plugin/}cassandra-maven-plugin}}>>> | 0.7.0-1 | Codehaus Mojo +| jdk | <<<{{{https://www.mojohaus.org/cassandra-maven-plugin/}cassandra-maven-plugin}}>>> | 0.7.0-1 | MojoHaus *-----------------*----------------------------------------------------------------------------------------------+---------------------+----------------+ -| jdk | <<<{{{https://www.mojohaus.org/exec-maven-plugin/}exec-maven-plugin}}>>> | 1.1.1 | Codehaus Mojo +| jdk | <<<{{{https://www.mojohaus.org/exec-maven-plugin/}exec-maven-plugin}}>>> | 1.1.1 | MojoHaus *-----------------*----------------------------------------------------------------------------------------------+---------------------+----------------+ -| jdk | <<<{{{https://www.mojohaus.org/jdiff-maven-plugin/}jdiff-maven-plugin}}>>> | 1.0-beta-1-SNAPSHOT | Codehaus Mojo +| jdk | <<<{{{https://www.mojohaus.org/jdiff-maven-plugin/}jdiff-maven-plugin}}>>> | 1.0-beta-1-SNAPSHOT | MojoHaus *-----------------*----------------------------------------------------------------------------------------------+---------------------+----------------+ -| jdk | <<<{{{https://www.mojohaus.org/keytool/keytool-maven-plugin/}keytool-maven-plugin}}>>> | 1.4 | Codehaus Mojo +| jdk | <<<{{{https://www.mojohaus.org/keytool/keytool-maven-plugin/}keytool-maven-plugin}}>>> | 1.4 | MojoHaus *-----------------*----------------------------------------------------------------------------------------------+---------------------+----------------+ | protobuf | <<<{{{http://sergei-ivanov.github.io/maven-protoc-plugin/examples/protobuf-toolchain.html}maven-protoc-plugin}}>>> | 0.3.2 | github *-----------------*----------------------------------------------------------------------------------------------+---------------------+----------------+