diff --git a/pom.xml b/pom.xml index c69602e..d33b750 100644 --- a/pom.xml +++ b/pom.xml @@ -20,9 +20,39 @@ 1.1-SNAPSHOT Maven Tiles Plugin + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + + talios + mark@talios.com + Mark Derricutt + + + richard + richard@bluetrainsoftware.com + Richard Vowles + + + + maoo + maurizio@session.it + + + tony.franca + tonylampada@gmail.com + + - 3.0.4 + 3.2.1 0.1.4 diff --git a/src/main/java/it/session/maven/plugin/TilesMavenLifecycleParticipant.java b/src/main/java/it/session/maven/plugin/TilesMavenLifecycleParticipant.java index 8c2d4ce..3e726a9 100644 --- a/src/main/java/it/session/maven/plugin/TilesMavenLifecycleParticipant.java +++ b/src/main/java/it/session/maven/plugin/TilesMavenLifecycleParticipant.java @@ -69,7 +69,7 @@ public class TilesMavenLifecycleParticipant extends AbstractMavenLifecyclePartic protected static final String TILE_PROPERTY_PREFIX = "tile."; protected final MavenXpp3Reader reader = new MavenXpp3Reader(); - protected final ModelMerger modelMerger = new TilesModelMerger(); + protected final ModelMerger modelMerger = new ModelMerger(); @Requirement protected Logger logger; diff --git a/src/main/java/it/session/maven/plugin/TilesModelMerger.java b/src/main/java/it/session/maven/plugin/TilesModelMerger.java deleted file mode 100644 index 1f1f4a8..0000000 --- a/src/main/java/it/session/maven/plugin/TilesModelMerger.java +++ /dev/null @@ -1,42 +0,0 @@ -package it.session.maven.plugin; - -import org.apache.maven.model.Model; -import org.apache.maven.model.Plugin; -import org.apache.maven.model.PluginExecution; -import org.apache.maven.model.merge.ModelMerger; - -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -/** - * TilesModelMerger by-passes the invocation to ModelMerger.merge() by adding the merge of Plugin configuration. - */ -public class TilesModelMerger extends ModelMerger { - - public void merge(Model target, Model source, boolean sourceDominant, Map hints) { - - Map context = new HashMap(); - if (hints != null) { - context.putAll(hints); - } - - super.merge(target, source, sourceDominant, hints); - - if (source.getBuild() != null) { - super.merge(target, source, sourceDominant, context); - for (Plugin sourcePlugin : source.getBuild().getPlugins()) { - Plugin targetPlugin = target.getBuild().getPluginsAsMap().get(sourcePlugin.getKey()); - super.mergePlugin(targetPlugin, sourcePlugin, sourceDominant, context); - Set> entrySet = targetPlugin.getExecutionsAsMap().entrySet(); - for (Entry entry : entrySet) { - PluginExecution execution = entry.getValue(); - if (execution.getConfiguration() == null) { - execution.setConfiguration(sourcePlugin.getConfiguration()); - } - } - } - } - } -}