[maven-shade-plugin] branch master updated: [MSHADE-365] put Properties transformers in separate table

[hboutemy]

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-shade-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 830d71a  [MSHADE-365] put Properties transformers in separate table
830d71a is described below

commit 830d71ac38783c9ab060e09bb200e171d43cb7a5
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Wed May 13 03:33:38 2020 +0200

    [MSHADE-365] put Properties transformers in separate table
---
 src/site/apt/examples/resource-transformers.apt.vm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/site/apt/examples/resource-transformers.apt.vm 
b/src/site/apt/examples/resource-transformers.apt.vm
index 1482baa..536adcc 100644
--- a/src/site/apt/examples/resource-transformers.apt.vm
+++ b/src/site/apt/examples/resource-transformers.apt.vm
@@ -47,14 +47,8 @@ Resource Transformers
 
*-----------------------------------------+------------------------------------------+
 | {{ManifestResourceTransformer}}         | Sets entries in the <<<MANIFEST>>> 
      |
 
*-----------------------------------------+------------------------------------------+
-| {{MicroprofileConfigTransformer}}       | Merges conflicting Microprofile 
Config properties based on an ordinal |
-*-----------------------------------------+------------------------------------------+
-| {{OpenWebBeansPropertiesTransformer}}   | Merges Apache OpenWebBeans 
configuration files |
-*-----------------------------------------+------------------------------------------+
 | {{PluginXmlResourceTransformer}}        | Aggregates Mavens <<<plugin.xml>>> 
      |
 
*-----------------------------------------+------------------------------------------+
-| {{PropertiesTransformer}}               | Merges properties files owning an 
ordinal to solve conflicts |
-*-----------------------------------------+------------------------------------------+
 | {{ResourceBundleAppendingTransformer}}  | Merges ResourceBundles             
     | 
 
*-----------------------------------------+------------------------------------------+
 | {{ServicesResourceTransformer}}         | Relocated class names in 
<<<META-INF/services>>> resources and merges them. |
@@ -62,6 +56,15 @@ Resource Transformers
 | {{XmlAppendingTransformer}}             | Adds XML content to an XML 
resource      | 
 
*-----------------------------------------+------------------------------------------+
 Transformers in <<<org.apache.maven.plugins.shade.resource>>>
+
+*-----------------------------------------+------------------------------------------+
+| {{PropertiesTransformer}}               | Merges properties files owning an 
ordinal to solve conflicts |
+*-----------------------------------------+------------------------------------------+
+| {{OpenWebBeansPropertiesTransformer}}   | Merges Apache OpenWebBeans 
configuration files |
+*-----------------------------------------+------------------------------------------+
+| {{MicroprofileConfigTransformer}}       | Merges conflicting Microprofile 
Config properties based on an ordinal |
+*-----------------------------------------+------------------------------------------+
+Transformers in <<<org.apache.maven.plugins.shade.resource.properties>>> 
(available since 3.2.2)
   
 * Merging Plexus Component Descriptors with the 
{ComponentsXmlResourceTransformer}