You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2018/11/15 11:27:31 UTC
[sling-slingfeature-maven-plugin] branch master updated: Use
correct field names for configurations and adjust tests to use correct
configuration syntax
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 586c57a Use correct field names for configurations and adjust tests to use correct configuration syntax
586c57a is described below
commit 586c57a52f117784c4c506fa1103222c545e8cd1
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Nov 15 12:27:06 2018 +0100
Use correct field names for configurations and adjust tests to use correct configuration syntax
---
src/it/analyzer-apiregions-errors-detected/pom.xml | 4 +--
src/it/attach-metadata-from-pom/pom.xml | 13 +++-----
src/it/schema-validation-ko/pom.xml | 9 ------
src/it/variables-interpolator/pom.xml | 8 ++---
.../maven/mojos/AbstractIncludingFeatureMojo.java | 26 ++++++++--------
.../sling/feature/maven/mojos/Aggregate.java | 5 +--
.../maven/mojos/FeatureSelectionConfig.java | 36 +++++++++++-----------
.../sling/feature/maven/mojos/Repository.java | 14 +++++----
.../sling/feature/maven/mojos/RepositoryMojo.java | 2 +-
.../org/apache/sling/feature/maven/mojos/Scan.java | 11 ++++---
10 files changed, 58 insertions(+), 70 deletions(-)
diff --git a/src/it/analyzer-apiregions-errors-detected/pom.xml b/src/it/analyzer-apiregions-errors-detected/pom.xml
index b269708..78d3fd3 100644
--- a/src/it/analyzer-apiregions-errors-detected/pom.xml
+++ b/src/it/analyzer-apiregions-errors-detected/pom.xml
@@ -40,8 +40,8 @@
<configuration>
<scans>
<scan>
- <includes>**/*.json</includes>
- <includeTasks>api-regions-dependencies</includeTasks>
+ <filesInclude>**/*.json</filesInclude>
+ <includeTask>api-regions-dependencies</includeTask>
<taskConfiguration>
<api-regions-dependencies>
<property>
diff --git a/src/it/attach-metadata-from-pom/pom.xml b/src/it/attach-metadata-from-pom/pom.xml
index f20a773..403fffa 100644
--- a/src/it/attach-metadata-from-pom/pom.xml
+++ b/src/it/attach-metadata-from-pom/pom.xml
@@ -51,12 +51,10 @@
<goal>aggregate-features</goal>
</goals>
<configuration>
- <aggregateClassifier>metadata-test</aggregateClassifier>
<aggregates>
- <aggregate>
- <includes>
- <include>metadata-test.json</include>
- </includes>
+ <aggregate>
+ <classifier>metadata-test</classifier>
+ <filesInclude>metadata-test.json</filesInclude>
</aggregate>
</aggregates>
</configuration>
@@ -67,13 +65,10 @@
<goals>
<goal>attach-features</goal>
</goals>
- <configuration>
- <addPomMetadata>true</addPomMetadata>
- </configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
-
\ No newline at end of file
+
diff --git a/src/it/schema-validation-ko/pom.xml b/src/it/schema-validation-ko/pom.xml
index 185ab58..f47c9aa 100644
--- a/src/it/schema-validation-ko/pom.xml
+++ b/src/it/schema-validation-ko/pom.xml
@@ -28,15 +28,6 @@
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<extensions>true</extensions>
- <executions>
- <execution>
- <id>analyze</id>
- <phase>validate</phase>
- <goals>
- <goal>features-schema-validation</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git a/src/it/variables-interpolator/pom.xml b/src/it/variables-interpolator/pom.xml
index 80bd852..75a3790 100644
--- a/src/it/variables-interpolator/pom.xml
+++ b/src/it/variables-interpolator/pom.xml
@@ -57,12 +57,10 @@
<goal>aggregate-features</goal>
</goals>
<configuration>
- <aggregateClassifier>interpolator-test</aggregateClassifier>
<aggregates>
- <aggregate>
- <includes>
- <include>interpolated-variables.json</include>
- </includes>
+ <aggregate>
+ <classifier>interpolator-test</classifier>
+ <filesInclude>interpolated-variables.json</filesInclude>
</aggregate>
</aggregates>
</configuration>
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/AbstractIncludingFeatureMojo.java b/src/main/java/org/apache/sling/feature/maven/mojos/AbstractIncludingFeatureMojo.java
index 47fb474..de050d7 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/AbstractIncludingFeatureMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/AbstractIncludingFeatureMojo.java
@@ -72,19 +72,19 @@ public abstract class AbstractIncludingFeatureMojo extends AbstractFeatureMojo {
throws MojoExecutionException {
final Map<String, Feature> projectFeatures = ProjectHelper.getAssembledFeatures(this.project);
boolean includeAll = false;
- for (final String c : config.getClassifiers()) {
+ for (final String c : config.getIncludeClassifiers()) {
if ("*".equals(c)) {
includeAll = true;
}
}
- if (includeAll && config.getClassifiers().size() > 1) {
+ if (includeAll && config.getIncludeClassifiers().size() > 1) {
throw new MojoExecutionException("Match all (*) and additional classifiers are specified.");
}
for (final Map.Entry<String, Feature> entry : projectFeatures.entrySet()) {
final String classifier = entry.getValue().getId().getClassifier();
boolean include = includeAll;
if (!include) {
- for (final String c : config.getClassifiers()) {
+ for (final String c : config.getIncludeClassifiers()) {
if (c.trim().length() == 0 && classifier == null) {
include = true;
} else if (c.equals(classifier)) {
@@ -101,24 +101,24 @@ public abstract class AbstractIncludingFeatureMojo extends AbstractFeatureMojo {
private void selectFeatureFiles(final FeatureSelectionConfig config, final Map<String, Feature> selection)
throws MojoExecutionException {
// neither includes nor excludes - don't select any file
- if (config.getIncludes().isEmpty() && config.getExcludes().isEmpty()) {
+ if (config.getFilesIncludes().isEmpty() && config.getFilesExcludes().isEmpty()) {
return;
}
final Map<String, Feature> projectFeatures = ProjectHelper.getAssembledFeatures(this.project);
final String prefix = this.features.toPath().normalize().toFile().getAbsolutePath().concat(File.separator);
- if (config.getIncludes().isEmpty()) {
+ if (config.getFilesIncludes().isEmpty()) {
final FeatureScanner scanner = new FeatureScanner(projectFeatures, prefix);
- if (!config.getExcludes().isEmpty()) {
- scanner.setExcludes(config.getExcludes().toArray(new String[config.getExcludes().size()]));
+ if (!config.getFilesExcludes().isEmpty()) {
+ scanner.setExcludes(config.getFilesExcludes().toArray(new String[config.getFilesExcludes().size()]));
}
scanner.scan();
selection.putAll(scanner.getIncluded());
} else {
- for (final String include : config.getIncludes()) {
+ for (final String include : config.getFilesIncludes()) {
final FeatureScanner scanner = new FeatureScanner(projectFeatures, prefix);
- if (!config.getExcludes().isEmpty()) {
- scanner.setExcludes(config.getExcludes().toArray(new String[config.getExcludes().size()]));
+ if (!config.getFilesExcludes().isEmpty()) {
+ scanner.setExcludes(config.getFilesExcludes().toArray(new String[config.getFilesExcludes().size()]));
}
scanner.setIncludes(new String[] { include });
scanner.scan();
@@ -129,8 +129,8 @@ public abstract class AbstractIncludingFeatureMojo extends AbstractFeatureMojo {
selection.putAll(scanner.getIncluded());
}
}
- if (!config.getExcludes().isEmpty()) {
- for (final String exclude : config.getExcludes()) {
+ if (!config.getFilesExcludes().isEmpty()) {
+ for (final String exclude : config.getFilesExcludes()) {
if (!exclude.contains("*")) {
final FeatureScanner scanner = new FeatureScanner(projectFeatures, prefix);
scanner.setIncludes(new String[] { exclude });
@@ -145,7 +145,7 @@ public abstract class AbstractIncludingFeatureMojo extends AbstractFeatureMojo {
private void selectFeatureArtifacts(final FeatureSelectionConfig config, final Map<String, Feature> selection)
throws MojoExecutionException {
- for (final Dependency dep : config.getArtifacts()) {
+ for (final Dependency dep : config.getIncludeArtifacts()) {
final ArtifactId id = ProjectHelper.toArtifactId(dep);
if (ProjectHelper.isLocalProjectArtifact(this.project, id)) {
throw new MojoExecutionException(
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/Aggregate.java b/src/main/java/org/apache/sling/feature/maven/mojos/Aggregate.java
index e4d06d3..54a04fa 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/Aggregate.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/Aggregate.java
@@ -57,8 +57,9 @@ public class Aggregate extends FeatureSelectionConfig {
@Override
public String toString() {
- return "Aggregate [filesIncludes=" + getIncludes() + ", filesExcludes=" + getExcludes() + ", includeArtifact="
- + getArtifacts() + ", includeClassifier=" + getClassifiers() + ", classifier=" + classifier
+ return "Aggregate [filesIncludes=" + getFilesIncludes() + ", filesExcludes=" + getFilesExcludes()
+ + ", includeArtifacts=" + getIncludeArtifacts() + ", includeClassifiers=" + getIncludeClassifiers()
+ + ", classifier=" + classifier
+ ", markAsFinal=" + markAsFinal + ", markAsComplete=" + markAsComplete + ", title=" + title
+ ", description=" + description + ", vendor=" + vendor + ", variables="
+ variables + ", frameworkProperties=" + frameworkProperties + "]";
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/FeatureSelectionConfig.java b/src/main/java/org/apache/sling/feature/maven/mojos/FeatureSelectionConfig.java
index 702762f..2d860bb 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/FeatureSelectionConfig.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/FeatureSelectionConfig.java
@@ -23,52 +23,52 @@ import org.apache.maven.model.Dependency;
public class FeatureSelectionConfig {
- private List<String> includes = new ArrayList<>();
+ private List<String> filesIncludes = new ArrayList<>();
- private List<String> excludes = new ArrayList<>();
+ private List<String> filesExcludes = new ArrayList<>();
- private List<Dependency> artifacts = new ArrayList<>();
+ private List<Dependency> includeArtifacts = new ArrayList<>();
- private List<String> featureClassifiers = new ArrayList<>();
+ private List<String> includeClassifiers = new ArrayList<>();
public FeatureSelectionConfig() {
}
public void setFilesInclude(final String val) {
- includes.add(val);
+ filesIncludes.add(val);
}
public void setFilesExclude(final String val) {
- excludes.add(val);
+ filesExcludes.add(val);
}
public void setIncludeArtifact(final Dependency a) {
- artifacts.add(a);
+ includeArtifacts.add(a);
}
public void setIncludeClassifier(final String classifier) {
- featureClassifiers.add(classifier);
+ includeClassifiers.add(classifier);
}
- public List<String> getIncludes() {
- return this.includes;
+ public List<String> getFilesIncludes() {
+ return this.filesIncludes;
}
- public List<String> getExcludes() {
- return this.excludes;
+ public List<String> getFilesExcludes() {
+ return this.filesExcludes;
}
- public List<String> getClassifiers() {
- return this.featureClassifiers;
+ public List<String> getIncludeClassifiers() {
+ return this.includeClassifiers;
}
- public List<Dependency> getArtifacts() {
- return this.artifacts;
+ public List<Dependency> getIncludeArtifacts() {
+ return this.includeArtifacts;
}
@Override
public String toString() {
- return "FeatureSelectionConfig [filesIncludes=" + includes + ", filesExcludes=" + excludes
- + ", includeArtifact=" + artifacts + ", includeClassifier=" + featureClassifiers + "]";
+ return "FeatureSelectionConfig [filesIncludes=" + filesIncludes + ", filesExcludes=" + filesExcludes
+ + ", includeArtifacts=" + includeArtifacts + ", includeClassifiers=" + includeClassifiers + "]";
}
}
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/Repository.java b/src/main/java/org/apache/sling/feature/maven/mojos/Repository.java
index 5b3ee26..c7ed966 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/Repository.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/Repository.java
@@ -23,7 +23,7 @@ import org.apache.maven.model.Dependency;
public class Repository extends FeatureSelectionConfig {
- private List<Dependency> embeds = new ArrayList<>();
+ private List<Dependency> embedArtifacts = new ArrayList<>();
/**
* The directory for the repository to store. This directory is relative to the
@@ -32,17 +32,19 @@ public class Repository extends FeatureSelectionConfig {
public String repositoryDir = "artifacts";
public void setEmbedArtifact(final Dependency dep) {
- this.embeds.add(dep);
+ this.embedArtifacts.add(dep);
}
- public List<Dependency> getEmbeds() {
- return this.embeds;
+ public List<Dependency> getEmbedArtifacts() {
+ return this.embedArtifacts;
}
@Override
public String toString() {
- return "Repository [filesIncludes=" + getIncludes() + ", filesExcludes=" + getExcludes() + ", includeArtifact="
- + getArtifacts() + ", includeClassifier=" + getClassifiers() + ", embeds=" + embeds + ", repositoryDir="
+ return "Repository [filesIncludes=" + getFilesIncludes() + ", filesExcludes=" + getFilesExcludes()
+ + ", includeArtifacts=" + getIncludeArtifacts() + ", includeClassifiers=" + getIncludeClassifiers()
+ + ", embedArtifacts="
+ + embedArtifacts + ", repositoryDir="
+ repositoryDir + "]";
}
}
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/RepositoryMojo.java b/src/main/java/org/apache/sling/feature/maven/mojos/RepositoryMojo.java
index edaae60..7102b50 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/RepositoryMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/RepositoryMojo.java
@@ -53,7 +53,7 @@ public class RepositoryMojo extends AbstractRepositoryMojo {
for (final Repository rep : this.repositories) {
final Map<String, Feature> selection = this.getSelectedFeatures(rep);
final File artifactDir = new File(this.project.getBuild().getDirectory(), rep.repositoryDir);
- this.doExecute(artifactDir, selection, rep.getEmbeds());
+ this.doExecute(artifactDir, selection, rep.getEmbedArtifacts());
}
}
}
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/Scan.java b/src/main/java/org/apache/sling/feature/maven/mojos/Scan.java
index 15d9cb1..0936996 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/Scan.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/Scan.java
@@ -16,15 +16,15 @@
*/
package org.apache.sling.feature.maven.mojos;
-import org.apache.maven.model.Dependency;
-import org.apache.sling.feature.maven.ProjectHelper;
-
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import org.apache.maven.model.Dependency;
+import org.apache.sling.feature.maven.ProjectHelper;
+
public class Scan extends FeatureSelectionConfig {
private Set<String> includeTasks = new HashSet<>();
@@ -69,8 +69,9 @@ public class Scan extends FeatureSelectionConfig {
@Override
public String toString() {
- return "Scan [filesIncludes=" + getIncludes() + ", filesExcludes=" + getExcludes() + ", includeArtifact="
- + getArtifacts() + ", includeClassifier=" + getClassifiers() + "includeTasks=" + includeTasks
+ return "Scan [filesIncludes=" + getFilesIncludes() + ", filesExcludes=" + getFilesExcludes()
+ + ", includeArtifacts=" + getIncludeArtifacts() + ", includeClassifiers=" + getIncludeClassifiers()
+ + "includeTasks=" + includeTasks
+ ", excludeTasks=" + excludeTasks + ", contextConfiguration=" + taskConfiguration + ", framework="
+ ProjectHelper.toString(framework) + "]";
}