This is an automated email from the ASF dual-hosted git repository.
davidb 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 f743d79 Update to Features 0.1.3-SNAPSHOT
f743d79 is described below
commit f743d79471c66e71ea2e1f4bec8ef042b3e714ce
Author: David Bosschaert <[email protected]>
AuthorDate: Wed Aug 29 16:04:36 2018 +0100
Update to Features 0.1.3-SNAPSHOT
---
pom.xml | 5 ++--
.../apache/sling/feature/maven/Preprocessor.java | 27 +++++++++++-----------
.../apache/sling/feature/maven/ProjectHelper.java | 5 ++--
.../feature/maven/mojos/AggregateFeatures.java | 7 +++---
.../sling/feature/maven/mojos/AttachFeature.java | 3 +--
.../feature/maven/mojos/AggregateFeaturesTest.java | 6 ++---
6 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index 81ae3f7..6d5350b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,6 +104,7 @@
<excludes>
<exclude>src/site/markdown/**</exclude>
<exclude>src/test/resources/**/*.txt</exclude>
+ <exclude>src/test/resources/**/*.feature</exclude>
</excludes>
</configuration>
</plugin>
@@ -124,12 +125,12 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>0.1.2</version>
+ <version>0.1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.io</artifactId>
- <version>0.1.2</version>
+ <version>0.1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
b/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
index 509e89e..c568cae 100644
--- a/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
+++ b/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
@@ -16,15 +16,6 @@
*/
package org.apache.sling.feature.maven;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
import org.apache.sling.feature.Artifact;
@@ -36,9 +27,17 @@ import org.apache.sling.feature.builder.BuilderContext;
import org.apache.sling.feature.builder.FeatureBuilder;
import org.apache.sling.feature.builder.FeatureProvider;
import org.apache.sling.feature.io.json.FeatureJSONReader;
-import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
import org.codehaus.plexus.logging.Logger;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
/**
* The processor processes all feature projects.
*/
@@ -193,7 +192,7 @@ public class Preprocessor {
// We should pass in an "id" to FeatureJSONReader.read and
later on check the id (again, need to handle ref files)
try (final FileReader reader = new FileReader(file)) {
- final Feature feature = FeatureJSONReader.read(reader, id,
file.getAbsolutePath(), SubstituteVariables.RESOLVE);
+ final Feature feature = FeatureJSONReader.read(reader, id,
file.getAbsolutePath());
this.checkFeatureId(id, feature);
@@ -368,7 +367,7 @@ public class Preprocessor {
if ( config.getInlinedFeature() != null ) {
logger.debug("Reading inlined model from project " +
project.getId());
try (final Reader reader = new
StringReader(config.getInlinedFeature())) {
- feature = FeatureJSONReader.read(reader, id, null,
SubstituteVariables.RESOLVE);
+ feature = FeatureJSONReader.read(reader, id, null);
} catch ( final IOException io) {
throw new RuntimeException("Unable to read inlined feature",
io);
}
@@ -379,7 +378,7 @@ public class Preprocessor {
}
logger.debug("Reading feature " + featureFile + " in project " +
project.getId());
try (final FileReader reader = new FileReader(featureFile)) {
- feature = FeatureJSONReader.read(reader, id,
featureFile.getAbsolutePath(), SubstituteVariables.RESOLVE);
+ feature = FeatureJSONReader.read(reader, id,
featureFile.getAbsolutePath());
} catch ( final IOException io) {
throw new RuntimeException("Unable to read feature " +
featureFile, io);
}
@@ -502,7 +501,7 @@ public class Preprocessor {
// "external" dependency, we can already resolve it
final File featureFile =
ProjectHelper.getOrResolveArtifact(info.project, env.session,
env.artifactHandlerManager, env.resolver, id).getFile();
try (final FileReader r = new FileReader(featureFile)) {
- return FeatureJSONReader.read(r,
featureFile.getAbsolutePath(), SubstituteVariables.RESOLVE);
+ return FeatureJSONReader.read(r,
featureFile.getAbsolutePath());
} catch ( final IOException ioe) {
env.logger.error("Unable to read feature file from " +
featureFile, ioe);
}
diff --git a/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
b/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
index c4d1071..d7c1a2b 100644
--- a/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
+++ b/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
@@ -32,7 +32,6 @@ import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.io.json.FeatureJSONReader;
import org.apache.sling.feature.io.json.FeatureJSONWriter;
-import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.io.IOException;
@@ -96,7 +95,7 @@ public abstract class ProjectHelper {
result = null;
} else {
try ( final StringReader r = new StringReader(text) ) {
- result = FeatureJSONReader.read(r, project.getId(),
SubstituteVariables.RESOLVE);
+ result = FeatureJSONReader.read(r, project.getId());
project.setContextValue(cacheKey, result);
} catch ( final IOException ioe) {
throw new RuntimeException(ioe.getMessage(), ioe);
@@ -125,7 +124,7 @@ public abstract class ProjectHelper {
throw new RuntimeException("Unable to get feature from
internal store.");
}
try ( final StringReader r = new StringReader(text) ) {
- final Feature feature = FeatureJSONReader.read(r,
project.getId(), SubstituteVariables.RESOLVE);
+ final Feature feature = FeatureJSONReader.read(r,
project.getId());
result.add(feature);
} catch ( final IOException ioe) {
throw new RuntimeException(ioe.getMessage(), ioe);
diff --git
a/src/main/java/org/apache/sling/feature/maven/mojos/AggregateFeatures.java
b/src/main/java/org/apache/sling/feature/maven/mojos/AggregateFeatures.java
index 29ea4ae..8256a66 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/AggregateFeatures.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/AggregateFeatures.java
@@ -90,12 +90,13 @@ public class AggregateFeatures extends AbstractFeatureMojo {
.map(Include::new)
.collect(Collectors.toList()));
- Feature result = FeatureBuilder.assemble(newFeature, new
BuilderContext(new FeatureProvider() {
+ BuilderContext builderContext = new BuilderContext(new
FeatureProvider() {
@Override
public Feature provide(ArtifactId id) {
return featureMap.get(id);
}
- }));
+ }); //.add(handlers)
+ Feature result = FeatureBuilder.assemble(newFeature, builderContext);
File aggregatedFeaturesDir = new
File(project.getBuild().getDirectory(),
FeatureConstants.FEATURE_PROCESSED_LOCATION);
aggregatedFeaturesDir.mkdirs();
@@ -174,7 +175,7 @@ public class AggregateFeatures extends AbstractFeatureMojo {
private void readFeatureFromFile(File f, Map<ArtifactId, Feature>
featureMap) throws IOException {
String content = new String(Files.readAllBytes(f.toPath()));
content = Substitution.replaceMavenVars(project, content);
- Feature feat = FeatureJSONReader.read(new StringReader(content), null,
FeatureJSONReader.SubstituteVariables.NONE);
+ Feature feat = FeatureJSONReader.read(new StringReader(content), null);
featureMap.put(feat.getId(), feat);
}
diff --git
a/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java
b/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java
index f5e73e2..0b34382 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java
@@ -24,7 +24,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.io.json.FeatureJSONReader;
-import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
import org.apache.sling.feature.io.json.FeatureJSONWriter;
import org.apache.sling.feature.maven.FeatureConstants;
import org.apache.sling.feature.maven.ProjectHelper;
@@ -96,7 +95,7 @@ public class AttachFeature extends AbstractFeatureMojo {
}
for (File f : featuresDir.listFiles((d,f) -> f.endsWith(".json"))) {
try {
- Feature feat = FeatureJSONReader.read(new FileReader(f), null,
SubstituteVariables.NONE);
+ Feature feat = FeatureJSONReader.read(new FileReader(f), null);
ArtifactId aid = feat.getId();
// Only attach features that have the same GAV, they will
differ in classifier
diff --git
a/src/test/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesTest.java
b/src/test/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesTest.java
index e344f3d..8b86bda 100644
---
a/src/test/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesTest.java
+++
b/src/test/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesTest.java
@@ -132,7 +132,7 @@ public class AggregateFeaturesTest {
File expectedFile = new File(tempDir.toFile(),
FeatureConstants.FEATURE_PROCESSED_LOCATION + "/aggregated.json");
try (Reader fr = new FileReader(expectedFile)) {
- Feature genFeat = FeatureJSONReader.read(fr, null,
FeatureJSONReader.SubstituteVariables.NONE);
+ Feature genFeat = FeatureJSONReader.read(fr, null);
ArtifactId id = genFeat.getId();
assertEquals("org.foo", id.getGroupId());
@@ -196,7 +196,7 @@ public class AggregateFeaturesTest {
File expectedFile = new File(tempDir.toFile(),
FeatureConstants.FEATURE_PROCESSED_LOCATION + "/aggregated.json");
try (Reader fr = new FileReader(expectedFile)) {
- Feature genFeat = FeatureJSONReader.read(fr, null,
FeatureJSONReader.SubstituteVariables.NONE);
+ Feature genFeat = FeatureJSONReader.read(fr, null);
ArtifactId id = genFeat.getId();
assertEquals("org.foo", id.getGroupId());
@@ -288,7 +288,7 @@ public class AggregateFeaturesTest {
File expectedFile = new File(tempDir.toFile(),
FeatureConstants.FEATURE_PROCESSED_LOCATION + "/mynewfeature.json");
try (Reader fr = new FileReader(expectedFile)) {
- Feature genFeat = FeatureJSONReader.read(fr, null,
FeatureJSONReader.SubstituteVariables.NONE);
+ Feature genFeat = FeatureJSONReader.read(fr, null);
ArtifactId id = genFeat.getId();
assertEquals("mygroup", id.getGroupId());
assertEquals("myart", id.getArtifactId());
