[maven-archiver] branch master updated: [MSHARED-782] Deprecated option classpathMavenRepositoryLayout not marked as deprecated in the documentation

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git


The following commit(s) were added to refs/heads/master by this push:
     new a230315  [MSHARED-782] Deprecated option classpathMavenRepositoryLayout not marked as deprecated in the documentation
a230315 is described below

commit a230315ba48432b7c4eab479926ad9b8c098221d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Dec 25 20:36:14 2018 +0100

    [MSHARED-782] Deprecated option classpathMavenRepositoryLayout not marked as deprecated in the documentation
---
 src/site/apt/examples/classpath.apt |  9 ---------
 src/site/xdoc/index.xml.vm          | 12 ------------
 2 files changed, 21 deletions(-)

diff --git a/src/site/apt/examples/classpath.apt b/src/site/apt/examples/classpath.apt
index 12359c1..96a8d2e 100644
--- a/src/site/apt/examples/classpath.apt
+++ b/src/site/apt/examples/classpath.apt
@@ -228,10 +228,6 @@ Class-Path: lib/plexus-utils-1.1.jar lib/commons-lang-2.1.jar
               <addClasspath>true</addClasspath>
               <classpathPrefix>lib/</classpathPrefix>
               <classpathLayoutType>repository</classpathLayoutType>
-
-              <!-- NOTE: Deprecated in version 2.4. Use 'classpathLayoutType' instead.
-              <classpathMavenRepositoryLayout>true</classpathMavenRepositoryLayout>
-              -->
             </manifest>
           </archive>
         </configuration>
@@ -255,11 +251,6 @@ Class-Path: lib/plexus-utils-1.1.jar lib/commons-lang-2.1.jar
 </project>
 +-----+
 
-  <<Note:>> In version 2.3, this feature was available by setting the <<<\<classpathMavenRepositoryLayout\>>>>
-  element to the value <<<true>>>. This configuration option has been *deprecated* in version 2.4,
-  in favor of the more general <<<\<classpathLayoutType\>>>> element, where a value of <<<'repository'>>>
-  will render the same behavior.
-
  The manifest classpath produced using the above configuration would look like this:
 
 +-----+
diff --git a/src/site/xdoc/index.xml.vm b/src/site/xdoc/index.xml.vm
index 89c86ab..0bc7ff3 100644
--- a/src/site/xdoc/index.xml.vm
+++ b/src/site/xdoc/index.xml.vm
@@ -45,7 +45,6 @@
     &lt;addDefaultSpecificationEntries/&gt;
     &lt;addExtensions/&gt;
     &lt;classpathLayoutType/&gt;
-    &lt;classpathMavenRepositoryLayout/&gt;
     &lt;classpathPrefix/&gt;
     &lt;customClasspathLayout/&gt;
     &lt;mainClass/&gt;
@@ -245,17 +244,6 @@ Specification-Vendor: \${project.organization.name}
             <td>2.4</td>
           </tr>
           <tr>
-            <td>classpathMavenRepositoryLayout</td>
-            <td>
-              The created <code>Class-Path</code> entry will contain paths
-              that follow the Maven 2 repository layout:
-              <code>${groupId}/${artifactId}/${version}/${fileName}</code>.
-              The default value is <code>false</code>.
-            </td>
-            <td>boolean</td>
-            <td>2.3</td>
-          </tr>
-          <tr>
             <td>classpathPrefix</td>
             <td>
               A text that will be prefixed to all your <code>Class-Path</code>