[nifi] branch main updated (93b58cc -> 6ef6e71)

[ex...@apache.org]

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

exceptionfactory pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git.


    from 93b58cc  CEM-9557: Change C2 OperandType to Enum
     add 6ef6e71  NIFI-9501 Added REST end-point to retrieve a RuntimeManifest

No new revisions were added by this update.

Summary of changes:
 .../apache/nifi/c2/protocol/api/C2Heartbeat.java   | 16 ++---
 .../org/apache/nifi/c2/protocol/api/FlowUri.java   | 14 ++--
 .../org/apache/nifi/c2/protocol/api/Location.java  | 18 ++---
 c2/c2-protocol/c2-protocol-component-api/pom.xml   |  6 --
 .../nifi/c2/protocol/component/api/Bundle.java     | 20 ++----
 .../c2/protocol/component/api/DefinedType.java     | 23 +++----
 .../protocol/component/api/ExtensionComponent.java | 18 ++---
 .../component/api/PropertyAllowableValue.java      | 15 ++---
 .../c2/protocol/component/api/RuntimeManifest.java | 17 +++--
 .../nifi-extension-manifest-model/pom.xml          |  2 +-
 .../nifi-extension-manifest-parser/pom.xml         | 22 ++++--
 .../jackson/JacksonExtensionManifestParser.java    | 52 ---------------
 .../parser/jaxb/JAXBExtensionManifestParser.java   | 53 +++++++++++++++
 .../TestJAXBExtensionManifestParser.java}          |  6 +-
 nifi-manifest/nifi-runtime-manifest-core/pom.xml   |  5 ++
 .../manifest/impl/RuntimeManifestGenerator.java    |  4 +-
 .../impl/StandardRuntimeManifestBuilder.java       | 21 ++++--
 .../nifi-framework/nifi-client-dto/pom.xml         |  5 ++
 ...nanceEntity.java => RuntimeManifestEntity.java} | 20 +++---
 .../http/StandardHttpResponseMapper.java           |  2 +
 .../endpoints/RuntimeManifestEndpointMerger.java   | 64 ++++++++++++++++++
 .../nifi-framework-nar-utils/pom.xml               |  5 ++
 .../java/org/apache/nifi/nar/ExtensionManager.java |  1 +
 .../org/apache/nifi/web/NiFiServiceFacade.java     |  8 +++
 .../apache/nifi/web/StandardNiFiServiceFacade.java |  6 ++
 .../java/org/apache/nifi/web/api/FlowResource.java | 38 +++++++++++
 .../nifi/web/controller/ControllerFacade.java      | 78 +++++++++++++++++++++-
 .../src/main/resources/nifi-web-api-context.xml    |  2 +
 .../nifi-registry-bundle-utils/pom.xml             |  5 ++
 .../bundle/extract/nar/NarBundleExtractor.java     | 10 +--
 30 files changed, 372 insertions(+), 184 deletions(-)
 delete mode 100644 nifi-manifest/nifi-extension-manifest-parser/src/main/java/org/apache/nifi/extension/manifest/parser/jackson/JacksonExtensionManifestParser.java
 create mode 100644 nifi-manifest/nifi-extension-manifest-parser/src/main/java/org/apache/nifi/extension/manifest/parser/jaxb/JAXBExtensionManifestParser.java
 rename nifi-manifest/nifi-extension-manifest-parser/src/test/java/org/apache/nifi/extension/manifest/parser/{jackson/TestJacksonExtensionManifestParser.java => jaxb/TestJAXBExtensionManifestParser.java} (98%)
 copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/{ProvenanceEntity.java => RuntimeManifestEntity.java} (68%)
 create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/RuntimeManifestEndpointMerger.java