You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by si...@apache.org on 2018/11/08 15:48:06 UTC
[sling-slingfeature-maven-plugin] branch schema-validation updated
(1245b9f -> 2cfb9fe)
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a change to branch schema-validation
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git.
from 1245b9f SLING-8032 - Add a MOJO which is able to validate JSON Feature file against the JSON Schema
add a0d1d87 Use default includes
add eb9bc5b Update javadoc
add 9bac856 Don't add dependency to itself
add ff412b9 Add javadoc and more debug logs
add 0a11d70 SLING-8042 : The slingfeature-maven-plugin should be able to derive the name of a feature from the file name
add 774860e Move enhancing the feature from project info to correct place
add f705c22 SLING-8046 : Correct and improve classifier handling
add bc1e97e Optimize aggregate handling
add ca4a1ae Clean up code and add javadocs
add 773785c Normalize path as its used as a key
add ac5d114 SLING-8049 : Add substitution support for project version as OSGi version
add cf2ac3f SLING-8056 : Add support for automatically updating versions in a feature
add a791407 SLING-8056 : Add support for automatically updating versions in a feature
add 3189982 SLING-8038 - adding ArtifacsMojo (duplicating methods from RepositoryMojo for subsequent abstraction)
add afe550c SLING-8038 - moving shared parts of ArtifactsMojo & RepositoryMojo in AbstractRepositoryMojo
add 979cb84 Merge pull request #15 from DominikSuess/issue/SLING-8038
add ea9a125 SLING-8038: Remove a private resolver that isn't needed anymore.
add b1f36a1 SLING-8038 : Clean up mojos, correctly handle local features vs remote features, avoid duplicate code
add 26ad797 Use new analyser result
add 5a73b46 SLING-8028 Split FeatureExtensionHandler into MergeHandler and PostProcessor
add 617a205 SLING-8056 : Add support for automatically updating versions in a feature
add 65289c0 SLING-8028 Split FeatureExtensionHandler into MergeHandler and PostProcessor
add e2aa6b4 SLING-8056 : Add support for automatically updating versions in a feature
add ba5b618 SLING-8028 Split FeatureExtensionHandler into MergeHandler and PostProcessor
add 40e3226 SLING-8056 : Add support for automatically updating versions in a feature
add 4ccb588 SLING-8064 : Support marking a feature as final - allow to mark an aggregate as final, add descriptions to some parameters
add c858e79 Update version to 0.2.1-SNAPSHOT to comply with odd/even version scheme
add d94bcbd SLING-8034 - SlingStart-m-p and SlingFeature-m-p packagetype clash
add 7430396 Use latest snapshot for feature dependencies
add 6a690e7 Remove unused constants
add f635b58 SLING-8058 : Make configuration of slingfeature-maven-plugin consistent
add 3072582 SLING-8058 : Make configuration of slingfeature-maven-plugin consistent
add c0d1803 SLING-8058 : Make configuration of slingfeature-maven-plugin consistent
add 5d06826 SLING-8058 : Make configuration of slingfeature-maven-plugin consistent. Convert aggregate mojo to use new configuraton
add b175e0f SLING-8058 : Make configuration of slingfeature-maven-plugin consistent. Rename configurations
add e6cb135 SLING-8058 : Make configuration of slingfeature-maven-plugin consistent. Adjust versions mojo
add f035d8d SLING-8058 : Make configuration of slingfeature-maven-plugin consistent. Adjust repository mojos
add 0829302 SLING-8058 : Make configuration of slingfeature-maven-plugin consistent. Adjust repository mojos
add 870f428 SLING-8058 : Make configuration of slingfeature-maven-plugin consistent. Adjust analysis mojo
add 4525cc9 SLING-8032 - Add a MOJO which is able to validate JSON Feature file against the JSON Schema
add 78cb683 SLING-8032 - Add a MOJO which is able to validate JSON Feature file against the JSON Schema
add 2cfb9fe Merge branch 'schema-validation' of github.com:apache/sling-slingfeature-maven-plugin into schema-validation
No new revisions were added by this update.
Summary of changes:
pom.xml | 24 +-
src/it/attach-metadata-from-pom/verify.bsh | 2 +-
src/it/schema-validation-ko/pom.xml | 1 +
src/it/schema-validation-ko/verify.bsh | 7 +-
.../apache/sling/feature/maven/Environment.java | 9 +
.../sling/feature/maven/FeatureConstants.java | 5 +-
.../sling/feature/maven/FeatureProjectConfig.java | 2 +-
.../sling/feature/maven/FeatureProjectInfo.java | 9 +-
.../apache/sling/feature/maven/Preprocessor.java | 381 ++++++++-----
.../apache/sling/feature/maven/ProjectHelper.java | 180 ++++++-
.../apache/sling/feature/maven/Substitution.java | 48 ++
.../feature/maven/mojos/AbstractFeatureMojo.java | 26 +-
.../maven/mojos/AbstractIncludingFeatureMojo.java | 221 ++++++++
...sitoryMojo.java => AbstractRepositoryMojo.java} | 147 ++---
.../sling/feature/maven/mojos/Aggregate.java | 55 ++
.../feature/maven/mojos/AggregateFeaturesMojo.java | 408 +++-----------
.../feature/maven/mojos/AnalyseFeaturesMojo.java | 125 +++--
.../feature/maven/mojos/AttachFeaturesMojo.java | 97 +---
.../feature/maven/mojos/CollectArtifactsMojo.java | 89 ++++
.../maven/mojos/FeatureSelectionConfig.java | 74 +++
.../sling/feature/maven/mojos/Repository.java | 48 ++
.../sling/feature/maven/mojos/RepositoryMojo.java | 209 +-------
.../org/apache/sling/feature/maven/mojos/Scan.java | 50 ++
.../feature/maven/mojos/UpdateVersionsMojo.java | 590 +++++++++++++++++++++
src/main/resources/META-INF/plexus/components.xml | 8 +-
.../sling/feature/maven/SubstitutionTest.java} | 31 +-
.../maven/mojos/AggregateFeaturesMojoTest.java | 337 ++++++------
.../maven/mojos/AttachFeaturesMojoTest.java | 4 +-
.../feature/maven/mojos/plugins/TestPlugin1.java | 16 +-
.../feature/maven/mojos/plugins/TestPlugin2.java | 16 +-
...pache.sling.feature.builder.PostProcessHandler} | 0
.../resources/aggregate-features/dir/test_v.json | 2 +-
.../resources/aggregate-features/dir/test_w.json | 2 +-
.../aggregate-features/dir/test_x.feature | 2 +-
.../resources/aggregate-features/dir/test_y.json | 2 +-
.../resources/aggregate-features/dir/test_z.json | 2 +-
.../resources/aggregate-features/dir2/test_w.json | 2 +-
.../resources/aggregate-features/dir2/test_y.json | 2 +-
.../resources/aggregate-features/dir2/test_z.json | 2 +-
.../resources/aggregate-features/dir3/test_y.json | 2 +-
.../resources/aggregate-features/dir3/test_z.json | 2 +-
.../resources/aggregate-features/dir4/test_t.json | 2 +-
.../resources/aggregate-features/dir4/test_u.json | 2 +-
.../resources/aggregate-features/dir4/test_v.json | 2 +-
.../resources/aggregate-features/dir4/test_w.json | 2 +-
.../resources/aggregate-features/dir4/test_x.json | 2 +-
.../resources/aggregate-features/dir4/test_y.json | 2 +-
.../resources/aggregate-features/dir4/test_z.json | 2 +-
48 files changed, 2080 insertions(+), 1173 deletions(-)
create mode 100644 src/main/java/org/apache/sling/feature/maven/mojos/AbstractIncludingFeatureMojo.java
copy src/main/java/org/apache/sling/feature/maven/mojos/{RepositoryMojo.java => AbstractRepositoryMojo.java} (60%)
create mode 100644 src/main/java/org/apache/sling/feature/maven/mojos/Aggregate.java
create mode 100644 src/main/java/org/apache/sling/feature/maven/mojos/CollectArtifactsMojo.java
create mode 100644 src/main/java/org/apache/sling/feature/maven/mojos/FeatureSelectionConfig.java
create mode 100644 src/main/java/org/apache/sling/feature/maven/mojos/Repository.java
create mode 100644 src/main/java/org/apache/sling/feature/maven/mojos/Scan.java
create mode 100644 src/main/java/org/apache/sling/feature/maven/mojos/UpdateVersionsMojo.java
copy src/{it/schema-validation-ok/verify.bsh => test/java/org/apache/sling/feature/maven/SubstitutionTest.java} (61%)
rename src/test/resources/META-INF/services/{org.apache.sling.feature.builder.FeatureExtensionHandler => org.apache.sling.feature.builder.PostProcessHandler} (100%)