This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag slingstart-maven-plugin-1.7.4 in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit b23cac5cf8935c4d983cd15b942c90a00bdf74a0 Author: Carsten Ziegeler <[email protected]> AuthorDate: Wed Apr 26 06:56:13 2017 +0000 SLING-6792 : Attached provisioning model should be the raw model git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1792698 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/sling/maven/slingstart/ModelPreprocessor.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java b/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java index d275fb9..73770de 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java +++ b/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java @@ -52,7 +52,6 @@ import org.apache.sling.provisioning.model.ModelUtility.ResolverOptions; import org.apache.sling.provisioning.model.RunMode; import org.apache.sling.provisioning.model.Traceable; import org.apache.sling.provisioning.model.io.ModelReader; -import org.codehaus.plexus.component.configurator.converters.basic.BooleanConverter; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.xml.Xpp3Dom; @@ -66,7 +65,7 @@ public class ModelPreprocessor { public boolean done = false; public Model model; public boolean extendMavenClassPath = true; - public final Map<org.apache.sling.provisioning.model.Artifact, Model> includedModels = new HashMap<org.apache.sling.provisioning.model.Artifact, Model>(); + public final Map<org.apache.sling.provisioning.model.Artifact, Model> includedModels = new HashMap<>(); } @@ -75,7 +74,7 @@ public class ModelPreprocessor { public ArtifactResolver resolver; public MavenSession session; public Logger logger; - public final Map<String, ProjectInfo> modelProjects = new HashMap<String, ProjectInfo>(); + public final Map<String, ProjectInfo> modelProjects = new HashMap<>(); } /** @@ -137,7 +136,7 @@ public class ModelPreprocessor { // process attachments processAttachments(env, info); - + // is the maven classpath supposed to be extended? info.extendMavenClassPath = !nodeBooleanValue(info.plugin, AbstractSlingStartMojo.CONFIGURATION_NAME_DISABLE_EXTENDING_CLASSPATH, false); @@ -169,7 +168,6 @@ public class ModelPreprocessor { this.mergeModels(info.model, d); } this.mergeModels(info.model, info.localModel); - info.localModel = info.model; info.model = ModelUtility.getEffectiveModel(info.model, resolverOptions); final Map<Traceable, String> errors = ModelUtility.validate(info.model); @@ -269,12 +267,12 @@ public class ModelPreprocessor { final Model effectiveModel) throws MavenExecutionException { // slingstart or slingfeature - final List<Model> dependencies = new ArrayList<Model>(); + final List<Model> dependencies = new ArrayList<>(); for(final Feature feature : effectiveModel.getFeatures()) { for(final RunMode runMode : feature.getRunModes()) { for(final ArtifactGroup group : runMode.getArtifactGroups()) { - final List<org.apache.sling.provisioning.model.Artifact> removeList = new ArrayList<org.apache.sling.provisioning.model.Artifact>(); + final List<org.apache.sling.provisioning.model.Artifact> removeList = new ArrayList<>(); for(final org.apache.sling.provisioning.model.Artifact a : group) { if ( a.getType().equals(BuildConstants.PACKAGING_SLINGSTART) || a.getType().equals(BuildConstants.PACKAGING_PARTIAL_SYSTEM)) { @@ -515,7 +513,7 @@ public class ModelPreprocessor { final Logger logger) throws MavenExecutionException, IOException { final Pattern p = Pattern.compile(pattern); - final List<String> candidates = new ArrayList<String>(); + final List<String> candidates = new ArrayList<>(); if ( modelDirectory != null && modelDirectory.exists() ) { for(final File f : modelDirectory.listFiles() ) { if ( f.isFile() && !f.getName().startsWith(".") ) { -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
