You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2020/11/20 17:47:07 UTC
[sling-slingfeature-maven-plugin] branch feature/merge-capabilities
updated (af47af3 -> d7536a3)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/merge-capabilities
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git.
discard af47af3 SLING-9883 Export merged provided capabilities in 'Provide-Capability' header
add 07edad8 SLING-9886 convert ITs post-execution script from Beanshell to Groovy
add a5439d4 Merge pull request #60 from apache/feature/it-verify-with-groovy
add 775f685 SLING-9889 fix apis-jar IT
add a91761e SLING-9889 : Slingfeature-Maven-Plugin: Fix failing ITs
add f592083 SLING-9904 : Provide an option to globally set metadata to bundles and artifacts
add c7ff8e6 Update to latest feature model components
add 7857e85 Fix config test assertions, since merged configs now contain origin information
add 89964c9 Fix test assertions to work with latest deps
add 89ffdaa [maven-release-plugin] prepare release slingfeature-maven-plugin-1.4.8
add cc6ea10 [maven-release-plugin] prepare for next development iteration
add a864512 [maven-release-plugin] prepare release slingfeature-maven-plugin-1.4.10
add 37bfe2a [maven-release-plugin] prepare for next development iteration
add eff8233 SLING-9907 Programmatic setting of Analyser Task Configuration
add ad54540 Simplify the Properties to Map conversion
add 78f39d6 Merge pull request #61 from bosschaert/SLING-9907
add b34977e Merge branch 'master' of github.com:apache/sling-slingfeature-maven-plugin
add dd630b1 [maven-release-plugin] prepare release slingfeature-maven-plugin-1.4.12
add 8e5c4c4 [maven-release-plugin] prepare for next development iteration
add b71b02b SLING-9912: take tag into account for source lookup from scm.
add c44720d [maven-release-plugin] prepare release slingfeature-maven-plugin-1.4.14
add 57b3745 [maven-release-plugin] prepare for next development iteration
add 4eadd6e SLING-9913 : ArtifactProvider should not log stack trace if artifact is not found
add f8c4b88 SLING-9914 : If no tag is specified, HEAD is used as default branch
add 1a263ad [maven-release-plugin] prepare release slingfeature-maven-plugin-1.4.16
add 2161c1c [maven-release-plugin] prepare for next development iteration
add d7536a3 SLING-9883 Export merged provided capabilities in 'Provide-Capability' header
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (af47af3)
\
N -- N -- N refs/heads/feature/merge-capabilities (d7536a3)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
pom.xml | 8 ++--
.../{verify.bsh => verify.groovy} | 2 +-
.../{verify.bsh => verify.groovy} | 0
src/it/apis-jar-cnd/{verify.bsh => verify.groovy} | 0
.../{verify.bsh => verify.groovy} | 0
.../{verify.bsh => verify.groovy} | 21 ++--------
src/it/apis-jar-wrapper-bundle/pom.xml | 2 +
.../{verify.bsh => verify.groovy} | 6 +--
src/it/apis-jar/{verify.bsh => verify.groovy} | 24 +++++------
.../{verify.bsh => verify.groovy} | 4 +-
.../{verify.bsh => verify.groovy} | 4 +-
.../{verify.bsh => verify.groovy} | 4 +-
.../{verify.bsh => verify.groovy} | 4 +-
.../{verify.bsh => verify.groovy} | 4 +-
.../{verify.bsh => verify.groovy} | 4 +-
.../{verify.bsh => verify.groovy} | 4 +-
.../{verify.bsh => verify.groovy} | 4 +-
.../sling/feature/maven/FeatureProjectConfig.java | 28 +++++++++++++
.../apache/sling/feature/maven/JSONFeatures.java | 26 ++++++++++++
.../apache/sling/feature/maven/Preprocessor.java | 8 +++-
.../apache/sling/feature/maven/ProjectHelper.java | 46 ++++++++++++++++++++++
.../feature/maven/mojos/AbstractFeatureMojo.java | 5 ++-
.../sling/feature/maven/mojos/ApisJarMojo.java | 20 ++++++----
.../org/apache/sling/feature/maven/mojos/Scan.java | 9 ++++-
.../maven/mojos/AggregateFeaturesMojoTest.java | 21 ++++++++--
.../mojos/{ApisJarMojoTest.java => ScanTest.java} | 34 +++++++++-------
26 files changed, 211 insertions(+), 81 deletions(-)
rename src/it/analyzer-apiregions-errors-detected/{verify.bsh => verify.groovy} (83%)
rename src/it/analyzer-errors-detected/{verify.bsh => verify.groovy} (100%)
rename src/it/apis-jar-cnd/{verify.bsh => verify.groovy} (100%)
rename src/it/apis-jar-exported-package-no-classes/{verify.bsh => verify.groovy} (100%)
rename src/it/apis-jar-wrapped-flattened-classes/{verify.bsh => verify.groovy} (68%)
rename src/it/apis-jar-wrapper-bundle/{verify.bsh => verify.groovy} (96%)
rename src/it/apis-jar/{verify.bsh => verify.groovy} (91%)
rename src/it/attach-metadata-from-pom/{verify.bsh => verify.groovy} (97%)
rename src/it/include-artifact-including-source-features-folder/{verify.bsh => verify.groovy} (98%)
rename src/it/include-artifact-including-source-features/{verify.bsh => verify.groovy} (98%)
rename src/it/include-artifact-no-classifier/{verify.bsh => verify.groovy} (98%)
rename src/it/include-artifact-simple/{verify.bsh => verify.groovy} (98%)
rename src/it/include-artifact-start-order/{verify.bsh => verify.groovy} (98%)
rename src/it/schema-validation-ko/{verify.bsh => verify.groovy} (97%)
rename src/it/variables-interpolator/{verify.bsh => verify.groovy} (98%)
copy src/test/java/org/apache/sling/feature/maven/mojos/{ApisJarMojoTest.java => ScanTest.java} (50%)