You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by js...@apache.org on 2024/11/26 17:53:52 UTC
(sling-org-apache-sling-feature) 01/01: Merge pull request #33 from apache/update-parent-62
This is an automated email from the ASF dual-hosted git repository.
jsedding pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature.git
commit 88ddcfec939a56c7d6d982835c15b537c4e7cbc5
Merge: e102c7e c5d04a0
Author: Julian Sedding <js...@gmail.com>
AuthorDate: Tue Nov 26 18:53:47 2024 +0100
Merge pull request #33 from apache/update-parent-62
SLING-12506 - Update Feature Model to parent 62
.git-blame-ignore-revs | 2 +
pom.xml | 100 +--
.../java/org/apache/sling/feature/Artifact.java | 97 ++-
.../java/org/apache/sling/feature/ArtifactId.java | 146 ++--
.../java/org/apache/sling/feature/Artifacts.java | 36 +-
.../java/org/apache/sling/feature/Bundles.java | 38 +-
.../org/apache/sling/feature/Configuration.java | 94 +--
.../org/apache/sling/feature/Configurations.java | 30 +-
.../feature/ExecutionEnvironmentExtension.java | 45 +-
.../java/org/apache/sling/feature/Extension.java | 70 +-
.../org/apache/sling/feature/ExtensionState.java | 31 +-
.../org/apache/sling/feature/ExtensionType.java | 27 +-
.../java/org/apache/sling/feature/Extensions.java | 30 +-
.../java/org/apache/sling/feature/Feature.java | 101 +--
.../org/apache/sling/feature/MapWithMetadata.java | 196 ++---
.../apache/sling/feature/MatchingRequirement.java | 26 +-
.../java/org/apache/sling/feature/Prototype.java | 47 +-
.../sling/feature/builder/ArtifactProvider.java | 26 +-
.../sling/feature/builder/BuilderContext.java | 58 +-
.../apache/sling/feature/builder/BuilderUtil.java | 402 ++++++----
.../sling/feature/builder/FeatureBuilder.java | 217 ++---
.../sling/feature/builder/FeatureProvider.java | 26 +-
.../sling/feature/builder/HandlerContext.java | 29 +-
.../apache/sling/feature/builder/MergeHandler.java | 26 +-
.../sling/feature/builder/PostProcessHandler.java | 26 +-
.../apache/sling/feature/builder/package-info.java | 2 -
.../java/org/apache/sling/feature/io/IOUtils.java | 122 ++-
.../sling/feature/io/archive/ArchiveReader.java | 47 +-
.../sling/feature/io/archive/ArchiveWriter.java | 91 ++-
.../sling/feature/io/archive/package-info.java | 2 -
.../feature/io/artifacts/ArtifactHandler.java | 26 +-
.../feature/io/artifacts/ArtifactManager.java | 153 ++--
.../io/artifacts/ArtifactManagerConfig.java | 45 +-
.../sling/feature/io/artifacts/package-info.java | 2 -
.../feature/io/artifacts/spi/ArtifactProvider.java | 26 +-
.../io/artifacts/spi/ArtifactProviderContext.java | 26 +-
.../feature/io/artifacts/spi/package-info.java | 2 -
.../feature/io/json/ConfigurationJSONReader.java | 72 +-
.../feature/io/json/ConfigurationJSONWriter.java | 50 +-
.../sling/feature/io/json/FeatureJSONReader.java | 564 +++++++------
.../sling/feature/io/json/FeatureJSONWriter.java | 215 ++---
.../sling/feature/io/json/JSONConstants.java | 34 +-
.../sling/feature/io/json/ManifestUtils.java | 357 ++++-----
.../apache/sling/feature/io/json/package-info.java | 2 -
.../org/apache/sling/feature/io/package-info.java | 2 -
.../org/apache/sling/feature/osgi/Converters.java | 202 ++---
.../apache/sling/feature/osgi/package-info.java | 2 -
.../org/apache/sling/feature/package-info.java | 2 -
.../org/apache/sling/feature/ArtifactIdTest.java | 60 +-
.../org/apache/sling/feature/ArtifactTest.java | 38 +-
.../java/org/apache/sling/feature/BundlesTest.java | 35 +-
.../apache/sling/feature/ConfigurationTest.java | 72 +-
.../apache/sling/feature/ConfigurationsTest.java | 34 +-
.../feature/ExecutionEnvironmentExtensionTest.java | 84 +-
.../org/apache/sling/feature/ExtensionTest.java | 30 +-
.../java/org/apache/sling/feature/FeatureTest.java | 50 +-
.../sling/feature/builder/BuilderUtilTest.java | 497 +++++++-----
.../sling/feature/builder/FeatureBuilderTest.java | 878 ++++++++++++++-------
.../org/apache/sling/feature/io/IOUtilsTest.java | 74 +-
.../feature/io/archive/ArchiveWriterTest.java | 25 +-
.../feature/io/artifacts/ArtifactManagerTest.java | 135 ++--
.../sling/feature/io/json/ArtifactsExtensions.java | 24 +-
.../feature/io/json/FeatureJSONReaderTest.java | 63 +-
.../feature/io/json/FeatureJSONWriterTest.java | 94 ++-
.../java/org/apache/sling/feature/io/json/U.java | 36 +-
.../apache/sling/feature/osgi/ConvertersTest.java | 71 +-
66 files changed, 3543 insertions(+), 2729 deletions(-)