You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2022/03/09 17:03:40 UTC

[jackrabbit-filevault-package-maven-plugin] branch feature/JCVLT-558-generate-cnd updated (e60073b -> d118e31)

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a change to branch feature/JCVLT-558-generate-cnd
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git.


 discard e60073b  JCRVLT-559 add mojo for generating CND file containing used node types and namespace of a package
 discard 348bec2  JCRVLT-558 mojo for generating a cnd
     add 805753f  JCRVLT-610 switch to JUnit5 (#70)
     add 2c993eb  JCRVLT-558 mojo for generating a cnd
     add 9390639  JCRVLT-559 add mojo for generating CND file containing used node types and namespace of a package
     add d118e31  add IT

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   (e60073b)
            \
             N -- N -- N   refs/heads/feature/JCVLT-558-generate-cnd (d118e31)

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                                            |  19 ++-
 .../AbstractSourceAndMetadataPackageMojo.java      |   5 +-
 .../filevault/maven/packaging/GenerateCndMojo.java |  14 +-
 .../packaging/AbstractMetadataPackageMojoTest.java |  18 +--
 .../maven/packaging/AbstractValidateMojoTest.java  |  17 ++-
 .../maven/packaging/GenerateCndMojoTest.java       |  30 ++--
 .../maven/packaging/GenerateMetadataMojoTest.java  |  24 +--
 .../packaging/MavenBasedPackageDependencyTest.java |  13 +-
 .../maven/packaging/SimpleEmbeddedTest.java        |  35 ++---
 .../maven/packaging/ValidateFilesMojoTest.java     |   8 +-
 .../maven/packaging/ValidatorSettingsKeyTest.java  |  37 ++---
 .../maven/packaging/ValidatorSettingsTest.java     |   7 +-
 .../filevault/maven/packaging/VaultMojoTest.java   |   9 +-
 .../filevault/maven/packaging/impl/FilterTest.java | 107 +++-----------
 .../packaging/it/AnalyzeClassesMultiModuleIT.java  |  20 ++-
 .../maven/packaging/it/CheckSignatureIT.java       |  22 +--
 .../maven/packaging/it/CndGenerationIT.java        |  63 ++++++++
 .../maven/packaging/it/DefaultProjectIT.java       | 164 ++++++++++++---------
 .../maven/packaging/it/DependencyCheckIT.java      |  61 ++++----
 .../filevault/maven/packaging/it/FilterIT.java     |  72 ++++-----
 .../filevault/maven/packaging/it/FilteringIT.java  |  44 +++---
 .../filevault/maven/packaging/it/FormattingIT.java |  35 +++--
 .../it/GenerateMetadataMultiModuleIT.java          |  16 +-
 .../maven/packaging/it/ManifestGenerationIT.java   |  45 +++---
 .../maven/packaging/it/PackageTypesIT.java         |  80 ++++------
 .../packaging/it/PropertyConfigurationIT.java      |  22 +--
 .../packaging/it/SupplementalArtifactsIT.java      |  29 ++--
 .../maven/packaging/it/ValidateFilesIT.java        |  30 ++--
 .../maven/packaging/it/ValidatePackageIT.java      |  43 +++---
 .../packaging/it/{ => util}/ProjectBuilder.java    | 159 ++++++++++++--------
 .../packaging/it/util/ProjectBuilderExtension.java |  48 ++++++
 .../packaging/it/util/ProjectBuilderStore.java     |  97 ++++++++++++
 .../jcr_root/apps/test/base/components/test.txt}   |   3 +-
 .../simple/expected-manifest.txt                   |   0
 .../apps/test/base/components/.content.xml         |   2 +-
 .../jcr_root/apps/test/base/components/test.txt}   |   3 +-
 .../application => cnd-generation/simple}/pom.xml  |  13 +-
 .../application-cleanup/pom.xml                    |   0
 .../application-sourced/filter.xml                 |   0
 .../application-sourced/pom.xml                    |   0
 .../application/pom.xml                            |   0
 .../container/pom.xml                              |   0
 .../content/pom.xml                                |   0
 .../package-types/{ => from-property}/pom.xml      |   0
 .../mixed/pom.xml                                  |   0
 45 files changed, 832 insertions(+), 582 deletions(-)
 create mode 100644 src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/CndGenerationIT.java
 rename src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/{ => util}/ProjectBuilder.java (76%)
 create mode 100644 src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/util/ProjectBuilderExtension.java
 create mode 100644 src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/util/ProjectBuilderStore.java
 copy src/test/resources/{test-projects/default-test-projects/additional-metainf-files/additional-metainf/license.txt => test-packages/generate-cnd/jcr_root/apps/test/base/components/test.txt} (97%)
 copy src/test/resources/test-projects/{manifest-generation => cnd-generation}/simple/expected-manifest.txt (100%)
 copy src/test/resources/{test-packages/generate-cnd => test-projects/cnd-generation/simple}/jcr_root/apps/test/base/components/.content.xml (96%)
 copy src/test/resources/test-projects/{default-test-projects/additional-metainf-files/additional-metainf/license.txt => cnd-generation/simple/jcr_root/apps/test/base/components/test.txt} (97%)
 copy src/test/resources/test-projects/{package-type-auto/application => cnd-generation/simple}/pom.xml (78%)
 rename src/test/resources/test-projects/{package-type-auto => package-types}/application-cleanup/pom.xml (100%)
 rename src/test/resources/test-projects/{package-type-auto => package-types}/application-sourced/filter.xml (100%)
 rename src/test/resources/test-projects/{package-type-auto => package-types}/application-sourced/pom.xml (100%)
 rename src/test/resources/test-projects/{package-type-auto => package-types}/application/pom.xml (100%)
 rename src/test/resources/test-projects/{package-type-auto => package-types}/container/pom.xml (100%)
 rename src/test/resources/test-projects/{package-type-auto => package-types}/content/pom.xml (100%)
 rename src/test/resources/test-projects/package-types/{ => from-property}/pom.xml (100%)
 rename src/test/resources/test-projects/{package-type-auto => package-types}/mixed/pom.xml (100%)